Clean up inclusion of sysemu/sysemu.h

In my "build everything" tree, changing sysemu/sysemu.h triggers a
recompile of some 5400 out of 6600 objects (not counting tests and
objects that don't depend on qemu/osdep.h).

Almost a third of its inclusions are actually superfluous.  Delete
them.  Downgrade two more to qapi/qapi-types-run-state.h, and move one
from char/serial.h to char/serial.c.

hw/semihosting/config.c, monitor/monitor.c, qdev-monitor.c, and
stubs/semihost.c define variables declared in sysemu/sysemu.h without
including it.  The compiler is cool with that, but include it anyway.

This doesn't reduce actual use much, as it's still included into
widely included headers.  The next commit will tackle that.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-Id: <20190812052359.30071-27-armbru@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c
index c92d4c82eddf3262b009b43f8b8336c00b7bc572..c59d5b002457ccc9d5d26338615d11868d3ce262 100644 (file)
--- a/accel/tcg/tcg-all.c
+++ b/accel/tcg/tcg-all.c
@@ -25,7 +25,6 @@
 
 #include "qemu/osdep.h"
 #include "sysemu/accel.h"
-#include "sysemu/sysemu.h"
 #include "sysemu/tcg.h"
 #include "qom/object.h"
 #include "cpu.h"

diff --git a/block/nfs.c b/block/nfs.c
index a1fe004c6155ce76bfa22097e38e7026a5f128fe..ed0cce63bb739adb8063b69814cb0bca0ebc7c47 100644 (file)
--- a/block/nfs.c
+++ b/block/nfs.c
@@ -37,7 +37,6 @@
 #include "qemu/option.h"
 #include "qemu/uri.h"
 #include "qemu/cutils.h"
-#include "sysemu/sysemu.h"
 #include "qapi/qapi-visit-block-core.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"

diff --git a/blockdev-nbd.c b/blockdev-nbd.c
index 66eebab31875dfab1d18a898ca9b18a186c10f91..7a71da447fd04b60ffe3d863ca50119842317437 100644 (file)
--- a/blockdev-nbd.c
+++ b/blockdev-nbd.c
@@ -15,7 +15,6 @@
 #include "hw/block/block.h"
 #include "qapi/error.h"
 #include "qapi/qapi-commands-block.h"
-#include "sysemu/sysemu.h"
 #include "block/nbd.h"
 #include "io/channel-socket.h"
 #include "io/net-listener.h"

diff --git a/dump/win_dump.c b/dump/win_dump.c
index 0142655d3d06ae4fecbfd65136a0a00056d1fad9..eda2a48974252fed14c992b6f0596da9e221e74c 100644 (file)
--- a/dump/win_dump.c
+++ b/dump/win_dump.c
@@ -17,7 +17,6 @@
 #include "monitor/monitor.h"
 #include "sysemu/kvm.h"
 #include "sysemu/dump.h"
-#include "sysemu/sysemu.h"
 #include "sysemu/memory_mapping.h"
 #include "sysemu/cpus.h"
 #include "qapi/error.h"

diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c
index ac49a5a77b7ba3c010c2da4f51d02dcd91aca96b..82d295b6e817acbfd00da9167b64fcd8a6b78f67 100644 (file)
--- 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 4eae426969a841a8c80a43599dec2a074811f17c..6e11b0fa9b564bfbdb7aef95ebb150e8419ab2a2 100644 (file)
--- 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 fb902bb92d7a544aca4864278a6a04b76f4ac34a..72251fcdf004c97707c3e1284d5dfc84e12b81ad 100644 (file)
--- 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 1c0565acc1635c31eea65f03b5c4f78dcecd84c6..179e1f7658367ebf7df5811f6ab45ffc0933fe33 100644 (file)
--- 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 d9e54fefbb68e669f79d99129d6078dd06388697..74029169d02a1b2818ccd3f37ae012d28a59056a 100644 (file)
--- 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 717d22bcbe78c62b339fe0091876aed229e79d75..956ebe32c8cde746b75dfb29b19fe7d0e484161b 100644 (file)
--- 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 0ccc77239008c759d65659c35f2ef89ebd39244d..2eaf07fb5f6e055181314f09af53c457db95a378 100644 (file)
--- 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 57f94e6581b6199f70af0f33c95ed975ef8922de..022fc97ecd88ac568fe43a83697204f4ce4706ee 100644 (file)
--- 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 1e3db425ef97bdba408bb9a4554bfb7c759272ef..3923b87e4c96d27579602a7f1ded3cec88a5e722 100644 (file)
--- 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 49e279d5dfbf53ac227068a40a77e99d0dbc025b..d6b6b62366eb2065c060e3d92ec38a9e7b507e9e 100644 (file)
--- 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 e49baa994ce3a5b7f7dd4d5d4833350c13e72b1f..fddde9b43d5aefd48aa262d61ef317b907e98424 100644 (file)
--- 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 4d54163a620517ce46eaac5497678ca1df39b843..72580f19d077a5c52df67f17d69fbe7c9ff19713 100644 (file)
--- 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 f27b6af94293d42be47007f63d2c44de4d76995d..953b16bc82ae170a9c277a1c6c9d5614078f07f5 100644 (file)
--- 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 9c9a9c271fdef471ef295f7efee3b1bf8390f190..edb0da1de88d3143170012603ff6c8cad67ffc7c 100644 (file)
--- 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 8c055df1cbe34b5ae2de80251718b93806bc2b7d..60d66c2f3966002f52d7170dae64eef2844c0003 100644 (file)
--- 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 ebd623a669e57c2c4864b000f2c4a1155ef61730..1f724503031ff90924c91f522256377a2380f742 100644 (file)
--- 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 6026a35b1115739281797f8b8d02a120e1835416..cd94940223bacd49c9386cd9d8e05eed1425bc57 100644 (file)
--- 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 89200ff15dbbd5b9c5ae251882d6bf84fe1caeb0..e33112b6f0ea94e50ba0e9e8170dd5301164cb47 100644 (file)
--- 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 bb9d0e033ccf8b85594d0c29181b535d6f362a0a..e0466ee055ac707d6f000b454ea543d632d038e1 100644 (file)
--- 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 b6606d9719c5156abc066aad1876a7ffbccd06c0..32609aba63e73163cbaa49ce5171d717085be516 100644 (file)
--- 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 564198dae99605e5d11a22ef14db158145256838..fd50fb851af4b33a7dd26dc5128b93023b1a9345 100644 (file)
--- 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 3fbfc5ea4543cd009b58dbe4ca71349b67bc054e..f3ccd11c79d0fe52d9f9a7793193f24ee23721b9 100644 (file)
--- 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 e6085612d4c29d4dcb2af2062750da84bdd32e1f..ab1f4e5d9c06e87b6ed6f7011b491e37f3a6f9d4 100644 (file)
--- 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 bcfd119a8eac8e6c8dc2a77ec51a3c5df2df9e33..fba6bc8bffe199aae0b0475111faf645c15f5a18 100644 (file)
--- 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 45f929395fd1b9e58e84f627af1f2dda76805edd..7087dc676ef1a4ee8b67c821f1a74dfdd938ded4 100644 (file)
--- 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 b3c4aeded13bea1c607df42a5b8c50d7edbde0a8..0ba82075897fb96c56fe5d6a467186f0e7579055 100644 (file)
--- 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 79959a4d230506a57be384fad725631af709e53f..8cca12480736e245040b307d4e0aa6804d8d8875 100644 (file)
--- 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 524cc3ca45811ba98e2321792b2e85f86f71fc78..54b3059f3fd9fde91c825bdecd5ff62023956fac 100644 (file)
--- 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 67f2702e521c842fc97ca4f95aba3488939d551b..35f38112649f908eeb985c3d981937a3b112e24a 100644 (file)
--- 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 4405aa634eaf88adfb0bd277bad56d73559b864f..573428eca1b2dc774fac8a362ffdb6a06155ed03 100644 (file)
--- 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 1bc915405b2adfa69f1a4a5ef715a1310244d117..50bd28fa82bf0665211266ea35b0d6bec6e41cad 100644 (file)
--- 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 5f225096f603cda3aa852ebf2d1907a22405e012..8ab15fea8162ed95a26a0b87842fe31efe7efed4 100644 (file)
--- 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 34b6205f11a7615c280123240c028396df446abd..a45d97fada839bc3c8e01cce58ac74082ff19a5d 100644 (file)
--- 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 b9d86fe5300ec8eb49b10184fbfd01ab27cceb93..8ab18967b560330c76f1a9f3d84b1bf06e842536 100644 (file)
--- 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 09d57d4710cb9f6b3a3f2e091b82297bbd733682..b03341a2eba7cb12313ae36a4e42f15adbdf9a2b 100644 (file)
--- 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 0106fa48d35af3cfa8069202deebef0febadbf4b..783e613959f47720b2f5d5bdf8350a374e64ead0 100644 (file)
--- 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 0feab092f158fa6445bf54d54c73bc2042224bc3..8176d91c0ccf3058cc46ec32144eab9309f3bae6 100644 (file)
--- 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 4d99350e227cad47b514249319f04632915f138b..57f13db266b410936a62cf030ea98a9eded283c8 100644 (file)
--- 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 da04924f5f0078865ea7a13643eda615173fdfe4..6866bf72cb7c5ebea51a1a07b036b5cb05715899 100644 (file)
--- 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 7745df4c853dd30709611fe5d2d7b0fb47986bb7..7b1972ce063c6ecf5dbb3752ef45d284d7192a9b 100644 (file)
--- 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 e1556236b000050a6bf300fa6f221c9ce7c615d4..8451c17fb8f5c85783a2e633d6e1166dda4c4bbc 100644 (file)
--- 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 e7662f0575aac2d4e7a856687d673787d56eccc5..8bba2a80568d6f605fff6f535af2dab3758402ac 100644 (file)
--- 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 a1a1046494cdf90c2d4f39986b5492ed94eeb90b..6c17ee1ae2113bb317101e18ac40507345152627 100644 (file)
--- 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 aa13159464db321370de7017d1d1a1e43269d740..84a95da1d503a0737172e0a127a594f4bee93eea 100644 (file)
--- 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 107ac680b2530e92300b5cde970e20e8bda0318d..f3f18d8598c43aca02ca138aa46ef50baabdb407 100644 (file)
--- 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 2ec91e899ba71b9e969f312fd342ede625d75f52..19899e2c1ef8d6eb085f6bb5dff7dbefa02c7c10 100644 (file)
--- 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 aa5ecfd0c23d44dfda201e902231f7b707db11d0..45c4333cd38fd079c8a8d7c98d53e6374897e096 100644 (file)
--- 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 a27776aa993efb46862b17393d3d631defdef11e..e5eb6e5a70da2d0fa8b561d68c37901986ae9a1b 100644 (file)
--- 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 c6b0fee56f786a3afec951027cc02c9edf674e05..b1a7489e7abf84c24637542beabc707b7ce5604c 100644 (file)
--- 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 d4433d73e1ab522955befb93818648570826ffd3..9466d4a1be3b85457a644d0d777ec34cc3603128 100644 (file)
--- 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 6120405379eec2253e73e6404ec1adf3d24232c0..8bead2c93055fb878b4ef44a56373474bce7b950 100644 (file)
--- 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 0060fcb43f21c11bec2fec16f8dd3b0ff72a57f1..66c1065db245a748148b368e7b43bf45b9f2a5e4 100644 (file)
--- 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 27198e0ced433ccddb5039c2ce7091e676af3ee0..954e4aec4bda985c3463b6257b54020599113fb4 100644 (file)
--- 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 910c57fce50d6c8b0c8598aaeec519a6dcadd9ac..0803649658f4a4e233abca134e0971fec99ca75d 100644 (file)
--- 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 056f0711fa226a60b5800b306bd99135e133f12c..797ecbb7a9c852784a2969c273ae6889058c86f8 100644 (file)
--- 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 a4aab7df512572e6ad7efe0fb5c7dd628091ff3e..62806d327376b2a1abe534df880f8e2ba4ba5e0e 100644 (file)
--- 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 a371370221f7a812a43ac1f7c1338b69f6c0ed2a..6580ce5907dd0b3c87bae8e049238c0571033bcd 100644 (file)
--- 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 6370cfe190546808c83fa59b46cd47e86965ab52..915641a0f1b4f11d58241492eaf79bcbd3bf5490 100644 (file)
--- 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 79a9a5c52c640b35595741f3548333f1c9c21466..926e1af475d2dc5cc292e0394c8c0380bc09cd44 100644 (file)
--- 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 2a8e7e1045ade8afe51feb5633db50f9c84648b0..9807f10cb004ba9991b693365b617463678b47fb 100644 (file)
--- 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 b8332150f163934ac4d590f1d3af67a5e596dcac..9f3cff5fb6f592b41d45bba295084bd0a25c9bd9 100644 (file)
--- 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 c918e8cac81538e46452294fb1bc9d36d60c73e0..2dd9a631e1287905c27ea7e04cf10cc88ce9e61d 100644 (file)
--- 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 24280dfeab5e91b46c7f7e6e55044faa394e1fd7..a1be0de039acee9b722e3723f41a16bf8bd2684b 100644 (file)
--- 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 1605fa102b37fabd5c633b45461fcea0a889cf39..a309c712ca8b8976e5c9a2c7a80e5bc2bd41ce98 100644 (file)
--- 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 1e1f74f1a113fb2578fa3f9b4890e9dadcfa9ea0..ca5a90505914b5f1466adc2c5d1073870a4be7af 100644 (file)
--- 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 c9988f67ac31c5f67869efc2f58f59ee216fcdc4..936b31311d265c302b086b3f3054c5abc4649b38 100644 (file)
--- 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 5c954cfa01bae743a32846112268a2a1d1e94169..ea689042297c0e4f0f61b2cbfb4917c3a1b5b34b 100644 (file)
--- 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 c6305dcdf1a368eb44ebb718320fda97a81f3de6..aef3289f8c3908a1256f872c0657804321c7ab0d 100644 (file)
--- 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 fdbcfdcbeb9202a283b3f3f693c9cbc20a0af0b0..0298238f0b9a8c50d6a112634d4ae3fabd7a74ef 100644 (file)
--- 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 d53453aad623b9a9b55f8b26d776a03634f0c884..da6a20669dcea91713ab0b4fbddbba651ba1c636 100644 (file)
--- 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 d14f6b4a7a0285f9a64ea0f18cbcbcc74a0b386a..d7598c615299acde3e0b619b0f9233a385a0dea7 100644 (file)
--- 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 d111ecaf7ecbde0be216a3dab9378a9c76b7d992..307a5c93e235c190feb202e68599cd5459d7ee00 100644 (file)
--- 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 40334db441ab773e6eeed756a7b07ceac9396076..1c5f62b0146124640c42428b463f25e08ccbfbd3 100644 (file)
--- 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"

diff --git a/include/hw/arm/allwinner-a10.h b/include/hw/arm/allwinner-a10.h
index 101b72a71dcf2fcc75333284934a31741896801a..7d2d2156308b251bff2052ef19a802e392a1bd59 100644 (file)
--- a/include/hw/arm/allwinner-a10.h
+++ b/include/hw/arm/allwinner-a10.h
@@ -9,7 +9,6 @@
 #include "hw/net/allwinner_emac.h"
 #include "hw/ide/ahci.h"
 
-#include "sysemu/sysemu.h"
 #include "target/arm/cpu.h"
 
 

diff --git a/include/hw/char/serial.h b/include/hw/char/serial.h
index bfcbbb6e197711c078290fa7fe8b9356baa48d9a..8be3d8a4f939aec78306d73f59abdb8df822823f 100644 (file)
--- a/include/hw/char/serial.h
+++ b/include/hw/char/serial.h
@@ -26,7 +26,6 @@
 #ifndef HW_SERIAL_H
 #define HW_SERIAL_H
 
-#include "sysemu/sysemu.h"
 #include "chardev/char-fe.h"
 #include "exec/memory.h"
 #include "qemu/fifo8.h"

diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 859b64c51d4546fb8649062a3ac42f955113d22e..4bb9e29114f9ccbf8e71fc36edaa7b0d773740ed 100644 (file)
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -12,7 +12,6 @@
 #include "qemu/range.h"
 #include "qemu/bitmap.h"
 #include "qemu/module.h"
-#include "sysemu/sysemu.h"
 #include "hw/pci/pci.h"
 #include "hw/mem/pc-dimm.h"
 #include "hw/mem/nvdimm.h"

diff --git a/include/hw/riscv/riscv_htif.h b/include/hw/riscv/riscv_htif.h
index aabc059f3205ba08f7eb78ae70c625c45a330c56..fb9452cf51d638b67c646b31669f72869032a062 100644 (file)
--- a/include/hw/riscv/riscv_htif.h
+++ b/include/hw/riscv/riscv_htif.h
@@ -22,7 +22,6 @@
 
 #include "chardev/char.h"
 #include "chardev/char-fe.h"
-#include "sysemu/sysemu.h"
 #include "exec/memory.h"
 #include "target/riscv/cpu.h"
 

diff --git a/include/hw/timer/stm32f2xx_timer.h b/include/hw/timer/stm32f2xx_timer.h
index e6a83237a52e1215098a3167ef5d3d838df65789..a96bc08b1bbea950a5851ea53fbf89b0019e5cc0 100644 (file)
--- a/include/hw/timer/stm32f2xx_timer.h
+++ b/include/hw/timer/stm32f2xx_timer.h
@@ -27,7 +27,6 @@
 
 #include "hw/sysbus.h"
 #include "qemu/timer.h"
-#include "sysemu/sysemu.h"
 
 #define TIM_CR1      0x00
 #define TIM_CR2      0x04

diff --git a/include/hw/virtio/virtio-bus.h b/include/hw/virtio/virtio-bus.h
index 8c9cc25b1655d79aadac719385a9805c3449f12e..38c9399cd45491618e0a0e3e8c65c14f2adf92a1 100644 (file)
--- a/include/hw/virtio/virtio-bus.h
+++ b/include/hw/virtio/virtio-bus.h
@@ -25,7 +25,6 @@
 #ifndef VIRTIO_BUS_H
 #define VIRTIO_BUS_H
 
-#include "sysemu/sysemu.h"
 #include "hw/qdev-core.h"
 #include "hw/virtio/virtio.h"
 

diff --git a/include/hw/xen/xen-legacy-backend.h b/include/hw/xen/xen-legacy-backend.h
index 07d4176ac17d105815dbd173850ecdd1f02bb6f8..5e6c56c4d626aebeecc3b6769fa35f8a7bcee8aa 100644 (file)
--- a/include/hw/xen/xen-legacy-backend.h
+++ b/include/hw/xen/xen-legacy-backend.h
@@ -3,7 +3,6 @@
 
 #include "hw/xen/xen_common.h"
 #include "hw/xen/xen_pvdev.h"
-#include "sysemu/sysemu.h"
 #include "net/net.h"
 
 #define TYPE_XENSYSDEV "xen-sysdev"

diff --git a/include/migration/global_state.h b/include/migration/global_state.h
index d307de8350ed214812dcca59c5ef260d42dfc8c5..945eb35d5b616e30317099cdb22360814fb2ce32 100644 (file)
--- a/include/migration/global_state.h
+++ b/include/migration/global_state.h
@@ -13,7 +13,7 @@
 #ifndef QEMU_MIGRATION_GLOBAL_STATE_H
 #define QEMU_MIGRATION_GLOBAL_STATE_H
 
-#include "sysemu/sysemu.h"
+#include "qapi/qapi-types-run-state.h"
 
 void register_global_state(void);
 int global_state_store(void);

diff --git a/include/sysemu/kvm_int.h b/include/sysemu/kvm_int.h
index 5d341cc29ba40831cd70fd923858ad89139c271e..72b2d1b3aea53820e0ce0b176bd33f8d64bb6994 100644 (file)
--- a/include/sysemu/kvm_int.h
+++ b/include/sysemu/kvm_int.h
@@ -10,7 +10,6 @@
 #define QEMU_KVM_INT_H
 
 #include "exec/memory.h"
-#include "sysemu/sysemu.h"
 #include "sysemu/accel.h"
 #include "sysemu/kvm.h"
 

diff --git a/include/sysemu/replay.h b/include/sysemu/replay.h
index 3a7c58e4238f68d73f324bdf1fa34ff24ccbda4f..2f2ccdbc98bb857e63768994d7948f41efe5360b 100644 (file)
--- a/include/sysemu/replay.h
+++ b/include/sysemu/replay.h
@@ -12,8 +12,8 @@
  *
  */
 
-#include "sysemu.h"
 #include "qapi/qapi-types-misc.h"
+#include "qapi/qapi-types-run-state.h"
 #include "qapi/qapi-types-ui.h"
 
 /* replay clock kinds */

diff --git a/include/ui/spice-display.h b/include/ui/spice-display.h
index 58bb5b4c53166b2f02ad8010caaafa2868189d41..4a47ffdd4c82a1be23b48058424806187e56efcd 100644 (file)
--- a/include/ui/spice-display.h
+++ b/include/ui/spice-display.h
@@ -26,7 +26,6 @@
 #include "qemu/thread.h"
 #include "ui/qemu-pixman.h"
 #include "ui/console.h"
-#include "sysemu/sysemu.h"
 
 #if defined(CONFIG_OPENGL_DMABUF)
 # if SPICE_SERVER_VERSION >= 0x000d01 /* release 0.13.1 */

diff --git a/monitor/monitor.c b/monitor/monitor.c
index 3ef28171c0dc6b79962527561be1fa51ecc8db9b..12898b6448f28e87d3658232a8179750907ea3fb 100644 (file)
--- a/monitor/monitor.c
+++ b/monitor/monitor.c
@@ -31,6 +31,7 @@
 #include "qemu/error-report.h"
 #include "qemu/option.h"
 #include "sysemu/qtest.h"
+#include "sysemu/sysemu.h"
 #include "trace.h"
 
 /*

diff --git a/net/tap-bsd.c b/net/tap-bsd.c
index 5695e3dd1f585a2628d77defc5896039e9571469..a5c3707f806d7699e2a552b771b77c3dedd66269 100644 (file)
--- a/net/tap-bsd.c
+++ b/net/tap-bsd.c
@@ -27,7 +27,6 @@
 #include "qapi/error.h"
 #include "tap_int.h"
 #include "qemu/cutils.h"
-#include "sysemu/sysemu.h"
 #include "qemu/error-report.h"
 
 #if defined(__NetBSD__) || defined(__FreeBSD__)

diff --git a/net/tap-linux.c b/net/tap-linux.c
index 941a45d7c3536167e0638b099fa0aa0822500889..e0dd442ee34fe51e7c3c072f8bfc4a5d5286c862 100644 (file)
--- a/net/tap-linux.c
+++ b/net/tap-linux.c
@@ -32,7 +32,6 @@
 #include <net/if.h>
 #include <sys/ioctl.h>
 
-#include "sysemu/sysemu.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qemu/cutils.h"

diff --git a/net/tap-solaris.c b/net/tap-solaris.c
index 0e3f3e0a9bc01d485b6f73fc7e88bb3920ed7c63..4725d2314eef709f2156300a7bb7973144524301 100644 (file)
--- a/net/tap-solaris.c
+++ b/net/tap-solaris.c
@@ -25,7 +25,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "tap_int.h"
-#include "sysemu/sysemu.h"
 #include "qemu/ctype.h"
 #include "qemu/cutils.h"
 

diff --git a/net/tap-win32.c b/net/tap-win32.c
index 9cdef472863d29dff57e82c0401fcfeccc466478..2b5dcda36e8d622fb58d54984584799176c2397f 100644 (file)
--- a/net/tap-win32.c
+++ b/net/tap-win32.c
@@ -33,7 +33,6 @@
 #include "clients.h"            /* net_init_tap */
 #include "net/net.h"
 #include "net/tap.h"            /* tap_has_ufo, ... */
-#include "sysemu/sysemu.h"
 #include "qemu/error-report.h"
 #include "qemu/main-loop.h"
 #include <windows.h>

diff --git a/qdev-monitor.c b/qdev-monitor.c
index 21c1c301d0445d7861679d5dbbf18fda004abe36..a0003bf2a9e869c8e962637f901b2be5c0c7db65 100644 (file)
--- a/qdev-monitor.c
+++ b/qdev-monitor.c
@@ -32,6 +32,7 @@
 #include "qemu/option.h"
 #include "qemu/qemu-print.h"
 #include "sysemu/block-backend.h"
+#include "sysemu/sysemu.h"
 #include "migration/misc.h"
 
 /*

diff --git a/qemu-img.c b/qemu-img.c
index a398fd44d6fe381e0c2dbded6dc21d84916529ae..31c72dc746e9782dad997a26e11a39502f106397 100644 (file)
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -42,7 +42,6 @@
 #include "qemu/module.h"
 #include "qemu/units.h"
 #include "qom/object_interfaces.h"
-#include "sysemu/sysemu.h"
 #include "sysemu/block-backend.h"
 #include "block/block_int.h"
 #include "block/blockjob.h"

diff --git a/qom/cpu.c b/qom/cpu.c
index cdb8c71b6ba9b804c18eb0c7a9404f7a1d500321..aeb34f8c674e1742dec3012ddad1d0fede3c6255 100644 (file)
--- a/qom/cpu.c
+++ b/qom/cpu.c
@@ -28,7 +28,6 @@
 #include "exec/log.h"
 #include "qemu/error-report.h"
 #include "qemu/qemu-print.h"
-#include "sysemu/sysemu.h"
 #include "sysemu/tcg.h"
 #include "hw/boards.h"
 #include "hw/qdev-properties.h"

diff --git a/replay/replay-audio.c b/replay/replay-audio.c
index b113836de497c6edea5f2bc838f4c1b5ec7e9b44..178094e6014089180bd6853b361dcfbe45b75647 100644 (file)
--- a/replay/replay-audio.c
+++ b/replay/replay-audio.c
@@ -13,7 +13,6 @@
 #include "qemu/error-report.h"
 #include "sysemu/replay.h"
 #include "replay-internal.h"
-#include "sysemu/sysemu.h"
 #include "audio/audio.h"
 
 void replay_audio_out(int *played)

diff --git a/replay/replay-char.c b/replay/replay-char.c
index 736cc8c2e61de0ec03a94cad8a9b127332549869..dc0002367e5fed629d490f2a0c8da0db04e8a089 100644 (file)
--- a/replay/replay-char.c
+++ b/replay/replay-char.c
@@ -13,7 +13,6 @@
 #include "qemu/error-report.h"
 #include "sysemu/replay.h"
 #include "replay-internal.h"
-#include "sysemu/sysemu.h"
 #include "chardev/char.h"
 
 /* Char drivers that generate qemu_chr_be_write events

diff --git a/replay/replay-net.c b/replay/replay-net.c
index 80b705415694f749de42c3b6333b1cd2a1d7e210..3b70f71cf12eb1a87ae39115730353e5961f9909 100644 (file)
--- a/replay/replay-net.c
+++ b/replay/replay-net.c
@@ -13,7 +13,6 @@
 #include "qemu/error-report.h"
 #include "sysemu/replay.h"
 #include "replay-internal.h"
-#include "sysemu/sysemu.h"
 #include "net/net.h"
 #include "net/filter.h"
 #include "qemu/iov.h"

diff --git a/replay/replay-snapshot.c b/replay/replay-snapshot.c
index 756f48bc025cc61d063b1fab012eed2aeaa5e9b3..5dd86804804008d1602d9581a8958f08f0fbe57b 100644 (file)
--- a/replay/replay-snapshot.c
+++ b/replay/replay-snapshot.c
@@ -13,7 +13,6 @@
 #include "qapi/error.h"
 #include "sysemu/replay.h"
 #include "replay-internal.h"
-#include "sysemu/sysemu.h"
 #include "monitor/monitor.h"
 #include "qapi/qmp/qstring.h"
 #include "qemu/error-report.h"

diff --git a/stubs/replay.c b/stubs/replay.c
index 4ac607895d01f1a0c462c170cf46673f1c41588c..10b3925e2ffb8ffa8c78a45089eb90d834c473b8 100644 (file)
--- a/stubs/replay.c
+++ b/stubs/replay.c
@@ -1,6 +1,5 @@
 #include "qemu/osdep.h"
 #include "sysemu/replay.h"
-#include "sysemu/sysemu.h"
 
 ReplayMode replay_mode;
 

diff --git a/stubs/semihost.c b/stubs/semihost.c
index 4d5b3c065303b55cf9213f28290917c593931106..f90589259c0fa81246b492a079f29ff95cd75a3d 100644 (file)
--- a/stubs/semihost.c
+++ b/stubs/semihost.c
@@ -12,6 +12,7 @@
 #include "qemu/option.h"
 #include "qemu/error-report.h"
 #include "hw/semihosting/semihost.h"
+#include "sysemu/sysemu.h"
 
 /* Empty config */
 QemuOptsList qemu_semihosting_config_opts = {

diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c
index 1901997a0645f2a7770736d355e53f30a66e26d9..e4edff548e51b5fa5431acb2cd28e17147734f8b 100644 (file)
--- a/target/arm/cpu64.c
+++ b/target/arm/cpu64.c
@@ -25,7 +25,6 @@
 #if !defined(CONFIG_USER_ONLY)
 #include "hw/loader.h"
 #endif
-#include "sysemu/sysemu.h"
 #include "sysemu/kvm.h"
 #include "kvm_arm.h"
 #include "qapi/visitor.h"

diff --git a/target/arm/helper-a64.c b/target/arm/helper-a64.c
index 616d62c7fcc3c3a6abed389df50b14cf81b74ae2..bca80bdc38b680b651f97e99f0304f446c8d0fd1 100644 (file)
--- a/target/arm/helper-a64.c
+++ b/target/arm/helper-a64.c
@@ -24,7 +24,6 @@
 #include "qemu/host-utils.h"
 #include "qemu/log.h"
 #include "qemu/main-loop.h"
-#include "sysemu/sysemu.h"
 #include "qemu/bitops.h"
 #include "internals.h"
 #include "qemu/crc32c.h"

diff --git a/target/arm/helper.c b/target/arm/helper.c
index 210f5831e3d9084065bd4f36cbc0d6e71cf53d1e..edee110ae1e168a69cb216bb9f68a0ffb7201bba 100644 (file)
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -16,7 +16,6 @@
 #include "exec/helper-proto.h"
 #include "qemu/host-utils.h"
 #include "qemu/main-loop.h"
-#include "sysemu/sysemu.h"
 #include "qemu/bitops.h"
 #include "qemu/crc32c.h"
 #include "qemu/qemu-print.h"

diff --git a/target/arm/kvm32.c b/target/arm/kvm32.c
index 51f78f722b1884fb6b5cad9af19a20fef7229af1..2451a2d4bbefe104cdb28c24841c7fcc02420e7b 100644 (file)
--- a/target/arm/kvm32.c
+++ b/target/arm/kvm32.c
@@ -16,7 +16,6 @@
 #include "qemu-common.h"
 #include "cpu.h"
 #include "qemu/timer.h"
-#include "sysemu/sysemu.h"
 #include "sysemu/kvm.h"
 #include "kvm_arm.h"
 #include "internals.h"

diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c
index c76d3d799a88fe2412244d2c11611d7993013d5a..59ed579d02e73728df299a8a7824d1a0ffa6216d 100644 (file)
--- a/target/arm/kvm64.c
+++ b/target/arm/kvm64.c
@@ -23,7 +23,6 @@
 #include "qemu/host-utils.h"
 #include "qemu/main-loop.h"
 #include "exec/gdbstub.h"
-#include "sysemu/sysemu.h"
 #include "sysemu/kvm.h"
 #include "kvm_arm.h"
 #include "internals.h"

diff --git a/target/arm/m_helper.c b/target/arm/m_helper.c
index cde5195d284086d7aa905e67098eb8caf551cef0..884d35d2b023709a3ecabdb6aaa07a5fce8a472a 100644 (file)
--- a/target/arm/m_helper.c
+++ b/target/arm/m_helper.c
@@ -16,7 +16,6 @@
 #include "exec/helper-proto.h"
 #include "qemu/host-utils.h"
 #include "qemu/main-loop.h"
-#include "sysemu/sysemu.h"
 #include "qemu/bitops.h"
 #include "qemu/crc32c.h"
 #include "qemu/qemu-print.h"

diff --git a/target/i386/hvf/x86_task.c b/target/i386/hvf/x86_task.c
index 73cd5d28172ddf820de4361e6cf8eafa132352a7..1daac6cc2b35d350897022bd29568d89d8292671 100644 (file)
--- a/target/i386/hvf/x86_task.c
+++ b/target/i386/hvf/x86_task.c
@@ -29,7 +29,6 @@
 #include "hw/i386/apic_internal.h"
 #include "qemu/main-loop.h"
 #include "sysemu/accel.h"
-#include "sysemu/sysemu.h"
 #include "target/i386/cpu.h"
 
 // TODO: taskswitch handling

diff --git a/target/lm32/helper.c b/target/lm32/helper.c
index 9f3b10747471ba285ace8d72d250f144e2b7be00..1130fc88846131c17e44bbbaac4a35182873a900 100644 (file)
--- a/target/lm32/helper.c
+++ b/target/lm32/helper.c
@@ -21,7 +21,6 @@
 #include "cpu.h"
 #include "exec/exec-all.h"
 #include "qemu/host-utils.h"
-#include "sysemu/sysemu.h"
 #include "hw/semihosting/semihost.h"
 #include "exec/log.h"
 

diff --git a/target/m68k/m68k-semi.c b/target/m68k/m68k-semi.c
index 01627b42c996a8c930aceaa75e55478f5a7227fe..8e5fbfc8fa3be2dd8cae00a18066b1d3c01a28f4 100644 (file)
--- a/target/m68k/m68k-semi.c
+++ b/target/m68k/m68k-semi.c
@@ -28,7 +28,6 @@
 #include "exec/softmmu-semi.h"
 #endif
 #include "qemu/log.h"
-#include "sysemu/sysemu.h"
 
 #define HOSTED_EXIT  0
 #define HOSTED_INIT_SIM 1

diff --git a/target/nios2/nios2-semi.c b/target/nios2/nios2-semi.c
index cc2777d2f891800e222fc1c36275bfa5f9c41727..d7a80dd303a9096cb4c33a1af16051b531988c96 100644 (file)
--- a/target/nios2/nios2-semi.c
+++ b/target/nios2/nios2-semi.c
@@ -32,7 +32,6 @@
 #include "exec/softmmu-semi.h"
 #endif
 #include "qemu/log.h"
-#include "sysemu/sysemu.h"
 
 #define HOSTED_EXIT  0
 #define HOSTED_INIT_SIM 1

diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
index 6836a4afb3d222b6ca673faae0d748be4c83e394..6162a903fa199c99bc5a7900c255da0d8702b94f 100644 (file)
--- a/target/ppc/kvm.c
+++ b/target/ppc/kvm.c
@@ -27,7 +27,6 @@
 #include "cpu.h"
 #include "cpu-models.h"
 #include "qemu/timer.h"
-#include "sysemu/sysemu.h"
 #include "sysemu/hw_accel.h"
 #include "kvm_ppc.h"
 #include "sysemu/cpus.h"

diff --git a/target/sparc/helper.c b/target/sparc/helper.c
index 1a52061fbf22f2807bf1209888948bdd1552f911..07d87efa4eebdb5d21306e6b23cc67cd6ea78151 100644 (file)
--- a/target/sparc/helper.c
+++ b/target/sparc/helper.c
@@ -22,7 +22,6 @@
 #include "exec/exec-all.h"
 #include "qemu/host-utils.h"
 #include "exec/helper-proto.h"
-#include "sysemu/sysemu.h"
 
 void cpu_raise_exception_ra(CPUSPARCState *env, int tt, uintptr_t ra)
 {

diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c
index 6f1da878752145b0e878e92997643c8082c0720c..fa12a576b20a52931a6ac90c2c17a744699baf1b 100644 (file)
--- a/target/xtensa/translate.c
+++ b/target/xtensa/translate.c
@@ -36,7 +36,6 @@
 #include "tcg-op.h"
 #include "qemu/log.h"
 #include "qemu/qemu-print.h"
-#include "sysemu/sysemu.h"
 #include "exec/cpu_ldst.h"
 #include "hw/semihosting/semihost.h"
 #include "exec/translator.h"

diff --git a/target/xtensa/xtensa-semi.c b/target/xtensa/xtensa-semi.c
index 8862985e563ab251b6df6a8129ce68d050ff98ae..25f57a6500cec5b9676a8a5b214462a3918077dc 100644 (file)
--- a/target/xtensa/xtensa-semi.c
+++ b/target/xtensa/xtensa-semi.c
@@ -32,7 +32,6 @@
 #include "hw/semihosting/semihost.h"
 #include "qapi/error.h"
 #include "qemu/log.h"
-#include "sysemu/sysemu.h"
 
 enum {
     TARGET_SYS_exit = 1,

diff --git a/tests/migration-test.c b/tests/migration-test.c
index c1968740abeaae2cf2ae23d055cde5c53f5ae01b..b87ba99a9e03982221cfbc7fabfe0990d39cfd5b 100644 (file)
--- a/tests/migration-test.c
+++ b/tests/migration-test.c
@@ -20,7 +20,6 @@
 #include "qemu/range.h"
 #include "qemu/sockets.h"
 #include "chardev/char.h"
-#include "sysemu/sysemu.h"
 #include "qapi/qapi-visit-sockets.h"
 #include "qapi/qobject-input-visitor.h"
 #include "qapi/qobject-output-visitor.h"

diff --git a/ui/input-keymap.c b/ui/input-keymap.c
index db5ccff5ad49a5d7f30cc2019eafde0259276dd0..c4301851bd2428f50cede5c0ab5ab6e5fc50b202 100644 (file)
--- a/ui/input-keymap.c
+++ b/ui/input-keymap.c
@@ -1,5 +1,4 @@
 #include "qemu/osdep.h"
-#include "sysemu/sysemu.h"
 #include "keymaps.h"
 #include "ui/input.h"
 

diff --git a/ui/input-legacy.c b/ui/input-legacy.c
index 549654e26a328ac93a6927fb0cc83c8724770535..9fc78a639bd49abd67df0d80e6b5d58e6fc5ac58 100644 (file)
--- a/ui/input-legacy.c
+++ b/ui/input-legacy.c
@@ -24,7 +24,6 @@
 
 #include "qemu/osdep.h"
 #include "qapi/qapi-commands-ui.h"
-#include "sysemu/sysemu.h"
 #include "ui/console.h"
 #include "keymaps.h"
 #include "ui/input.h"

diff --git a/ui/input-linux.c b/ui/input-linux.c
index e3fa799c34fb843c5c14fcea3e6361cd608cf7f9..59456fe7658b91359ecb5d9bc578a4bcdb6c01e2 100644 (file)
--- a/ui/input-linux.c
+++ b/ui/input-linux.c
@@ -10,7 +10,6 @@
 #include "qemu/main-loop.h"
 #include "qemu/module.h"
 #include "qemu/sockets.h"
-#include "sysemu/sysemu.h"
 #include "ui/input.h"
 #include "qom/object_interfaces.h"
 #include "sysemu/iothread.h"

diff --git a/ui/keymaps.c b/ui/keymaps.c
index 6e8a321971a2cc49d482a3c9dad6d2465efe746c..4e5fca57a801cf62f0df2e9acfd22fa16a54cb8d 100644 (file)
--- a/ui/keymaps.c
+++ b/ui/keymaps.c
@@ -25,7 +25,6 @@
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "keymaps.h"
-#include "sysemu/sysemu.h"
 #include "trace.h"
 #include "qemu/ctype.h"
 #include "qemu/error-report.h"

diff --git a/ui/sdl2-2d.c b/ui/sdl2-2d.c
index db191aaa7910e0e7deca47575a20a2611c649633..a2ea85127d5729baccf0b2a341f535a8c56bc03c 100644 (file)
--- a/ui/sdl2-2d.c
+++ b/ui/sdl2-2d.c
@@ -27,7 +27,6 @@
 #include "ui/console.h"
 #include "ui/input.h"
 #include "ui/sdl2.h"
-#include "sysemu/sysemu.h"
 
 void sdl2_2d_update(DisplayChangeListener *dcl,
                     int x, int y, int w, int h)

diff --git a/ui/sdl2-gl.c b/ui/sdl2-gl.c
index 7a37e7c995a59509e58bc6c6f4c0d63bbe87c6bc..c73d273bf804d75b2b56f92086170f89a4ef38a8 100644 (file)
--- a/ui/sdl2-gl.c
+++ b/ui/sdl2-gl.c
@@ -29,7 +29,6 @@
 #include "ui/console.h"
 #include "ui/input.h"
 #include "ui/sdl2.h"
-#include "sysemu/sysemu.h"
 
 static void sdl2_set_scanout_mode(struct sdl2_console *scon, bool scanout)
 {

diff --git a/ui/sdl2-input.c b/ui/sdl2-input.c
index b1daae411151c0a71c2c30d11e5d0998f7ebb0b4..1f9fe831b30da21fa22c0c0f4391c419c621c5eb 100644 (file)
--- a/ui/sdl2-input.c
+++ b/ui/sdl2-input.c
@@ -27,7 +27,6 @@
 #include "ui/console.h"
 #include "ui/input.h"
 #include "ui/sdl2.h"
-#include "sysemu/sysemu.h"
 
 void sdl2_process_key(struct sdl2_console *scon,
                       SDL_KeyboardEvent *ev)

diff --git a/ui/spice-display.c b/ui/spice-display.c
index 0c65ae2fe33a28d328e91d63535abaea668e20a6..6babe249095505798939529bc68f21a7a7424685 100644 (file)
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -22,7 +22,6 @@
 #include "qemu/option.h"
 #include "qemu/queue.h"
 #include "ui/console.h"
-#include "sysemu/sysemu.h"
 #include "trace.h"
 
 #include "ui/spice-display.h"

diff --git a/util/qemu-timer.c b/util/qemu-timer.c
index 1cc1b2f2c378ad2012f4aa2ea215fc9c1aae1b71..b0e40a90877b815a5585e448fad7202478b5601f 100644 (file)
--- a/util/qemu-timer.c
+++ b/util/qemu-timer.c
@@ -26,7 +26,6 @@
 #include "qemu/main-loop.h"
 #include "qemu/timer.h"
 #include "sysemu/replay.h"
-#include "sysemu/sysemu.h"
 #include "sysemu/cpus.h"
 
 #ifdef CONFIG_POSIX