[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 42/52] dma: do not depend on kvm_enabled()
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 42/52] dma: do not depend on kvm_enabled() |
Date: |
Thu, 19 May 2016 13:18:36 +0200 |
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/intc/xics_kvm.c | 2 +-
hw/misc/pci-testdev.c | 1 +
hw/ppc/e500plat.c | 1 +
hw/ppc/spapr_hcall.c | 1 +
hw/ppc/spapr_pci.c | 1 +
hw/ppc/spapr_rtas.c | 1 +
include/sysemu/dma.h | 5 +----
8 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/hw/intc/arm_gicv2m.c b/hw/intc/arm_gicv2m.c
index e8b5177..589d315 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/intc/xics_kvm.c b/hw/intc/xics_kvm.c
index b40292d..55fd801 100644
--- a/hw/intc/xics_kvm.c
+++ b/hw/intc/xics_kvm.c
@@ -31,7 +31,7 @@
#include "cpu.h"
#include "hw/hw.h"
#include "trace.h"
-#include "linux/kvm.h"
+#include "sysemu/kvm.h"
#include "hw/ppc/spapr.h"
#include "hw/ppc/xics.h"
#include "kvm_ppc.h"
diff --git a/hw/misc/pci-testdev.c b/hw/misc/pci-testdev.c
index 2f2e989..7d59902 100644
--- a/hw/misc/pci-testdev.c
+++ b/hw/misc/pci-testdev.c
@@ -21,6 +21,7 @@
#include "hw/hw.h"
#include "hw/pci/pci.h"
#include "qemu/event_notifier.h"
+#include "sysemu/kvm.h"
typedef struct PCITestDevHdr {
uint8_t test;
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 8f40602..4426a50 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_pci.c b/hw/ppc/spapr_pci.c
index 573e635..e55b505 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -44,6 +44,7 @@
#include "hw/pci/pci_bus.h"
#include "hw/ppc/spapr_drc.h"
#include "sysemu/device_tree.h"
+#include "sysemu/kvm.h"
#include "hw/vfio/vfio.h"
diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c
index f073258..580829e 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 0f7cd4d..d6e96a4 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] [PULL 28/52] ppc: use PowerPCCPU instead of CPUPPCState, (continued)
- [Qemu-devel] [PULL 28/52] ppc: use PowerPCCPU instead of CPUPPCState, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 22/52] target-xtensa: make cpu-qom.h not target specific, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 21/52] target-unicore32: make cpu-qom.h not target specific, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 19/52] target-sparc: make cpu-qom.h not target specific, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 37/52] hw: cannot include hw/hw.h from user emulation, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 20/52] target-tricore: make cpu-qom.h not target specific, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 27/52] mips: use MIPSCPU instead of CPUMIPSState, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 33/52] apic: move target-dependent definitions to cpu.h, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 36/52] hw: move CPU state serialization to migration/cpu.h, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 30/52] explicitly include qom/cpu.h, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 42/52] dma: do not depend on kvm_enabled(),
Paolo Bonzini <=
- [Qemu-devel] [PULL 29/52] arm: remove useless cpu.h inclusion, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 31/52] explicitly include hw/qdev-core.h, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 46/52] arm: move arm_log_exception into .c file, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 44/52] acpi: do not use TARGET_PAGE_SIZE, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 45/52] qemu-common: push cpu.h inclusion out of qemu-common.h, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 49/52] exec: extract exec/tb-context.h, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 43/52] s390x: reorganize CSS bits between cpu.h and other headers, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 41/52] gdbstub: remove unnecessary includes from gdbstub-xml.c, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 40/52] qemu-common: stop including qemu/host-utils.h from qemu-common.h, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 38/52] cpu: move endian-dependent load/store functions to cpu-all.h, Paolo Bonzini, 2016/05/19