aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
Diffstat (limited to 'hw')
-rw-r--r--hw/acpi/pcihp.c1
-rw-r--r--hw/acpi/vmgenid.c1
-rw-r--r--hw/alpha/pci.c1
-rw-r--r--hw/alpha/typhoon.c1
-rw-r--r--hw/arm/nrf51_soc.c1
-rw-r--r--hw/arm/smmu-common.c1
-rw-r--r--hw/arm/smmuv3.c1
-rw-r--r--hw/arm/sysbus-fdt.c1
-rw-r--r--hw/arm/z2.c1
-rw-r--r--hw/char/exynos4210_uart.c1
-rw-r--r--hw/char/imx_serial.c1
-rw-r--r--hw/char/serial.c1
-rw-r--r--hw/core/loader-fit.c1
-rw-r--r--hw/core/platform-bus.c1
-rw-r--r--hw/core/qdev.c1
-rw-r--r--hw/display/ramfb-standalone.c1
-rw-r--r--hw/display/ramfb.c1
-rw-r--r--hw/dma/xlnx-zynq-devcfg.c1
-rw-r--r--hw/hppa/dino.c1
-rw-r--r--hw/hppa/pci.c1
-rw-r--r--hw/i2c/smbus_ich9.c1
-rw-r--r--hw/ide/cmd646.c1
-rw-r--r--hw/ide/ioport.c1
-rw-r--r--hw/ide/piix.c1
-rw-r--r--hw/ide/via.c1
-rw-r--r--hw/input/adb-kbd.c1
-rw-r--r--hw/intc/allwinner-a10-pic.c1
-rw-r--r--hw/intc/mips_gic.c1
-rw-r--r--hw/intc/xics_pnv.c1
-rw-r--r--hw/ipmi/ipmi_bmc_extern.c1
-rw-r--r--hw/isa/vt82c686.c1
-rw-r--r--hw/misc/armsse-cpuid.c1
-rw-r--r--hw/misc/armsse-mhu.c1
-rw-r--r--hw/misc/imx6_src.c1
-rw-r--r--hw/misc/imx7_gpr.c1
-rw-r--r--hw/misc/iotkit-sysinfo.c1
-rw-r--r--hw/misc/mips_cmgcr.c1
-rw-r--r--hw/misc/mos6522.c1
-rw-r--r--hw/misc/sga.c1
-rw-r--r--hw/misc/zynq-xadc.c1
-rw-r--r--hw/net/fsl_etsec/etsec.c1
-rw-r--r--hw/net/lan9118.c1
-rw-r--r--hw/net/ne2000.c1
-rw-r--r--hw/net/opencores_eth.c1
-rw-r--r--hw/net/pcnet.c1
-rw-r--r--hw/nios2/generic_nommu.c1
-rw-r--r--hw/pci-host/pam.c1
-rw-r--r--hw/ppc/pnv_bmc.c1
-rw-r--r--hw/ppc/pnv_core.c1
-rw-r--r--hw/ppc/pnv_lpc.c1
-rw-r--r--hw/ppc/pnv_occ.c1
-rw-r--r--hw/ppc/ppce500_spin.c1
-rw-r--r--hw/ppc/spapr_rng.c1
-rw-r--r--hw/ppc/spapr_vio.c1
-rw-r--r--hw/s390x/event-facility.c1
-rw-r--r--hw/s390x/sclpcpu.c1
-rw-r--r--hw/s390x/virtio-ccw.c1
-rw-r--r--hw/scsi/scsi-disk.c1
-rw-r--r--hw/sd/milkymist-memcard.c1
-rw-r--r--hw/semihosting/config.c1
-rw-r--r--hw/ssi/aspeed_smc.c1
-rw-r--r--hw/ssi/imx_spi.c1
-rw-r--r--hw/ssi/xilinx_spi.c1
-rw-r--r--hw/ssi/xilinx_spips.c1
-rw-r--r--hw/timer/allwinner-a10-pit.c1
-rw-r--r--hw/timer/altera_timer.c1
-rw-r--r--hw/timer/exynos4210_rtc.c1
-rw-r--r--hw/tricore/tricore_testboard.c1
-rw-r--r--hw/usb/hcd-ehci.h1
-rw-r--r--hw/vfio/ap.c1
-rw-r--r--hw/vfio/platform.c1
-rw-r--r--hw/xen/xen_pt_load_rom.c1
-rw-r--r--hw/xtensa/xtensa_memory.c1
73 files changed, 2 insertions, 71 deletions
diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c
index ac49a5a77b..82d295b6e8 100644
--- a/hw/acpi/pcihp.c
+++ b/hw/acpi/pcihp.c
@@ -31,7 +31,6 @@
#include "hw/pci/pci.h"
#include "hw/pci/pci_bridge.h"
#include "hw/acpi/acpi.h"
-#include "sysemu/sysemu.h"
#include "exec/address-spaces.h"
#include "hw/pci/pci_bus.h"
#include "migration/vmstate.h"
diff --git a/hw/acpi/vmgenid.c b/hw/acpi/vmgenid.c
index 4eae426969..6e11b0fa9b 100644
--- a/hw/acpi/vmgenid.c
+++ b/hw/acpi/vmgenid.c
@@ -21,7 +21,6 @@
#include "hw/qdev-properties.h"
#include "migration/vmstate.h"
#include "sysemu/reset.h"
-#include "sysemu/sysemu.h"
void vmgenid_build_acpi(VmGenIdState *vms, GArray *table_data, GArray *guid,
BIOSLinker *linker)
diff --git a/hw/alpha/pci.c b/hw/alpha/pci.c
index fb902bb92d..72251fcdf0 100644
--- a/hw/alpha/pci.c
+++ b/hw/alpha/pci.c
@@ -9,7 +9,6 @@
#include "qemu/osdep.h"
#include "alpha_sys.h"
#include "qemu/log.h"
-#include "sysemu/sysemu.h"
#include "trace.h"
diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c
index 1c0565acc1..179e1f7658 100644
--- a/hw/alpha/typhoon.c
+++ b/hw/alpha/typhoon.c
@@ -13,7 +13,6 @@
#include "cpu.h"
#include "hw/boards.h"
#include "hw/irq.h"
-#include "sysemu/sysemu.h"
#include "alpha_sys.h"
#include "exec/address-spaces.h"
diff --git a/hw/arm/nrf51_soc.c b/hw/arm/nrf51_soc.c
index d9e54fefbb..74029169d0 100644
--- a/hw/arm/nrf51_soc.c
+++ b/hw/arm/nrf51_soc.c
@@ -14,7 +14,6 @@
#include "hw/sysbus.h"
#include "hw/misc/unimp.h"
#include "exec/address-spaces.h"
-#include "sysemu/sysemu.h"
#include "qemu/log.h"
#include "cpu.h"
diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c
index 717d22bcbe..956ebe32c8 100644
--- a/hw/arm/smmu-common.c
+++ b/hw/arm/smmu-common.c
@@ -17,7 +17,6 @@
*/
#include "qemu/osdep.h"
-#include "sysemu/sysemu.h"
#include "exec/address-spaces.h"
#include "trace.h"
#include "exec/target_page.h"
diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c
index 0ccc772390..2eaf07fb5f 100644
--- a/hw/arm/smmuv3.c
+++ b/hw/arm/smmuv3.c
@@ -18,7 +18,6 @@
#include "qemu/osdep.h"
#include "hw/irq.h"
-#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
#include "hw/qdev-core.h"
diff --git a/hw/arm/sysbus-fdt.c b/hw/arm/sysbus-fdt.c
index 57f94e6581..022fc97ecd 100644
--- a/hw/arm/sysbus-fdt.c
+++ b/hw/arm/sysbus-fdt.c
@@ -31,7 +31,6 @@
#include "qemu/error-report.h"
#include "sysemu/device_tree.h"
#include "hw/platform-bus.h"
-#include "sysemu/sysemu.h"
#include "hw/vfio/vfio-platform.h"
#include "hw/vfio/vfio-calxeda-xgmac.h"
#include "hw/vfio/vfio-amd-xgbe.h"
diff --git a/hw/arm/z2.c b/hw/arm/z2.c
index 1e3db425ef..3923b87e4c 100644
--- a/hw/arm/z2.c
+++ b/hw/arm/z2.c
@@ -19,7 +19,6 @@
#include "hw/ssi/ssi.h"
#include "migration/vmstate.h"
#include "hw/boards.h"
-#include "sysemu/sysemu.h"
#include "hw/block/flash.h"
#include "ui/console.h"
#include "hw/audio/wm8750.h"
diff --git a/hw/char/exynos4210_uart.c b/hw/char/exynos4210_uart.c
index 49e279d5df..d6b6b62366 100644
--- a/hw/char/exynos4210_uart.c
+++ b/hw/char/exynos4210_uart.c
@@ -24,7 +24,6 @@
#include "migration/vmstate.h"
#include "qemu/error-report.h"
#include "qemu/module.h"
-#include "sysemu/sysemu.h"
#include "chardev/char-fe.h"
#include "chardev/char-serial.h"
diff --git a/hw/char/imx_serial.c b/hw/char/imx_serial.c
index e49baa994c..fddde9b43d 100644
--- a/hw/char/imx_serial.c
+++ b/hw/char/imx_serial.c
@@ -23,7 +23,6 @@
#include "hw/irq.h"
#include "hw/qdev-properties.h"
#include "migration/vmstate.h"
-#include "sysemu/sysemu.h"
#include "qemu/log.h"
#include "qemu/module.h"
diff --git a/hw/char/serial.c b/hw/char/serial.c
index 4d54163a62..72580f19d0 100644
--- a/hw/char/serial.c
+++ b/hw/char/serial.c
@@ -31,6 +31,7 @@
#include "qapi/error.h"
#include "qemu/timer.h"
#include "sysemu/reset.h"
+#include "sysemu/sysemu.h"
#include "qemu/error-report.h"
#include "trace.h"
diff --git a/hw/core/loader-fit.c b/hw/core/loader-fit.c
index f27b6af942..953b16bc82 100644
--- a/hw/core/loader-fit.c
+++ b/hw/core/loader-fit.c
@@ -26,7 +26,6 @@
#include "qemu/cutils.h"
#include "qemu/error-report.h"
#include "sysemu/device_tree.h"
-#include "sysemu/sysemu.h"
#include <libfdt.h>
#include <zlib.h>
diff --git a/hw/core/platform-bus.c b/hw/core/platform-bus.c
index 9c9a9c271f..edb0da1de8 100644
--- a/hw/core/platform-bus.c
+++ b/hw/core/platform-bus.c
@@ -24,7 +24,6 @@
#include "hw/qdev-properties.h"
#include "qemu/error-report.h"
#include "qemu/module.h"
-#include "sysemu/sysemu.h"
/*
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index 8c055df1cb..60d66c2f39 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -26,7 +26,6 @@
this API directly. */
#include "qemu/osdep.h"
-#include "sysemu/sysemu.h"
#include "qapi/error.h"
#include "qapi/qapi-events-qdev.h"
#include "qapi/qmp/qerror.h"
diff --git a/hw/display/ramfb-standalone.c b/hw/display/ramfb-standalone.c
index ebd623a669..1f72450303 100644
--- a/hw/display/ramfb-standalone.c
+++ b/hw/display/ramfb-standalone.c
@@ -6,7 +6,6 @@
#include "hw/isa/isa.h"
#include "hw/display/ramfb.h"
#include "ui/console.h"
-#include "sysemu/sysemu.h"
#define RAMFB(obj) OBJECT_CHECK(RAMFBStandaloneState, (obj), TYPE_RAMFB_DEVICE)
diff --git a/hw/display/ramfb.c b/hw/display/ramfb.c
index 6026a35b11..cd94940223 100644
--- a/hw/display/ramfb.c
+++ b/hw/display/ramfb.c
@@ -18,7 +18,6 @@
#include "hw/display/ramfb.h"
#include "ui/console.h"
#include "sysemu/reset.h"
-#include "sysemu/sysemu.h"
struct QEMU_PACKED RAMFBCfg {
uint64_t addr;
diff --git a/hw/dma/xlnx-zynq-devcfg.c b/hw/dma/xlnx-zynq-devcfg.c
index 89200ff15d..e33112b6f0 100644
--- a/hw/dma/xlnx-zynq-devcfg.c
+++ b/hw/dma/xlnx-zynq-devcfg.c
@@ -29,7 +29,6 @@
#include "hw/irq.h"
#include "migration/vmstate.h"
#include "qemu/bitops.h"
-#include "sysemu/sysemu.h"
#include "sysemu/dma.h"
#include "qemu/log.h"
#include "qemu/module.h"
diff --git a/hw/hppa/dino.c b/hw/hppa/dino.c
index bb9d0e033c..e0466ee055 100644
--- a/hw/hppa/dino.c
+++ b/hw/hppa/dino.c
@@ -16,7 +16,6 @@
#include "qapi/error.h"
#include "cpu.h"
#include "hw/irq.h"
-#include "sysemu/sysemu.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_bus.h"
#include "migration/vmstate.h"
diff --git a/hw/hppa/pci.c b/hw/hppa/pci.c
index b6606d9719..32609aba63 100644
--- a/hw/hppa/pci.c
+++ b/hw/hppa/pci.c
@@ -6,7 +6,6 @@
#include "qemu/osdep.h"
#include "hppa_sys.h"
#include "qemu/log.h"
-#include "sysemu/sysemu.h"
#include "trace.h"
diff --git a/hw/i2c/smbus_ich9.c b/hw/i2c/smbus_ich9.c
index 564198dae9..fd50fb851a 100644
--- a/hw/i2c/smbus_ich9.c
+++ b/hw/i2c/smbus_ich9.c
@@ -25,7 +25,6 @@
#include "hw/pci/pci.h"
#include "migration/vmstate.h"
#include "qemu/module.h"
-#include "sysemu/sysemu.h"
#include "hw/i386/ich9.h"
diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c
index 3fbfc5ea45..f3ccd11c79 100644
--- a/hw/ide/cmd646.c
+++ b/hw/ide/cmd646.c
@@ -29,7 +29,6 @@
#include "migration/vmstate.h"
#include "qemu/module.h"
#include "hw/isa/isa.h"
-#include "sysemu/sysemu.h"
#include "sysemu/dma.h"
#include "sysemu/reset.h"
diff --git a/hw/ide/ioport.c b/hw/ide/ioport.c
index e6085612d4..ab1f4e5d9c 100644
--- a/hw/ide/ioport.c
+++ b/hw/ide/ioport.c
@@ -27,7 +27,6 @@
#include "hw/isa/isa.h"
#include "qemu/error-report.h"
#include "qemu/timer.h"
-#include "sysemu/sysemu.h"
#include "sysemu/blockdev.h"
#include "sysemu/dma.h"
#include "hw/block/block.h"
diff --git a/hw/ide/piix.c b/hw/ide/piix.c
index bcfd119a8e..fba6bc8bff 100644
--- a/hw/ide/piix.c
+++ b/hw/ide/piix.c
@@ -28,7 +28,6 @@
#include "migration/vmstate.h"
#include "qemu/module.h"
#include "sysemu/block-backend.h"
-#include "sysemu/sysemu.h"
#include "sysemu/blockdev.h"
#include "sysemu/dma.h"
#include "sysemu/reset.h"
diff --git a/hw/ide/via.c b/hw/ide/via.c
index 45f929395f..7087dc676e 100644
--- a/hw/ide/via.c
+++ b/hw/ide/via.c
@@ -28,7 +28,6 @@
#include "hw/pci/pci.h"
#include "migration/vmstate.h"
#include "qemu/module.h"
-#include "sysemu/sysemu.h"
#include "sysemu/dma.h"
#include "sysemu/reset.h"
diff --git a/hw/input/adb-kbd.c b/hw/input/adb-kbd.c
index b3c4aeded1..0ba8207589 100644
--- a/hw/input/adb-kbd.c
+++ b/hw/input/adb-kbd.c
@@ -28,7 +28,6 @@
#include "qemu/module.h"
#include "ui/input.h"
#include "hw/input/adb-keys.h"
-#include "sysemu/sysemu.h"
#include "adb-internal.h"
#include "trace.h"
diff --git a/hw/intc/allwinner-a10-pic.c b/hw/intc/allwinner-a10-pic.c
index 79959a4d23..8cca124807 100644
--- a/hw/intc/allwinner-a10-pic.c
+++ b/hw/intc/allwinner-a10-pic.c
@@ -18,7 +18,6 @@
#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
-#include "sysemu/sysemu.h"
#include "hw/intc/allwinner-a10-pic.h"
#include "hw/irq.h"
#include "qemu/log.h"
diff --git a/hw/intc/mips_gic.c b/hw/intc/mips_gic.c
index 524cc3ca45..54b3059f3f 100644
--- a/hw/intc/mips_gic.c
+++ b/hw/intc/mips_gic.c
@@ -15,7 +15,6 @@
#include "qapi/error.h"
#include "hw/sysbus.h"
#include "exec/memory.h"
-#include "sysemu/sysemu.h"
#include "sysemu/kvm.h"
#include "sysemu/reset.h"
#include "kvm_mips.h"
diff --git a/hw/intc/xics_pnv.c b/hw/intc/xics_pnv.c
index 67f2702e52..35f3811264 100644
--- a/hw/intc/xics_pnv.c
+++ b/hw/intc/xics_pnv.c
@@ -19,7 +19,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "sysemu/sysemu.h"
#include "qemu/log.h"
#include "qemu/module.h"
#include "hw/ppc/xics.h"
diff --git a/hw/ipmi/ipmi_bmc_extern.c b/hw/ipmi/ipmi_bmc_extern.c
index 4405aa634e..573428eca1 100644
--- a/hw/ipmi/ipmi_bmc_extern.c
+++ b/hw/ipmi/ipmi_bmc_extern.c
@@ -33,7 +33,6 @@
#include "qapi/error.h"
#include "qemu/timer.h"
#include "chardev/char-fe.h"
-#include "sysemu/sysemu.h"
#include "hw/ipmi/ipmi.h"
#include "hw/qdev-properties.h"
#include "migration/vmstate.h"
diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
index 1bc915405b..50bd28fa82 100644
--- a/hw/isa/vt82c686.c
+++ b/hw/isa/vt82c686.c
@@ -24,7 +24,6 @@
#include "hw/acpi/acpi.h"
#include "hw/i2c/pm_smbus.h"
#include "sysemu/reset.h"
-#include "sysemu/sysemu.h"
#include "qemu/module.h"
#include "qemu/timer.h"
#include "exec/address-spaces.h"
diff --git a/hw/misc/armsse-cpuid.c b/hw/misc/armsse-cpuid.c
index 5f225096f6..8ab15fea81 100644
--- a/hw/misc/armsse-cpuid.c
+++ b/hw/misc/armsse-cpuid.c
@@ -23,7 +23,6 @@
#include "qemu/module.h"
#include "trace.h"
#include "qapi/error.h"
-#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
#include "hw/registerfields.h"
#include "hw/misc/armsse-cpuid.h"
diff --git a/hw/misc/armsse-mhu.c b/hw/misc/armsse-mhu.c
index 34b6205f11..a45d97fada 100644
--- a/hw/misc/armsse-mhu.c
+++ b/hw/misc/armsse-mhu.c
@@ -20,7 +20,6 @@
#include "qemu/module.h"
#include "trace.h"
#include "qapi/error.h"
-#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
#include "hw/registerfields.h"
diff --git a/hw/misc/imx6_src.c b/hw/misc/imx6_src.c
index b9d86fe530..8ab18967b5 100644
--- a/hw/misc/imx6_src.c
+++ b/hw/misc/imx6_src.c
@@ -11,7 +11,6 @@
#include "qemu/osdep.h"
#include "hw/misc/imx6_src.h"
#include "migration/vmstate.h"
-#include "sysemu/sysemu.h"
#include "qemu/bitops.h"
#include "qemu/log.h"
#include "qemu/main-loop.h"
diff --git a/hw/misc/imx7_gpr.c b/hw/misc/imx7_gpr.c
index 09d57d4710..b03341a2eb 100644
--- a/hw/misc/imx7_gpr.c
+++ b/hw/misc/imx7_gpr.c
@@ -16,7 +16,6 @@
#include "hw/misc/imx7_gpr.h"
#include "qemu/log.h"
#include "qemu/module.h"
-#include "sysemu/sysemu.h"
#include "trace.h"
diff --git a/hw/misc/iotkit-sysinfo.c b/hw/misc/iotkit-sysinfo.c
index 0106fa48d3..783e613959 100644
--- a/hw/misc/iotkit-sysinfo.c
+++ b/hw/misc/iotkit-sysinfo.c
@@ -22,7 +22,6 @@
#include "qemu/module.h"
#include "trace.h"
#include "qapi/error.h"
-#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
#include "hw/registerfields.h"
#include "hw/misc/iotkit-sysinfo.h"
diff --git a/hw/misc/mips_cmgcr.c b/hw/misc/mips_cmgcr.c
index 0feab092f1..8176d91c0c 100644
--- a/hw/misc/mips_cmgcr.c
+++ b/hw/misc/mips_cmgcr.c
@@ -14,7 +14,6 @@
#include "qemu/module.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
-#include "sysemu/sysemu.h"
#include "hw/misc/mips_cmgcr.h"
#include "hw/misc/mips_cpc.h"
#include "hw/qdev-properties.h"
diff --git a/hw/misc/mos6522.c b/hw/misc/mos6522.c
index 4d99350e22..57f13db266 100644
--- a/hw/misc/mos6522.c
+++ b/hw/misc/mos6522.c
@@ -31,7 +31,6 @@
#include "hw/qdev-properties.h"
#include "migration/vmstate.h"
#include "qemu/timer.h"
-#include "sysemu/sysemu.h"
#include "qemu/cutils.h"
#include "qemu/log.h"
#include "qemu/module.h"
diff --git a/hw/misc/sga.c b/hw/misc/sga.c
index da04924f5f..6866bf72cb 100644
--- a/hw/misc/sga.c
+++ b/hw/misc/sga.c
@@ -29,7 +29,6 @@
#include "hw/isa/isa.h"
#include "hw/loader.h"
#include "qemu/module.h"
-#include "sysemu/sysemu.h"
#define SGABIOS_FILENAME "sgabios.bin"
diff --git a/hw/misc/zynq-xadc.c b/hw/misc/zynq-xadc.c
index 7745df4c85..7b1972ce06 100644
--- a/hw/misc/zynq-xadc.c
+++ b/hw/misc/zynq-xadc.c
@@ -18,7 +18,6 @@
#include "hw/misc/zynq-xadc.h"
#include "migration/vmstate.h"
#include "qemu/timer.h"
-#include "sysemu/sysemu.h"
#include "qemu/log.h"
#include "qemu/module.h"
diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c
index e1556236b0..8451c17fb8 100644
--- a/hw/net/fsl_etsec/etsec.c
+++ b/hw/net/fsl_etsec/etsec.c
@@ -27,7 +27,6 @@
*/
#include "qemu/osdep.h"
-#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
#include "hw/irq.h"
#include "hw/ptimer.h"
diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c
index e7662f0575..8bba2a8056 100644
--- a/hw/net/lan9118.c
+++ b/hw/net/lan9118.c
@@ -18,7 +18,6 @@
#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/net/lan9118.h"
-#include "sysemu/sysemu.h"
#include "hw/ptimer.h"
#include "hw/qdev-properties.h"
#include "qemu/log.h"
diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c
index a1a1046494..6c17ee1ae2 100644
--- a/hw/net/ne2000.c
+++ b/hw/net/ne2000.c
@@ -29,7 +29,6 @@
#include "hw/irq.h"
#include "migration/vmstate.h"
#include "ne2000.h"
-#include "sysemu/sysemu.h"
#include "trace.h"
/* debug NE2000 card */
diff --git a/hw/net/opencores_eth.c b/hw/net/opencores_eth.c
index aa13159464..84a95da1d5 100644
--- a/hw/net/opencores_eth.c
+++ b/hw/net/opencores_eth.c
@@ -39,7 +39,6 @@
#include "net/net.h"
#include "qemu/module.h"
#include "net/eth.h"
-#include "sysemu/sysemu.h"
#include "trace.h"
/* RECSMALL is not used because it breaks tap networking in linux:
diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c
index 107ac680b2..f3f18d8598 100644
--- a/hw/net/pcnet.c
+++ b/hw/net/pcnet.c
@@ -43,7 +43,6 @@
#include "net/net.h"
#include "net/eth.h"
#include "qemu/timer.h"
-#include "sysemu/sysemu.h"
#include "trace.h"
#include "pcnet.h"
diff --git a/hw/nios2/generic_nommu.c b/hw/nios2/generic_nommu.c
index 2ec91e899b..19899e2c1e 100644
--- a/hw/nios2/generic_nommu.c
+++ b/hw/nios2/generic_nommu.c
@@ -33,7 +33,6 @@
#include "hw/sysbus.h"
#include "hw/char/serial.h"
-#include "sysemu/sysemu.h"
#include "hw/boards.h"
#include "exec/memory.h"
#include "exec/address-spaces.h"
diff --git a/hw/pci-host/pam.c b/hw/pci-host/pam.c
index aa5ecfd0c2..45c4333cd3 100644
--- a/hw/pci-host/pam.c
+++ b/hw/pci-host/pam.c
@@ -29,7 +29,6 @@
#include "qemu/osdep.h"
#include "qom/object.h"
-#include "sysemu/sysemu.h"
#include "hw/pci-host/pam.h"
void init_pam(DeviceState *dev, MemoryRegion *ram_memory,
diff --git a/hw/ppc/pnv_bmc.c b/hw/ppc/pnv_bmc.c
index a27776aa99..e5eb6e5a70 100644
--- a/hw/ppc/pnv_bmc.c
+++ b/hw/ppc/pnv_bmc.c
@@ -17,7 +17,6 @@
*/
#include "qemu/osdep.h"
-#include "sysemu/sysemu.h"
#include "target/ppc/cpu.h"
#include "qemu/log.h"
#include "hw/ipmi/ipmi.h"
diff --git a/hw/ppc/pnv_core.c b/hw/ppc/pnv_core.c
index c6b0fee56f..b1a7489e7a 100644
--- a/hw/ppc/pnv_core.c
+++ b/hw/ppc/pnv_core.c
@@ -19,7 +19,6 @@
#include "qemu/osdep.h"
#include "sysemu/reset.h"
-#include "sysemu/sysemu.h"
#include "qapi/error.h"
#include "qemu/log.h"
#include "qemu/module.h"
diff --git a/hw/ppc/pnv_lpc.c b/hw/ppc/pnv_lpc.c
index d4433d73e1..9466d4a1be 100644
--- a/hw/ppc/pnv_lpc.c
+++ b/hw/ppc/pnv_lpc.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "sysemu/sysemu.h"
#include "target/ppc/cpu.h"
#include "qapi/error.h"
#include "qemu/log.h"
diff --git a/hw/ppc/pnv_occ.c b/hw/ppc/pnv_occ.c
index 6120405379..8bead2c930 100644
--- a/hw/ppc/pnv_occ.c
+++ b/hw/ppc/pnv_occ.c
@@ -17,7 +17,6 @@
*/
#include "qemu/osdep.h"
-#include "sysemu/sysemu.h"
#include "target/ppc/cpu.h"
#include "qapi/error.h"
#include "qemu/log.h"
diff --git a/hw/ppc/ppce500_spin.c b/hw/ppc/ppce500_spin.c
index 0060fcb43f..66c1065db2 100644
--- a/hw/ppc/ppce500_spin.c
+++ b/hw/ppc/ppce500_spin.c
@@ -33,7 +33,6 @@
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "sysemu/hw_accel.h"
-#include "sysemu/sysemu.h"
#include "e500.h"
#define MAX_CPUS 32
diff --git a/hw/ppc/spapr_rng.c b/hw/ppc/spapr_rng.c
index 27198e0ced..954e4aec4b 100644
--- a/hw/ppc/spapr_rng.c
+++ b/hw/ppc/spapr_rng.c
@@ -23,7 +23,6 @@
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"
-#include "sysemu/sysemu.h"
#include "sysemu/device_tree.h"
#include "sysemu/rng.h"
#include "hw/ppc/spapr.h"
diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c
index 910c57fce5..0803649658 100644
--- a/hw/ppc/spapr_vio.c
+++ b/hw/ppc/spapr_vio.c
@@ -25,7 +25,6 @@
#include "qapi/visitor.h"
#include "hw/irq.h"
#include "qemu/log.h"
-#include "sysemu/sysemu.h"
#include "hw/loader.h"
#include "elf.h"
#include "hw/sysbus.h"
diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c
index 056f0711fa..797ecbb7a9 100644
--- a/hw/s390x/event-facility.c
+++ b/hw/s390x/event-facility.c
@@ -18,7 +18,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu/module.h"
-#include "sysemu/sysemu.h"
#include "hw/s390x/sclp.h"
#include "migration/vmstate.h"
diff --git a/hw/s390x/sclpcpu.c b/hw/s390x/sclpcpu.c
index a4aab7df51..62806d3273 100644
--- a/hw/s390x/sclpcpu.c
+++ b/hw/s390x/sclpcpu.c
@@ -14,7 +14,6 @@
*/
#include "qemu/osdep.h"
-#include "sysemu/sysemu.h"
#include "hw/s390x/sclp.h"
#include "qemu/module.h"
#include "hw/s390x/event-facility.h"
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index a371370221..6580ce5907 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -12,7 +12,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "sysemu/sysemu.h"
#include "sysemu/kvm.h"
#include "net/net.h"
#include "hw/virtio/virtio.h"
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index 6370cfe190..915641a0f1 100644
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -30,7 +30,6 @@
#include "migration/vmstate.h"
#include "hw/scsi/emulation.h"
#include "scsi/constants.h"
-#include "sysemu/sysemu.h"
#include "sysemu/block-backend.h"
#include "sysemu/blockdev.h"
#include "hw/block/block.h"
diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c
index 79a9a5c52c..926e1af475 100644
--- a/hw/sd/milkymist-memcard.c
+++ b/hw/sd/milkymist-memcard.c
@@ -26,7 +26,6 @@
#include "qemu/module.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
-#include "sysemu/sysemu.h"
#include "trace.h"
#include "qapi/error.h"
#include "sysemu/block-backend.h"
diff --git a/hw/semihosting/config.c b/hw/semihosting/config.c
index 2a8e7e1045..9807f10cb0 100644
--- a/hw/semihosting/config.c
+++ b/hw/semihosting/config.c
@@ -24,6 +24,7 @@
#include "qemu/error-report.h"
#include "hw/semihosting/semihost.h"
#include "chardev/char.h"
+#include "sysemu/sysemu.h"
QemuOptsList qemu_semihosting_config_opts = {
.name = "semihosting-config",
diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c
index b8332150f1..9f3cff5fb6 100644
--- a/hw/ssi/aspeed_smc.c
+++ b/hw/ssi/aspeed_smc.c
@@ -25,7 +25,6 @@
#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
-#include "sysemu/sysemu.h"
#include "qemu/log.h"
#include "qemu/module.h"
#include "qemu/error-report.h"
diff --git a/hw/ssi/imx_spi.c b/hw/ssi/imx_spi.c
index c918e8cac8..2dd9a631e1 100644
--- a/hw/ssi/imx_spi.c
+++ b/hw/ssi/imx_spi.c
@@ -12,7 +12,6 @@
#include "hw/irq.h"
#include "hw/ssi/imx_spi.h"
#include "migration/vmstate.h"
-#include "sysemu/sysemu.h"
#include "qemu/log.h"
#include "qemu/module.h"
diff --git a/hw/ssi/xilinx_spi.c b/hw/ssi/xilinx_spi.c
index 24280dfeab..a1be0de039 100644
--- a/hw/ssi/xilinx_spi.c
+++ b/hw/ssi/xilinx_spi.c
@@ -27,7 +27,6 @@
#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
-#include "sysemu/sysemu.h"
#include "qemu/log.h"
#include "qemu/module.h"
#include "qemu/fifo8.h"
diff --git a/hw/ssi/xilinx_spips.c b/hw/ssi/xilinx_spips.c
index 1605fa102b..a309c712ca 100644
--- a/hw/ssi/xilinx_spips.c
+++ b/hw/ssi/xilinx_spips.c
@@ -24,7 +24,6 @@
#include "qemu/osdep.h"
#include "hw/sysbus.h"
-#include "sysemu/sysemu.h"
#include "hw/irq.h"
#include "hw/ptimer.h"
#include "hw/qdev-properties.h"
diff --git a/hw/timer/allwinner-a10-pit.c b/hw/timer/allwinner-a10-pit.c
index 1e1f74f1a1..ca5a905059 100644
--- a/hw/timer/allwinner-a10-pit.c
+++ b/hw/timer/allwinner-a10-pit.c
@@ -19,7 +19,6 @@
#include "hw/irq.h"
#include "hw/qdev-properties.h"
#include "hw/sysbus.h"
-#include "sysemu/sysemu.h"
#include "hw/timer/allwinner-a10-pit.h"
#include "migration/vmstate.h"
#include "qemu/log.h"
diff --git a/hw/timer/altera_timer.c b/hw/timer/altera_timer.c
index c9988f67ac..936b31311d 100644
--- a/hw/timer/altera_timer.c
+++ b/hw/timer/altera_timer.c
@@ -24,7 +24,6 @@
#include "qapi/error.h"
#include "hw/sysbus.h"
-#include "sysemu/sysemu.h"
#include "hw/irq.h"
#include "hw/ptimer.h"
#include "hw/qdev-properties.h"
diff --git a/hw/timer/exynos4210_rtc.c b/hw/timer/exynos4210_rtc.c
index 5c954cfa01..ea68904229 100644
--- a/hw/timer/exynos4210_rtc.c
+++ b/hw/timer/exynos4210_rtc.c
@@ -37,7 +37,6 @@
#include "hw/ptimer.h"
#include "hw/irq.h"
-#include "sysemu/sysemu.h"
#include "hw/arm/exynos4210.h"
diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.c
index c6305dcdf1..aef3289f8c 100644
--- a/hw/tricore/tricore_testboard.c
+++ b/hw/tricore/tricore_testboard.c
@@ -23,7 +23,6 @@
#include "qapi/error.h"
#include "cpu.h"
#include "net/net.h"
-#include "sysemu/sysemu.h"
#include "hw/boards.h"
#include "hw/loader.h"
#include "exec/address-spaces.h"
diff --git a/hw/usb/hcd-ehci.h b/hw/usb/hcd-ehci.h
index fdbcfdcbeb..0298238f0b 100644
--- a/hw/usb/hcd-ehci.h
+++ b/hw/usb/hcd-ehci.h
@@ -21,7 +21,6 @@
#include "qemu/timer.h"
#include "hw/usb.h"
#include "sysemu/dma.h"
-#include "sysemu/sysemu.h"
#include "hw/pci/pci.h"
#include "hw/sysbus.h"
diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c
index d53453aad6..da6a20669d 100644
--- a/hw/vfio/ap.c
+++ b/hw/vfio/ap.c
@@ -25,7 +25,6 @@
#include "cpu.h"
#include "kvm_s390x.h"
#include "migration/vmstate.h"
-#include "sysemu/sysemu.h"
#include "hw/qdev-properties.h"
#include "hw/s390x/ap-bridge.h"
#include "exec/address-spaces.h"
diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c
index d14f6b4a7a..d7598c6152 100644
--- a/hw/vfio/platform.c
+++ b/hw/vfio/platform.c
@@ -25,7 +25,6 @@
#include "qemu/main-loop.h"
#include "qemu/module.h"
#include "qemu/range.h"
-#include "sysemu/sysemu.h"
#include "exec/memory.h"
#include "exec/address-spaces.h"
#include "qemu/queue.h"
diff --git a/hw/xen/xen_pt_load_rom.c b/hw/xen/xen_pt_load_rom.c
index d111ecaf7e..307a5c93e2 100644
--- a/hw/xen/xen_pt_load_rom.c
+++ b/hw/xen/xen_pt_load_rom.c
@@ -9,7 +9,6 @@
#include "hw/loader.h"
#include "monitor/monitor.h"
#include "qemu/range.h"
-#include "sysemu/sysemu.h"
#include "hw/pci/pci.h"
#include "xen_pt.h"
diff --git a/hw/xtensa/xtensa_memory.c b/hw/xtensa/xtensa_memory.c
index 40334db441..1c5f62b014 100644
--- a/hw/xtensa/xtensa_memory.c
+++ b/hw/xtensa/xtensa_memory.c
@@ -28,7 +28,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "cpu.h"
-#include "sysemu/sysemu.h"
#include "exec/memory.h"
#include "qemu/error-report.h"
#include "xtensa_memory.h"