Do not include sysemu/sysemu.h if it's not really necessary

Stop including sysemu/sysemu.h in files that don't need it.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210416171314.2074665-2-thuth@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>

diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 93d7cbfeaf88253dc55e28843a3dc7b7f7512e66..50e56664cc6d9d17e66609ce271d4f5301129d30 100644 (file)
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -30,7 +30,6 @@
 #include "sysemu/kvm_int.h"
 #include "sysemu/runstate.h"
 #include "sysemu/cpus.h"
-#include "sysemu/sysemu.h"
 #include "qemu/bswap.h"
 #include "exec/memory.h"
 #include "exec/ram_addr.h"

diff --git a/accel/tcg/user-exec-stub.c b/accel/tcg/user-exec-stub.c
index b876f5c1e45df8dbf216aba5a1b5be8ba6c318db..968cd3ca60d7d5f2e8abc03477cb1b48d9e64482 100644 (file)
--- a/accel/tcg/user-exec-stub.c
+++ b/accel/tcg/user-exec-stub.c
@@ -1,7 +1,6 @@
 #include "qemu/osdep.h"
 #include "hw/core/cpu.h"
 #include "sysemu/replay.h"
-#include "sysemu/sysemu.h"
 
 bool enable_cpu_pm = false;
 

diff --git a/backends/hostmem-file.c b/backends/hostmem-file.c
index b683da9daf815689327014dcdb871fa806f0b726..9b1b9f0a56043dc5788826c16fb9519f9fdf8370 100644 (file)
--- a/backends/hostmem-file.c
+++ b/backends/hostmem-file.c
@@ -15,7 +15,6 @@
 #include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "sysemu/hostmem.h"
-#include "sysemu/sysemu.h"
 #include "qom/object_interfaces.h"
 #include "qom/object.h"
 

diff --git a/backends/hostmem-memfd.c b/backends/hostmem-memfd.c
index 69b0ae30bb089f924377f49171038d870d2bc23b..da75e270573f8f977b33b23ee6838885c9acd1be 100644 (file)
--- a/backends/hostmem-memfd.c
+++ b/backends/hostmem-memfd.c
@@ -12,7 +12,6 @@
 
 #include "qemu/osdep.h"
 #include "sysemu/hostmem.h"
-#include "sysemu/sysemu.h"
 #include "qom/object_interfaces.h"
 #include "qemu/memfd.h"
 #include "qemu/module.h"

diff --git a/backends/hostmem.c b/backends/hostmem.c
index c6c1ff5b99c221ffa5f6ac5913e20dd3615baffa..aab3de84083e79ce09a3d207162c2fd8584e8ae3 100644 (file)
--- a/backends/hostmem.c
+++ b/backends/hostmem.c
@@ -12,7 +12,6 @@
 
 #include "qemu/osdep.h"
 #include "sysemu/hostmem.h"
-#include "sysemu/sysemu.h"
 #include "hw/boards.h"
 #include "qapi/error.h"
 #include "qapi/qapi-builtin-visit.h"

diff --git a/block.c b/block.c
index 874c22c43e3d95c34ee06513430f6fba63b5a7d3..9ad725d2057d59075e3b07594641c28c315b6cf4 100644 (file)
--- a/block.c
+++ b/block.c
@@ -42,7 +42,6 @@
 #include "qapi/qobject-output-visitor.h"
 #include "qapi/qapi-visit-block-core.h"
 #include "sysemu/block-backend.h"
-#include "sysemu/sysemu.h"
 #include "qemu/notify.h"
 #include "qemu/option.h"
 #include "qemu/coroutine.h"

diff --git a/block/block-backend.c b/block/block-backend.c
index 6fca9853e125ea9e80e2e299356acc8cb0e08338..de5496af66fcd1c57076e38ce66ce9a33128280f 100644 (file)
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -18,7 +18,6 @@
 #include "hw/qdev-core.h"
 #include "sysemu/blockdev.h"
 #include "sysemu/runstate.h"
-#include "sysemu/sysemu.h"
 #include "sysemu/replay.h"
 #include "qapi/error.h"
 #include "qapi/qapi-events-block.h"

diff --git a/block/nfs.c b/block/nfs.c
index 8c1968bb415d9a9e542988fd51128b9f302caa1c..7dff64f489627a82ebbe33b0d23fc9337732055b 100644 (file)
--- a/block/nfs.c
+++ b/block/nfs.c
@@ -39,7 +39,6 @@
 #include "qemu/option.h"
 #include "qemu/uri.h"
 #include "qemu/cutils.h"
-#include "sysemu/sysemu.h"
 #include "sysemu/replay.h"
 #include "qapi/qapi-visit-block-core.h"
 #include "qapi/qmp/qdict.h"

diff --git a/chardev/char-mux.c b/chardev/char-mux.c
index 72beef29d21c3bed1ffe6e48c7e75fe5db4a9da5..5baf4190108366803a1a0fa26fb7c4b35f9c85c0 100644 (file)
--- a/chardev/char-mux.c
+++ b/chardev/char-mux.c
@@ -28,7 +28,6 @@
 #include "qemu/option.h"
 #include "chardev/char.h"
 #include "sysemu/block-backend.h"
-#include "sysemu/sysemu.h"
 #include "chardev-internal.h"
 
 /* MUX driver for serial I/O splitting */

diff --git a/chardev/char.c b/chardev/char.c
index 398f09df19cd8567fa1ea96ee4d403dfeed27537..a4ebfcc5ac209cbfd85fec86d1d92c5eccd54dcf 100644 (file)
--- a/chardev/char.c
+++ b/chardev/char.c
@@ -25,7 +25,6 @@
 #include "qemu/osdep.h"
 #include "qemu/cutils.h"
 #include "monitor/monitor.h"
-#include "sysemu/sysemu.h"
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"
 #include "qemu/qemu-print.h"

diff --git a/gdbstub.c b/gdbstub.c
index 054665e93ea654c459f53930fe3641bf852fb3e9..9103ffc9028d66560c0c762a8136ab6ff5ecfa87 100644 (file)
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -37,7 +37,6 @@
 #include "monitor/monitor.h"
 #include "chardev/char.h"
 #include "chardev/char-fe.h"
-#include "sysemu/sysemu.h"
 #include "exec/gdbstub.h"
 #include "hw/cpu/cluster.h"
 #include "hw/boards.h"

diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c
index c8e300d93f61346952a84dae12adc14ea7327a6d..1017ecf330db5aa24bc2d9e5c0e6c38415d2447d 100644 (file)
--- a/hw/alpha/dp264.c
+++ b/hw/alpha/dp264.c
@@ -13,7 +13,6 @@
 #include "hw/loader.h"
 #include "alpha_sys.h"
 #include "qemu/error-report.h"
-#include "sysemu/sysemu.h"
 #include "hw/rtc/mc146818rtc.h"
 #include "hw/ide/pci.h"
 #include "hw/timer/i8254.h"

diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index c3345fce5366e87dc7ecef5fad1e7cc28c235cd1..c4f85dab63b340127ee521a873a226652ed97e2c 100644 (file)
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -23,7 +23,6 @@
 #include "hw/misc/led.h"
 #include "hw/qdev-properties.h"
 #include "sysemu/block-backend.h"
-#include "sysemu/sysemu.h"
 #include "hw/loader.h"
 #include "qemu/error-report.h"
 #include "qemu/units.h"

diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c
index 3ec30ca5afa404a816285df61669c39f4e8c355b..9e872135ae7274ea9f2ea0f2fd614442ebbb4eff 100644 (file)
--- a/hw/arm/cubieboard.c
+++ b/hw/arm/cubieboard.c
@@ -19,7 +19,6 @@
 #include "exec/address-spaces.h"
 #include "qapi/error.h"
 #include "cpu.h"
-#include "sysemu/sysemu.h"
 #include "hw/boards.h"
 #include "hw/qdev-properties.h"
 #include "hw/arm/allwinner-a10.h"

diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c
index 6cdc1d83fcacade2cf4600734cb8219ced2022be..65d3a9ba740bd479a8b3c544355b1074a19b3bcf 100644 (file)
--- a/hw/arm/digic_boards.c
+++ b/hw/arm/digic_boards.c
@@ -34,7 +34,6 @@
 #include "hw/arm/digic.h"
 #include "hw/block/flash.h"
 #include "hw/loader.h"
-#include "sysemu/sysemu.h"
 #include "sysemu/qtest.h"
 #include "qemu/units.h"
 #include "qemu/cutils.h"

diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c
index 56b729141b51c5f00d97dc9505bc76afece081da..8ae136bbdf36719b1d35ecaf8a1dcde9dfc57271 100644 (file)
--- a/hw/arm/exynos4_boards.c
+++ b/hw/arm/exynos4_boards.c
@@ -26,7 +26,6 @@
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "cpu.h"
-#include "sysemu/sysemu.h"
 #include "hw/sysbus.h"
 #include "net/net.h"
 #include "hw/arm/boot.h"

diff --git a/hw/arm/mcimx6ul-evk.c b/hw/arm/mcimx6ul-evk.c
index ed69a7b037ad6e056ed3f06da9d0ed07e29550ed..ce16b6b31744bee819cd710f3727a9e2f0acbc67 100644 (file)
--- a/hw/arm/mcimx6ul-evk.c
+++ b/hw/arm/mcimx6ul-evk.c
@@ -15,7 +15,6 @@
 #include "hw/arm/fsl-imx6ul.h"
 #include "hw/boards.h"
 #include "hw/qdev-properties.h"
-#include "sysemu/sysemu.h"
 #include "qemu/error-report.h"
 #include "sysemu/qtest.h"
 

diff --git a/hw/arm/mcimx7d-sabre.c b/hw/arm/mcimx7d-sabre.c
index e57d52b3441c2ce3f7f1b5747f9784c62c155580..e896222c34c91d8c3ee8affdea33ba1fb3eb8283 100644 (file)
--- a/hw/arm/mcimx7d-sabre.c
+++ b/hw/arm/mcimx7d-sabre.c
@@ -17,7 +17,6 @@
 #include "hw/arm/fsl-imx7.h"
 #include "hw/boards.h"
 #include "hw/qdev-properties.h"
-#include "sysemu/sysemu.h"
 #include "qemu/error-report.h"
 #include "sysemu/qtest.h"
 

diff --git a/hw/arm/npcm7xx_boards.c b/hw/arm/npcm7xx_boards.c
index e22fe4bf8f06cde2976af6e095bd0315bf909931..d91d6877001ec04582205945c6739711f3762aa1 100644 (file)
--- a/hw/arm/npcm7xx_boards.c
+++ b/hw/arm/npcm7xx_boards.c
@@ -27,7 +27,6 @@
 #include "qemu-common.h"
 #include "qemu/datadir.h"
 #include "qemu/units.h"
-#include "sysemu/sysemu.h"
 
 #define NPCM750_EVB_POWER_ON_STRAPS 0x00001ff7
 #define QUANTA_GSJ_POWER_ON_STRAPS 0x00001fff

diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c
index b8d38c9e8d045df21c5d752dec99422233a94a83..6ccb61c149ec7c8567d9af4daea5e0868c25cf8a 100644 (file)
--- a/hw/arm/orangepi.c
+++ b/hw/arm/orangepi.c
@@ -25,7 +25,6 @@
 #include "hw/boards.h"
 #include "hw/qdev-properties.h"
 #include "hw/arm/allwinner-h3.h"
-#include "sysemu/sysemu.h"
 
 static struct arm_boot_info orangepi_binfo = {
     .nb_cpus = AW_H3_NUM_CPUS,

diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c
index 990509d38521937bc8f6e1828d69cba784cb84b8..1b7e9c4cb418876fe123e9dcc6019db293487176 100644 (file)
--- a/hw/arm/raspi.c
+++ b/hw/arm/raspi.c
@@ -23,7 +23,6 @@
 #include "hw/boards.h"
 #include "hw/loader.h"
 #include "hw/arm/boot.h"
-#include "sysemu/sysemu.h"
 #include "qom/object.h"
 
 #define SMPBOOT_ADDR    0x300 /* this should leave enough space for ATAGS */

diff --git a/hw/arm/sabrelite.c b/hw/arm/sabrelite.c
index a3dbf85e0edbdf89cc1a650ccf4a9ee880dfa371..42348e5cb15be2221451f9ff790472750b50f001 100644 (file)
--- a/hw/arm/sabrelite.c
+++ b/hw/arm/sabrelite.c
@@ -15,7 +15,6 @@
 #include "hw/arm/fsl-imx6.h"
 #include "hw/boards.h"
 #include "hw/qdev-properties.h"
-#include "sysemu/sysemu.h"
 #include "qemu/error-report.h"
 #include "sysemu/qtest.h"
 

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index fee696fb0e34bd7cedaf0e4d43716bee5c100153..881969af6b2544d1cdceaf5c97124b27ff42782b 100644 (file)
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -48,7 +48,6 @@
 #include "sysemu/device_tree.h"
 #include "sysemu/numa.h"
 #include "sysemu/runstate.h"
-#include "sysemu/sysemu.h"
 #include "sysemu/tpm.h"
 #include "sysemu/kvm.h"
 #include "hw/loader.h"

diff --git a/hw/block/nvme-subsys.c b/hw/block/nvme-subsys.c
index 283a97b79d57a47841b4638456aa0de378b29209..9604c19117de55816ade5bd478025a8ae9bb41c4 100644 (file)
--- a/hw/block/nvme-subsys.c
+++ b/hw/block/nvme-subsys.c
@@ -17,7 +17,6 @@
 #include "hw/block/block.h"
 #include "block/aio.h"
 #include "block/accounting.h"
-#include "sysemu/sysemu.h"
 #include "hw/pci/pci.h"
 #include "nvme.h"
 #include "nvme-subsys.h"

diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c
index 68a942595a269100ac41098e44e7f7929af9a182..2ad004430e4aee0248524aef8078d2b5127d743b 100644 (file)
--- a/hw/core/machine-qmp-cmds.c
+++ b/hw/core/machine-qmp-cmds.c
@@ -22,7 +22,6 @@
 #include "sysemu/hw_accel.h"
 #include "sysemu/numa.h"
 #include "sysemu/runstate.h"
-#include "sysemu/sysemu.h"
 
 static void cpustate_to_cpuinfo_s390(CpuInfoS390 *info, const CPUState *cpu)
 {

diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c
index 7e693523d75292915f1a311cdb3137c63053a3a5..f586a4bef5436c722a717e3ff25e07b8507099d3 100644 (file)
--- a/hw/core/null-machine.c
+++ b/hw/core/null-machine.c
@@ -14,7 +14,6 @@
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
 #include "hw/boards.h"
-#include "sysemu/sysemu.h"
 #include "exec/address-spaces.h"
 #include "hw/core/cpu.h"
 

diff --git a/hw/core/numa.c b/hw/core/numa.c
index 68cee65f6143af343c97f6d46fdf2c020f6a5460..ac6bed5817f854c7b6e61231bc2e45e92bcad542 100644 (file)
--- a/hw/core/numa.c
+++ b/hw/core/numa.c
@@ -26,7 +26,6 @@
 #include "qemu/units.h"
 #include "sysemu/hostmem.h"
 #include "sysemu/numa.h"
-#include "sysemu/sysemu.h"
 #include "exec/cpu-common.h"
 #include "exec/ramlist.h"
 #include "qemu/bitmap.h"

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 4e8edffeaf664cdcc4edf919e779ac79befd3a39..ac24f70a5dc7273ecfc516322b4a494306e15978 100644 (file)
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -42,7 +42,6 @@
 #include "hw/irq.h"
 #include "sysemu/kvm.h"
 #include "hw/kvm/clock.h"
-#include "sysemu/sysemu.h"
 #include "hw/sysbus.h"
 #include "sysemu/arch_init.h"
 #include "hw/i2c/smbus_eeprom.h"

diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c
index 9fe72b370e8ee98aafb67e3da000a21a804061c4..6ce37a2b052dddb60b0632c8751696745eef949f 100644 (file)
--- a/hw/i386/pc_sysfw.c
+++ b/hw/i386/pc_sysfw.c
@@ -35,7 +35,6 @@
 #include "hw/i386/pc.h"
 #include "hw/loader.h"
 #include "hw/qdev-properties.h"
-#include "sysemu/sysemu.h"
 #include "hw/block/flash.h"
 #include "sysemu/kvm.h"
 #include "sysemu/sev.h"

diff --git a/hw/input/lasips2.c b/hw/input/lasips2.c
index 275737842e95bdeedcb14d0e20ed1feaf8103560..e7faf24058b41a8f9c30b5a86231564cce489948 100644 (file)
--- a/hw/input/lasips2.c
+++ b/hw/input/lasips2.c
@@ -27,7 +27,6 @@
 #include "hw/input/ps2.h"
 #include "hw/input/lasips2.h"
 #include "exec/hwaddr.h"
-#include "sysemu/sysemu.h"
 #include "trace.h"
 #include "exec/address-spaces.h"
 #include "migration/vmstate.h"

diff --git a/hw/intc/sifive_plic.c b/hw/intc/sifive_plic.c
index 97a1a27a9acde09bb2a58dba4340f2f4f6ef7349..6a53e6329924a175178c2ae6d12d421fb6b8844a 100644 (file)
--- a/hw/intc/sifive_plic.c
+++ b/hw/intc/sifive_plic.c
@@ -29,7 +29,6 @@
 #include "hw/qdev-properties.h"
 #include "hw/intc/sifive_plic.h"
 #include "target/riscv/cpu.h"
-#include "sysemu/sysemu.h"
 #include "migration/vmstate.h"
 
 #define RISCV_DEBUG_PLIC 0

diff --git a/hw/isa/isa-superio.c b/hw/isa/isa-superio.c
index 179c1856956bb75729532208476eecd4682c25dc..c81bfe58ef8d13f320c2a224ae78c58e602d6b34 100644 (file)
--- a/hw/isa/isa-superio.c
+++ b/hw/isa/isa-superio.c
@@ -14,7 +14,6 @@
 #include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "qapi/error.h"
-#include "sysemu/sysemu.h"
 #include "sysemu/blockdev.h"
 #include "chardev/char.h"
 #include "hw/block/fdc.h"

diff --git a/hw/isa/piix3.c b/hw/isa/piix3.c
index f46ccae25cf7360fc2b51e57ea0e5fd45d06ac7c..dab901c9ad996ba20cc7a37b9310255a406fe21b 100644 (file)
--- a/hw/isa/piix3.c
+++ b/hw/isa/piix3.c
@@ -29,7 +29,6 @@
 #include "hw/isa/isa.h"
 #include "hw/xen/xen.h"
 #include "sysemu/xen.h"
-#include "sysemu/sysemu.h"
 #include "sysemu/reset.h"
 #include "sysemu/runstate.h"
 #include "migration/vmstate.h"

diff --git a/hw/m68k/next-kbd.c b/hw/m68k/next-kbd.c
index bee40e25bca094693f3313010bdf8112126b48e2..30a8c9fbfabff11f0a56bbb1f12508229fbaa24e 100644 (file)
--- a/hw/m68k/next-kbd.c
+++ b/hw/m68k/next-kbd.c
@@ -33,7 +33,6 @@
 #include "hw/sysbus.h"
 #include "hw/m68k/next-cube.h"
 #include "ui/console.h"
-#include "sysemu/sysemu.h"
 #include "migration/vmstate.h"
 #include "qom/object.h"
 

diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c
index caaba1aa4c1d75d49ddc9f5dc03c4776bf1bef5b..8821d009f1a9c59bd170d0e8c8ce2ea9921980df 100644 (file)
--- a/hw/microblaze/boot.c
+++ b/hw/microblaze/boot.c
@@ -33,7 +33,6 @@
 #include "qemu/error-report.h"
 #include "sysemu/device_tree.h"
 #include "sysemu/reset.h"
-#include "sysemu/sysemu.h"
 #include "hw/boards.h"
 #include "hw/loader.h"
 #include "elf.h"

diff --git a/hw/mips/malta.c b/hw/mips/malta.c
index 26e7b1bd9f6428280e21442b0772a9d35d5185fe..5adb67ad2a42cb20eb8338189fdc800ee0654d33 100644 (file)
--- a/hw/mips/malta.c
+++ b/hw/mips/malta.c
@@ -39,7 +39,6 @@
 #include "hw/mips/mips.h"
 #include "hw/mips/cpudevs.h"
 #include "hw/pci/pci.h"
-#include "sysemu/sysemu.h"
 #include "sysemu/arch_init.h"
 #include "qemu/log.h"
 #include "hw/mips/bios.h"

diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c
index e6eeb575d53cf56ea3124f229bde94b99eab1220..4515296e66a6df2520c9c0bf4ffedf0f88f1a286 100644 (file)
--- a/hw/misc/macio/macio.c
+++ b/hw/misc/macio/macio.c
@@ -35,7 +35,6 @@
 #include "hw/char/escc.h"
 #include "hw/misc/macio/macio.h"
 #include "hw/intc/heathrow_pic.h"
-#include "sysemu/sysemu.h"
 #include "trace.h"
 
 /* Note: this code is strongly inspirated from the corresponding code

diff --git a/hw/net/can/xlnx-zynqmp-can.c b/hw/net/can/xlnx-zynqmp-can.c
index affa21a5ed351427e4d6ba441e4b80ddb69ddbda..22bb8910fa8c1ffaf5a44631b835938eff83d775 100644 (file)
--- a/hw/net/can/xlnx-zynqmp-can.c
+++ b/hw/net/can/xlnx-zynqmp-can.c
@@ -37,7 +37,6 @@
 #include "qemu/bitops.h"
 #include "qemu/log.h"
 #include "qemu/cutils.h"
-#include "sysemu/sysemu.h"
 #include "migration/vmstate.h"
 #include "hw/qdev-properties.h"
 #include "net/can_emu.h"

diff --git a/hw/net/i82596.c b/hw/net/i82596.c
index 055c3a1470ca35da83c05f7a0dfb67900cb92260..ec21e2699a189e0372277b37109c60159edf2497 100644 (file)
--- a/hw/net/i82596.c
+++ b/hw/net/i82596.c
@@ -12,7 +12,6 @@
 #include "qemu/timer.h"
 #include "net/net.h"
 #include "net/eth.h"
-#include "sysemu/sysemu.h"
 #include "hw/irq.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"

diff --git a/hw/net/lasi_i82596.c b/hw/net/lasi_i82596.c
index 820b63f35098624a9779a17cf4941fd0175b67df..e37f7fabe952d2e687d52d6eac0365d4e2528ad4 100644 (file)
--- a/hw/net/lasi_i82596.c
+++ b/hw/net/lasi_i82596.c
@@ -18,7 +18,6 @@
 #include "hw/net/lasi_82596.h"
 #include "hw/net/i82596.h"
 #include "trace.h"
-#include "sysemu/sysemu.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 

diff --git a/hw/nios2/boot.c b/hw/nios2/boot.c
index d9969ac14828673573265a05261553256ce25fc9..95bdc18052c854ad9090ceacfeab75816cdc3c19 100644 (file)
--- a/hw/nios2/boot.c
+++ b/hw/nios2/boot.c
@@ -38,7 +38,6 @@
 #include "qemu/error-report.h"
 #include "sysemu/device_tree.h"
 #include "sysemu/reset.h"
-#include "sysemu/sysemu.h"
 #include "hw/boards.h"
 #include "hw/loader.h"
 #include "elf.h"

diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c
index f4e804cdb528be5dfe63dedff1aff921a10cc22c..8da7bc7af971999ee3dd4f2949defc1a46e1e4ca 100644 (file)
--- a/hw/ppc/ppc405_boards.c
+++ b/hw/ppc/ppc405_boards.c
@@ -34,7 +34,6 @@
 #include "ppc405.h"
 #include "hw/rtc/m48t59.h"
 #include "hw/block/flash.h"
-#include "sysemu/sysemu.h"
 #include "sysemu/qtest.h"
 #include "sysemu/reset.h"
 #include "sysemu/block-backend.h"

diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index af4ccb9f431fa7ff4e27f5d5eaf3ea3589f8f874..b41570c7472bf8eb251889ae54fe9d34a0224ed1 100644 (file)
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -29,7 +29,6 @@
 #include "hw/char/serial.h"
 #include "hw/block/fdc.h"
 #include "net/net.h"
-#include "sysemu/sysemu.h"
 #include "hw/isa/isa.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_host.h"

diff --git a/hw/rx/rx-gdbsim.c b/hw/rx/rx-gdbsim.c
index 9b82feff5284fca8ba185508da2f537c8a9e2296..1f53fdb08289520edd446ec0243bba84d7e89724 100644 (file)
--- a/hw/rx/rx-gdbsim.c
+++ b/hw/rx/rx-gdbsim.c
@@ -24,7 +24,6 @@
 #include "cpu.h"
 #include "hw/loader.h"
 #include "hw/rx/rx62n.h"
-#include "sysemu/sysemu.h"
 #include "sysemu/qtest.h"
 #include "sysemu/device_tree.h"
 #include "hw/boards.h"

diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
index ff6b55e8167dda8870da7b384811a322584638fb..f12af5e35b88c36bb9727162d0f11597dbdd9d2c 100644 (file)
--- a/hw/s390x/ipl.c
+++ b/hw/s390x/ipl.c
@@ -18,7 +18,6 @@
 #include "qapi/error.h"
 #include "sysemu/reset.h"
 #include "sysemu/runstate.h"
-#include "sysemu/sysemu.h"
 #include "sysemu/tcg.h"
 #include "cpu.h"
 #include "elf.h"

diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c
index 0cf229082670dede687c8a49fddfb24a2464d63b..f57340a7d789a6a9ad7af506941aff63cb27ccb0 100644 (file)
--- a/hw/s390x/sclp.c
+++ b/hw/s390x/sclp.c
@@ -16,7 +16,6 @@
 #include "qemu/units.h"
 #include "qapi/error.h"
 #include "cpu.h"
-#include "sysemu/sysemu.h"
 #include "hw/boards.h"
 #include "hw/s390x/sclp.h"
 #include "hw/s390x/event-facility.h"

diff --git a/hw/sh4/shix.c b/hw/sh4/shix.c
index d9a9fcbc59890847bdd3511c47b149240a727cc3..1a44378df421eabe0c1e3d62386f37b9a8322634 100644 (file)
--- a/hw/sh4/shix.c
+++ b/hw/sh4/shix.c
@@ -31,7 +31,6 @@
 #include "qapi/error.h"
 #include "cpu.h"
 #include "hw/sh4/sh.h"
-#include "sysemu/sysemu.h"
 #include "sysemu/qtest.h"
 #include "hw/boards.h"
 #include "hw/loader.h"

diff --git a/hw/ssi/sifive_spi.c b/hw/ssi/sifive_spi.c
index 0c9ebca3c86cd3fae56a1223153d4a3527be101a..03540cf5ca660e5b0c5cd79d7cd7e5c213905985 100644 (file)
--- a/hw/ssi/sifive_spi.c
+++ b/hw/ssi/sifive_spi.c
@@ -24,7 +24,6 @@
 #include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "hw/ssi/ssi.h"
-#include "sysemu/sysemu.h"
 #include "qemu/fifo8.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/vfio/display.c b/hw/vfio/display.c
index f04473e3cecedac1017be4c80c722d23a81bc72a..89bc90508fb803c56b924edde72697d19af0e0ef 100644 (file)
--- a/hw/vfio/display.c
+++ b/hw/vfio/display.c
@@ -14,7 +14,6 @@
 #include <linux/vfio.h>
 #include <sys/ioctl.h>
 
-#include "sysemu/sysemu.h"
 #include "hw/display/edid.h"
 #include "ui/console.h"
 #include "qapi/error.h"

diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 5c65aa0a98e2d02023f0ee5bfa2a6390fcb85ecb..ab4077aad23e695b0328995e1b38cd456c94f876 100644 (file)
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -37,7 +37,6 @@
 #include "qemu/units.h"
 #include "sysemu/kvm.h"
 #include "sysemu/runstate.h"
-#include "sysemu/sysemu.h"
 #include "pci.h"
 #include "trace.h"
 #include "qapi/error.h"

diff --git a/hw/xtensa/virt.c b/hw/xtensa/virt.c
index e47e1de676713cdb39af36637b9c6991fbb7afb2..bbf6200c4964f84fd1c453b5ba453f18e519912c 100644 (file)
--- a/hw/xtensa/virt.c
+++ b/hw/xtensa/virt.c
@@ -29,7 +29,6 @@
 #include "qapi/error.h"
 #include "cpu.h"
 #include "sysemu/reset.h"
-#include "sysemu/sysemu.h"
 #include "hw/boards.h"
 #include "hw/loader.h"
 #include "hw/pci-host/gpex.h"

diff --git a/migration/ram.c b/migration/ram.c
index 4682f3625c4d6d272f5bef4f9fc9a0a22ad9f03e..9e9b7380bf6cbfaf052baa0cd631c2be84f2f0ec 100644 (file)
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -51,7 +51,6 @@
 #include "qemu/rcu_queue.h"
 #include "migration/colo.h"
 #include "block.h"
-#include "sysemu/sysemu.h"
 #include "sysemu/cpu-throttle.h"
 #include "savevm.h"
 #include "qemu/iov.h"

diff --git a/monitor/monitor.c b/monitor/monitor.c
index 636bcc81c5ba3229cf6168f270308172b5bcee64..b90c0f40516f1404396da9deb0e880ddce23158b 100644 (file)
--- a/monitor/monitor.c
+++ b/monitor/monitor.c
@@ -32,7 +32,6 @@
 #include "qemu/error-report.h"
 #include "qemu/option.h"
 #include "sysemu/qtest.h"
-#include "sysemu/sysemu.h"
 #include "trace.h"
 
 /*

diff --git a/net/net.c b/net/net.c
index edf9b954185f00cb9ce8fe1a7e55be5ab6b405ca..2a472604ecec4cc3be9cdf5a8c00d39677261642 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -51,9 +51,7 @@
 #include "qemu/option.h"
 #include "qapi/error.h"
 #include "qapi/opts-visitor.h"
-#include "sysemu/sysemu.h"
 #include "sysemu/runstate.h"
-#include "sysemu/sysemu.h"
 #include "net/filter.h"
 #include "qapi/string-output-visitor.h"
 

diff --git a/net/netmap.c b/net/netmap.c
index 350f097f91c12d603cb88f4e828462ca5d8b8b80..9e0cec58d379ee2eb101087c52fd3449db48f630 100644 (file)
--- a/net/netmap.c
+++ b/net/netmap.c
@@ -33,7 +33,6 @@
 #include "net/net.h"
 #include "net/tap.h"
 #include "clients.h"
-#include "sysemu/sysemu.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "qemu/iov.h"

diff --git a/plugins/api.c b/plugins/api.c
index b22998cd7c91081d082bb76b81f63712e77b1833..218e1342cda387d8b637388bf4bbf7c5df50d303 100644 (file)
--- a/plugins/api.c
+++ b/plugins/api.c
@@ -37,7 +37,6 @@
 #include "qemu/osdep.h"
 #include "qemu/plugin.h"
 #include "cpu.h"
-#include "sysemu/sysemu.h"
 #include "tcg/tcg.h"
 #include "exec/exec-all.h"
 #include "exec/ram_addr.h"

diff --git a/plugins/core.c b/plugins/core.c
index 87b823bbc4707314aeeb58f79b72b3168d55c524..93b595a8d6848f15f7cab476af43b0dbb05879c6 100644 (file)
--- a/plugins/core.c
+++ b/plugins/core.c
@@ -26,7 +26,6 @@
 #include "cpu.h"
 #include "exec/exec-all.h"
 #include "exec/helper-proto.h"
-#include "sysemu/sysemu.h"
 #include "tcg/tcg.h"
 #include "tcg/tcg-op.h"
 #include "trace/mem-internal.h" /* mem_info macros */

diff --git a/semihosting/config.c b/semihosting/config.c
index 3548e0f627f49546dfae9f04d648dac9ba0955bb..137171b717b20a2be1e44137604939f5e4e97753 100644 (file)
--- a/semihosting/config.c
+++ b/semihosting/config.c
@@ -24,7 +24,6 @@
 #include "qemu/error-report.h"
 #include "semihosting/semihost.h"
 #include "chardev/char.h"
-#include "sysemu/sysemu.h"
 
 QemuOptsList qemu_semihosting_config_opts = {
     .name = "semihosting-config",

diff --git a/semihosting/console.c b/semihosting/console.c
index c9ebd6fdd053b12874329c84678d3fc14919f65b..a78af69387271d55672b56fe2509d838c343a5a5 100644 (file)
--- a/semihosting/console.c
+++ b/semihosting/console.c
@@ -24,7 +24,6 @@
 #include "qemu/log.h"
 #include "chardev/char.h"
 #include "chardev/char-fe.h"
-#include "sysemu/sysemu.h"
 #include "qemu/main-loop.h"
 #include "qapi/error.h"
 #include "qemu/fifo8.h"

diff --git a/softmmu/arch_init.c b/softmmu/arch_init.c
index 7fd5c09b2b93edd2fe66c9032e590c958111f671..8471711c54cc18404cd2567b97dbdb715ac2775f 100644 (file)
--- a/softmmu/arch_init.c
+++ b/softmmu/arch_init.c
@@ -23,7 +23,6 @@
  */
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "sysemu/sysemu.h"
 #include "sysemu/arch_init.h"
 #include "hw/pci/pci.h"
 #include "hw/audio/soundhw.h"

diff --git a/softmmu/device_tree.c b/softmmu/device_tree.c
index 2691c58cf6339d209bf100a56bc2018f31f53f47..b621f63fbac8e6190db78d9414a8eaa5ec0108ff 100644 (file)
--- a/softmmu/device_tree.c
+++ b/softmmu/device_tree.c
@@ -23,7 +23,6 @@
 #include "qemu/bswap.h"
 #include "qemu/cutils.h"
 #include "sysemu/device_tree.h"
-#include "sysemu/sysemu.h"
 #include "hw/loader.h"
 #include "hw/boards.h"
 #include "qemu/config-file.h"

diff --git a/softmmu/physmem.c b/softmmu/physmem.c
index 85034d9c11e3f65cce6041ea8acc9a3b578d93d0..7ed276b9b5f948a95cd93daaae8c32fa4c6362c5 100644 (file)
--- a/softmmu/physmem.c
+++ b/softmmu/physmem.c
@@ -36,7 +36,6 @@
 #include "hw/boards.h"
 #include "hw/xen/xen.h"
 #include "sysemu/kvm.h"
-#include "sysemu/sysemu.h"
 #include "sysemu/tcg.h"
 #include "sysemu/qtest.h"
 #include "qemu/timer.h"

diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c
index a9955b97a078ea657546d9e2382ffc1c08b54371..721dec2d82006127578a8061870c55a36330941b 100644 (file)
--- a/softmmu/qdev-monitor.c
+++ b/softmmu/qdev-monitor.c
@@ -35,7 +35,6 @@
 #include "qemu/qemu-print.h"
 #include "qemu/option_int.h"
 #include "sysemu/block-backend.h"
-#include "sysemu/sysemu.h"
 #include "migration/misc.h"
 #include "migration/migration.h"
 #include "qemu/cutils.h"

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

diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index 0dd623e5909453e8e2d5875db213926b38500f45..4eb0d2f85c4deb11417eb2ee1c74136b22e7b840 100644 (file)
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -36,7 +36,6 @@
 #include "hw/loader.h"
 #include "hw/boards.h"
 #endif
-#include "sysemu/sysemu.h"
 #include "sysemu/tcg.h"
 #include "sysemu/hw_accel.h"
 #include "kvm_arm.h"

diff --git a/target/openrisc/sys_helper.c b/target/openrisc/sys_helper.c
index 41390d046f64d9099bb4fcaa123cef7debb8d2f8..48674231e74311801d2398c737e5fff19a467b93 100644 (file)
--- a/target/openrisc/sys_helper.c
+++ b/target/openrisc/sys_helper.c
@@ -23,7 +23,6 @@
 #include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "exception.h"
-#include "sysemu/sysemu.h"
 #ifndef CONFIG_USER_ONLY
 #include "hw/boards.h"
 #endif

diff --git a/target/rx/helper.c b/target/rx/helper.c
index 3e380a94fe60b84d17f9715483ae0881287d4617..db6b07e38900b5a3c36e3bbb4fee36ca83447cc4 100644 (file)
--- a/target/rx/helper.c
+++ b/target/rx/helper.c
@@ -21,7 +21,6 @@
 #include "cpu.h"
 #include "exec/log.h"
 #include "exec/cpu_ldst.h"
-#include "sysemu/sysemu.h"
 #include "hw/irq.h"
 
 void rx_cpu_unpack_psw(CPURXState *env, uint32_t psw, int rte)

diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
index d35eb39a1bbd6b9b91587042b7d2f25bedd5a929..64455cf309af3401838e9454240163d01f2c56fc 100644 (file)
--- a/target/s390x/cpu.c
+++ b/target/s390x/cpu.c
@@ -40,7 +40,6 @@
 #include "hw/s390x/pv.h"
 #include "hw/boards.h"
 #include "sysemu/arch_init.h"
-#include "sysemu/sysemu.h"
 #include "sysemu/tcg.h"
 #endif
 #include "fpu/softfloat-helpers.h"

diff --git a/target/s390x/excp_helper.c b/target/s390x/excp_helper.c
index c48cd6b46f49ee74514679a9a43827a227603e5c..20625c2c8f6b5d7b1bcf05eae55bdedb7cffa362 100644 (file)
--- a/target/s390x/excp_helper.c
+++ b/target/s390x/excp_helper.c
@@ -29,7 +29,6 @@
 #include "exec/address-spaces.h"
 #include "tcg_s390x.h"
 #ifndef CONFIG_USER_ONLY
-#include "sysemu/sysemu.h"
 #include "hw/s390x/s390_flic.h"
 #include "hw/boards.h"
 #endif

diff --git a/tcg/tcg.c b/tcg/tcg.c
index 1fbe0b686d57361ed698c4ab5e5c675d89ddb302..cc947bf6f6a242c413749c2131e61400c07681af 100644 (file)
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -64,7 +64,6 @@
 
 #include "elf.h"
 #include "exec/log.h"
-#include "sysemu/sysemu.h"
 
 /* Forward declarations for functions declared in tcg-target.c.inc and
    used here. */

diff --git a/tests/qtest/fuzz/fuzz.c b/tests/qtest/fuzz/fuzz.c
index 496d11a23131f6dc8ba6a4732fd4b4c9861ee692..04b70e114bf9f50255cb3818a23c4dc62e5678d8 100644 (file)
--- a/tests/qtest/fuzz/fuzz.c
+++ b/tests/qtest/fuzz/fuzz.c
@@ -18,7 +18,6 @@
 #include "qemu/datadir.h"
 #include "sysemu/qtest.h"
 #include "sysemu/runstate.h"
-#include "sysemu/sysemu.h"
 #include "qemu/main-loop.h"
 #include "qemu/rcu.h"
 #include "tests/qtest/libqos/libqtest.h"

diff --git a/tests/qtest/fuzz/qos_fuzz.c b/tests/qtest/fuzz/qos_fuzz.c
index cee1a2a60f62f70f0f2e1535471f5954998e3c19..2bc474645c56488b9cdc530a4699409011caf309 100644 (file)
--- a/tests/qtest/fuzz/qos_fuzz.c
+++ b/tests/qtest/fuzz/qos_fuzz.c
@@ -22,7 +22,6 @@
 #include "qemu-common.h"
 #include "exec/memory.h"
 #include "exec/address-spaces.h"
-#include "sysemu/sysemu.h"
 #include "qemu/main-loop.h"
 
 #include "tests/qtest/libqos/libqtest.h"

diff --git a/util/oslib-win32.c b/util/oslib-win32.c
index f68b8012bb8c37c75e17fbc7adc69679371e11bb..1fc42ec0e388b1ef8d660a9ab580d2835fd8fca5 100644 (file)
--- a/util/oslib-win32.c
+++ b/util/oslib-win32.c
@@ -34,7 +34,6 @@
 #include <windows.h>
 #include "qemu-common.h"
 #include "qapi/error.h"
-#include "sysemu/sysemu.h"
 #include "qemu/main-loop.h"
 #include "trace.h"
 #include "qemu/sockets.h"