[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 40/49] dma: do not depend on kvm_enabled()
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 40/49] dma: do not depend on kvm_enabled() |
Date: |
Wed, 16 Mar 2016 11:46:50 +0100 |
Memory barriers are needed also by Xen and, when the ioeventfd
bugs are fixed, by TCG as well.
sysemu/kvm.h is not anymore needed in sysemu/dma.h, move it to
the actual users.
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/intc/arm_gicv2m.c | 1 +
hw/ppc/e500plat.c | 1 +
hw/ppc/spapr_hcall.c | 1 +
hw/ppc/spapr_rtas.c | 1 +
include/sysemu/dma.h | 5 +----
5 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/hw/intc/arm_gicv2m.c b/hw/intc/arm_gicv2m.c
index 3e35915..e0003ba 100644
--- a/hw/intc/arm_gicv2m.c
+++ b/hw/intc/arm_gicv2m.c
@@ -29,6 +29,7 @@
#include "qapi/error.h"
#include "hw/sysbus.h"
#include "hw/pci/msi.h"
+#include "sysemu/kvm.h"
#define TYPE_ARM_GICV2M "arm-gicv2m"
#define ARM_GICV2M(obj) OBJECT_CHECK(ARMGICv2mState, (obj), TYPE_ARM_GICV2M)
diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c
index b00565c..94b4545 100644
--- a/hw/ppc/e500plat.c
+++ b/hw/ppc/e500plat.c
@@ -14,6 +14,7 @@
#include "e500.h"
#include "hw/boards.h"
#include "sysemu/device_tree.h"
+#include "sysemu/kvm.h"
#include "hw/pci/pci.h"
#include "hw/ppc/openpic.h"
#include "kvm_ppc.h"
diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
index fb448fb..8dd170f 100644
--- a/hw/ppc/spapr_hcall.c
+++ b/hw/ppc/spapr_hcall.c
@@ -7,6 +7,7 @@
#include "mmu-hash64.h"
#include "cpu-models.h"
#include "trace.h"
+#include "sysemu/kvm.h"
#include "kvm_ppc.h"
struct SPRSyncState {
diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c
index b7c5ebd..9490751 100644
--- a/hw/ppc/spapr_rtas.c
+++ b/hw/ppc/spapr_rtas.c
@@ -31,6 +31,7 @@
#include "hw/qdev.h"
#include "sysemu/device_tree.h"
#include "sysemu/cpus.h"
+#include "sysemu/kvm.h"
#include "hw/ppc/spapr.h"
#include "hw/ppc/spapr_vio.h"
diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h
index b0fbb9b..8a06f7a 100644
--- a/include/sysemu/dma.h
+++ b/include/sysemu/dma.h
@@ -15,7 +15,6 @@
#include "hw/hw.h"
#include "block/block.h"
#include "block/accounting.h"
-#include "sysemu/kvm.h"
typedef struct ScatterGatherEntry ScatterGatherEntry;
@@ -67,9 +66,7 @@ static inline void dma_barrier(AddressSpace *as, DMADirection
dir)
* use lighter barriers based on the direction of the
* transfer, the DMA context, etc...
*/
- if (kvm_enabled()) {
- smp_mb();
- }
+ smp_mb();
}
/* Checks that the given range of addresses is valid for DMA. This is
--
1.8.3.1
- [Qemu-devel] [PATCH 26/49] ppc: use PowerPCCPU instead of CPUPPCState, (continued)
- [Qemu-devel] [PATCH 26/49] ppc: use PowerPCCPU instead of CPUPPCState, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 35/49] hw: cannot include hw/hw.h from user emulation, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 41/49] s390x: move stuff out of cpu.h, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 42/49] qemu-common: push cpu.h inclusion out of qemu-common.h, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 33/49] hw: do not use VMSTATE_*TL, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 44/49] mips: move CP0 functions out of cpu.h, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 46/49] exec: extract exec/tb-context.h, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 27/49] arm: remove useless cpu.h inclusion, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 34/49] hw: move CPU state serialization to migration/cpu.h, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 39/49] gdbstub: remove includes from gdbstub-xml.c, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 40/49] dma: do not depend on kvm_enabled(),
Paolo Bonzini <=
- [Qemu-devel] [PATCH 37/49] qemu-common: stop including qemu/bswap.h from qemu-common.h, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 38/49] qemu-common: stop including qemu/host-utils.h from qemu-common.h, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 43/49] arm: move arm_log_exception into .c file, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 48/49] hw: remove pio_addr_t, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 49/49] hw: clean up hw/hw.h includes, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 45/49] hw: explicitly include qemu/log.h, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 47/49] cpu: move exec-all.h inclusion out of cpu.h, Paolo Bonzini, 2016/03/16