On Wed, Mar 23, 2022 at 9:32 PM wrote: > From: Marc-André Lureau > > Signed-off-by: Marc-André Lureau Empty patch descriptions are not a good idea. Please explain why this removal does not break things and maybe why the header got included initiatively. > --- > include/qemu-common.h | 9 --------- > accel/hvf/hvf-all.c | 1 - > accel/tcg/cpu-exec.c | 1 - > accel/tcg/tcg-accel-ops-icount.c | 1 - > accel/tcg/tcg-accel-ops-mttcg.c | 1 - > accel/tcg/tcg-accel-ops-rr.c | 1 - > accel/tcg/tcg-accel-ops.c | 1 - > accel/tcg/tcg-all.c | 1 - > accel/tcg/translate-all.c | 1 - > audio/audio_win_int.c | 1 - > backends/hostmem-epc.c | 1 - > backends/tpm/tpm_passthrough.c | 1 - > block/file-posix.c | 1 - > block/io_uring.c | 1 - > bsd-user/freebsd/os-syscall.c | 1 - > bsd-user/mmap.c | 1 - > chardev/char-fd.c | 1 - > chardev/char-pipe.c | 1 - > chardev/char-pty.c | 1 - > cpu.c | 1 - > crypto/cipher-afalg.c | 1 - > crypto/hash-afalg.c | 1 - > dump/dump.c | 1 - > dump/win_dump.c | 1 - > fsdev/virtfs-proxy-helper.c | 1 - > gdbstub.c | 1 - > hw/9pfs/9p-proxy.c | 1 - > hw/alpha/dp264.c | 1 - > hw/avr/boot.c | 1 - > hw/core/loader.c | 1 - > hw/display/artist.c | 1 - > hw/display/cg3.c | 1 - > hw/display/tcx.c | 1 - > hw/display/virtio-gpu-udmabuf.c | 1 - > hw/dma/pl330.c | 1 - > hw/hppa/machine.c | 1 - > hw/i386/pc_sysfw.c | 1 - > hw/i386/x86.c | 1 - > hw/input/vhost-user-input.c | 1 - > hw/intc/xics_kvm.c | 1 - > hw/m68k/mcf5208.c | 1 - > hw/m68k/q800.c | 1 - > hw/m68k/virt.c | 1 - > hw/microblaze/boot.c | 1 - > hw/mips/fuloong2e.c | 1 - > hw/mips/jazz.c | 1 - > hw/mips/loongson3_virt.c | 1 - > hw/mips/malta.c | 1 - > hw/mips/mipssim.c | 1 - > hw/misc/sbsa_ec.c | 1 - > hw/net/fsl_etsec/etsec.c | 1 - > hw/net/fsl_etsec/rings.c | 1 - > hw/net/msf2-emac.c | 1 - > hw/net/npcm7xx_emc.c | 1 - > hw/nios2/boot.c | 1 - > hw/nios2/generic_nommu.c | 1 - > hw/nvram/fw_cfg.c | 1 - > hw/pci-host/mv64361.c | 1 - > hw/pci-host/pnv_phb3.c | 1 - > hw/pci-host/pnv_phb3_msi.c | 1 - > hw/pci-host/pnv_phb3_pbcq.c | 1 - > hw/pci-host/pnv_phb4.c | 1 - > hw/pci-host/pnv_phb4_pec.c | 1 - > hw/pci-host/raven.c | 1 - > hw/pci-host/remote.c | 1 - > hw/pci/pci.c | 1 - > hw/ppc/e500.c | 1 - > hw/ppc/mac_newworld.c | 1 - > hw/ppc/mac_oldworld.c | 1 - > hw/ppc/pegasos2.c | 1 - > hw/ppc/pnv.c | 1 - > hw/ppc/pnv_bmc.c | 1 - > hw/ppc/ppc405_boards.c | 1 - > hw/ppc/ppc440_bamboo.c | 1 - > hw/ppc/sam460ex.c | 1 - > hw/ppc/spapr.c | 1 - > hw/ppc/spapr_numa.c | 1 - > hw/ppc/spapr_pci_nvlink2.c | 1 - > hw/ppc/spapr_tpm_proxy.c | 1 - > hw/ppc/spapr_vof.c | 1 - > hw/ppc/virtex_ml507.c | 1 - > hw/ppc/vof.c | 1 - > hw/remote/iohub.c | 1 - > hw/remote/machine.c | 1 - > hw/remote/memory.c | 1 - > hw/remote/message.c | 1 - > hw/remote/mpqemu-link.c | 1 - > hw/remote/proxy-memory-listener.c | 1 - > hw/remote/proxy.c | 1 - > hw/remote/remote-obj.c | 1 - > hw/riscv/boot.c | 1 - > hw/rx/rx-gdbsim.c | 1 - > hw/s390x/ipl.c | 1 - > hw/sd/sd.c | 1 - > hw/sparc/leon3.c | 1 - > hw/sparc/sun4m.c | 1 - > hw/sparc64/sun4u.c | 1 - > hw/usb/dev-mtp.c | 1 - > hw/virtio/virtio-iommu.c | 1 - > hw/virtio/virtio-mem.c | 1 - > hw/virtio/virtio-pmem.c | 1 - > io/channel-socket.c | 1 - > linux-user/aarch64/cpu_loop.c | 1 - > linux-user/alpha/cpu_loop.c | 1 - > linux-user/arm/cpu_loop.c | 1 - > linux-user/cris/cpu_loop.c | 1 - > linux-user/hexagon/cpu_loop.c | 1 - > linux-user/i386/cpu_loop.c | 1 - > linux-user/m68k/cpu_loop.c | 1 - > linux-user/microblaze/cpu_loop.c | 1 - > linux-user/mips/cpu_loop.c | 1 - > linux-user/openrisc/cpu_loop.c | 1 - > linux-user/ppc/cpu_loop.c | 1 - > linux-user/riscv/cpu_loop.c | 1 - > linux-user/s390x/cpu_loop.c | 1 - > linux-user/sh4/cpu_loop.c | 1 - > linux-user/sparc/cpu_loop.c | 1 - > linux-user/uname.c | 1 - > monitor/qmp-cmds.c | 1 - > net/colo-compare.c | 1 - > net/net.c | 1 - > net/socket.c | 1 - > net/tap-bsd.c | 1 - > net/tap-linux.c | 1 - > net/tap-solaris.c | 1 - > net/tap-win32.c | 1 - > net/tap.c | 1 - > net/vde.c | 1 - > os-posix.c | 1 - > os-win32.c | 1 - > page-vary-common.c | 1 - > qga/commands-posix.c | 1 - > softmmu/cpu-throttle.c | 1 - > softmmu/cpu-timers.c | 1 - > softmmu/cpus.c | 1 - > softmmu/datadir.c | 1 - > softmmu/icount.c | 1 - > softmmu/runstate.c | 1 - > stubs/monitor-core.c | 1 - > target/arm/hvf/hvf.c | 1 - > target/arm/kvm.c | 1 - > target/arm/kvm64.c | 1 - > target/hexagon/gdbstub.c | 1 - > target/i386/hax/hax-all.c | 1 - > target/i386/hvf/hvf.c | 1 - > target/i386/hvf/x86.c | 1 - > target/i386/hvf/x86_cpuid.c | 1 - > target/i386/hvf/x86_decode.c | 1 - > target/i386/hvf/x86_descr.c | 1 - > target/i386/hvf/x86_emu.c | 1 - > target/i386/hvf/x86_flags.c | 1 - > target/i386/hvf/x86_mmu.c | 1 - > target/i386/hvf/x86_task.c | 1 - > target/i386/hvf/x86hvf.c | 1 - > target/i386/kvm/sev-stub.c | 1 - > target/i386/nvmm/nvmm-all.c | 1 - > target/i386/whpx/whpx-all.c | 1 - > target/i386/whpx/whpx-apic.c | 1 - > target/mips/kvm.c | 1 - > target/nios2/nios2-semi.c | 1 - > target/ppc/kvm.c | 1 - > target/riscv/kvm.c | 1 - > target/rx/cpu.c | 1 - > target/rx/gdbstub.c | 1 - > target/s390x/kvm/kvm.c | 1 - > target/s390x/tcg/vec_fpu_helper.c | 1 - > target/s390x/tcg/vec_int_helper.c | 1 - > target/s390x/tcg/vec_string_helper.c | 1 - > target/tricore/gdbstub.c | 1 - > target/xtensa/core-de233_fpu.c | 1 - > target/xtensa/core-dsp3400.c | 1 - > target/xtensa/core-test_mmuhifi_c3.c | 1 - > tcg/tci.c | 1 - > tests/qtest/acpi-utils.c | 1 - > tests/qtest/ahci-test.c | 1 - > tests/qtest/aspeed_hace-test.c | 1 - > tests/qtest/bios-tables-test.c | 1 - > tests/qtest/boot-sector.c | 1 - > tests/qtest/cpu-plug-test.c | 1 - > tests/qtest/dbus-display-test.c | 1 - > tests/qtest/dbus-vmstate-test.c | 1 - > tests/qtest/device-introspect-test.c | 1 - > tests/qtest/e1000e-test.c | 2 -- > tests/qtest/erst-test.c | 1 - > tests/qtest/fdc-test.c | 1 - > tests/qtest/fuzz/qos_fuzz.c | 1 - > tests/qtest/hd-geo-test.c | 1 - > tests/qtest/ide-test.c | 1 - > tests/qtest/ipmi-bt-test.c | 1 - > tests/qtest/ivshmem-test.c | 1 - > tests/qtest/libqos/ahci.c | 1 - > tests/qtest/libqos/malloc-pc.c | 2 -- > tests/qtest/libqos/malloc-spapr.c | 2 -- > tests/qtest/libqos/malloc.c | 1 - > tests/qtest/libqtest.c | 1 - > tests/qtest/machine-none-test.c | 1 - > tests/qtest/npcm7xx_emc-test.c | 1 - > tests/qtest/pxe-test.c | 1 - > tests/qtest/qom-test.c | 1 - > tests/qtest/rtl8139-test.c | 1 - > tests/qtest/test-filter-mirror.c | 1 - > tests/qtest/test-filter-redirector.c | 1 - > tests/qtest/test-x86-cpuid-compat.c | 1 - > tests/qtest/virtio-net-test.c | 1 - > tests/unit/check-qjson.c | 1 - > tests/unit/check-qnull.c | 1 - > tests/unit/check-qnum.c | 1 - > tests/unit/check-qobject.c | 1 - > tests/unit/check-qstring.c | 1 - > tests/unit/socket-helpers.c | 1 - > tests/unit/test-clone-visitor.c | 1 - > tests/unit/test-forward-visitor.c | 1 - > tests/unit/test-iov.c | 1 - > tests/unit/test-logging.c | 1 - > tests/unit/test-qmp-event.c | 1 - > tests/unit/test-qobject-input-visitor.c | 1 - > tests/unit/test-qobject-output-visitor.c | 1 - > tests/unit/test-string-input-visitor.c | 1 - > tests/unit/test-string-output-visitor.c | 1 - > tests/unit/test-thread-pool.c | 1 - > tests/unit/test-util-sockets.c | 1 - > tests/unit/test-visitor-serialization.c | 1 - > tests/unit/test-xbzrle.c | 1 - > ui/gtk-clipboard.c | 1 - > ui/keymaps.c | 1 - > ui/vdagent.c | 1 - > ui/vnc-clipboard.c | 1 - > ui/vnc-enc-tight.c | 2 +- > ui/vnc.c | 1 - > util/aio-win32.c | 1 - > util/coroutine-sigaltstack.c | 1 - > util/coroutine-win32.c | 1 - > util/cutils.c | 1 - > util/event_notifier-posix.c | 1 - > util/event_notifier-win32.c | 1 - > util/iov.c | 1 - > util/osdep.c | 1 - > util/oslib-posix.c | 1 - > util/oslib-win32.c | 1 - > util/qemu-coroutine-io.c | 1 - > util/qemu-sockets.c | 1 - > util/qemu-thread-win32.c | 1 - > target/xtensa/import_core.sh | 1 - > 243 files changed, 1 insertion(+), 254 deletions(-) > > diff --git a/include/qemu-common.h b/include/qemu-common.h > index 0498acd16b78..ba32cc8b1f39 100644 > --- a/include/qemu-common.h > +++ b/include/qemu-common.h > @@ -1,12 +1,3 @@ > -/* > - * This file is supposed to be included only by .c files. No header file > should > - * depend on qemu-common.h, as this would easily lead to circular header > - * dependencies. > - * > - * If a header file uses a definition from qemu-common.h, that definition > - * must be moved to a separate header file, and the header that uses it > - * must include that header. > - */ > #ifndef QEMU_COMMON_H > #define QEMU_COMMON_H > > diff --git a/accel/hvf/hvf-all.c b/accel/hvf/hvf-all.c > index f185b0830a75..0043f4d308ba 100644 > --- a/accel/hvf/hvf-all.c > +++ b/accel/hvf/hvf-all.c > @@ -9,7 +9,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/error-report.h" > #include "sysemu/hvf.h" > #include "sysemu/hvf_int.h" > diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c > index c997c2e8e015..083ada76b124 100644 > --- a/accel/tcg/cpu-exec.c > +++ b/accel/tcg/cpu-exec.c > @@ -18,7 +18,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/qemu-print.h" > #include "qapi/error.h" > #include "qapi/qapi-commands-machine.h" > diff --git a/accel/tcg/tcg-accel-ops-icount.c > b/accel/tcg/tcg-accel-ops-icount.c > index bdaf2c943b49..6436cd9349a3 100644 > --- a/accel/tcg/tcg-accel-ops-icount.c > +++ b/accel/tcg/tcg-accel-ops-icount.c > @@ -24,7 +24,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "sysemu/tcg.h" > #include "sysemu/replay.h" > #include "sysemu/cpu-timers.h" > diff --git a/accel/tcg/tcg-accel-ops-mttcg.c > b/accel/tcg/tcg-accel-ops-mttcg.c > index ea2b741deb51..d50239e0e28f 100644 > --- a/accel/tcg/tcg-accel-ops-mttcg.c > +++ b/accel/tcg/tcg-accel-ops-mttcg.c > @@ -24,7 +24,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "sysemu/tcg.h" > #include "sysemu/replay.h" > #include "sysemu/cpu-timers.h" > diff --git a/accel/tcg/tcg-accel-ops-rr.c b/accel/tcg/tcg-accel-ops-rr.c > index b287110766ef..1a72149f0e46 100644 > --- a/accel/tcg/tcg-accel-ops-rr.c > +++ b/accel/tcg/tcg-accel-ops-rr.c > @@ -24,7 +24,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "sysemu/tcg.h" > #include "sysemu/replay.h" > #include "sysemu/cpu-timers.h" > diff --git a/accel/tcg/tcg-accel-ops.c b/accel/tcg/tcg-accel-ops.c > index ea7dcad674cf..684dc5a1371f 100644 > --- a/accel/tcg/tcg-accel-ops.c > +++ b/accel/tcg/tcg-accel-ops.c > @@ -26,7 +26,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "sysemu/tcg.h" > #include "sysemu/replay.h" > #include "sysemu/cpu-timers.h" > diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c > index d6336a9c966d..47952eecd779 100644 > --- a/accel/tcg/tcg-all.c > +++ b/accel/tcg/tcg-all.c > @@ -24,7 +24,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "sysemu/tcg.h" > #include "sysemu/cpu-timers.h" > #include "tcg/tcg.h" > diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c > index 5971cd53ab9f..a6e03c1e50b2 100644 > --- a/accel/tcg/translate-all.c > +++ b/accel/tcg/translate-all.c > @@ -18,7 +18,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > > #define NO_CPU_IO_DEFS > #include "trace.h" > diff --git a/audio/audio_win_int.c b/audio/audio_win_int.c > index 5ea8157dfcc8..316f118f5099 100644 > --- a/audio/audio_win_int.c > +++ b/audio/audio_win_int.c > @@ -1,7 +1,6 @@ > /* public domain */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > > #define AUDIO_CAP "win-int" > #include > diff --git a/backends/hostmem-epc.c b/backends/hostmem-epc.c > index b47f98b6a3aa..037292d2672f 100644 > --- a/backends/hostmem-epc.c > +++ b/backends/hostmem-epc.c > @@ -12,7 +12,6 @@ > #include > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qom/object_interfaces.h" > #include "qapi/error.h" > #include "sysemu/hostmem.h" > diff --git a/backends/tpm/tpm_passthrough.c > b/backends/tpm/tpm_passthrough.c > index d5558fae6cc5..5a2f74db1b38 100644 > --- a/backends/tpm/tpm_passthrough.c > +++ b/backends/tpm/tpm_passthrough.c > @@ -23,7 +23,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/error-report.h" > #include "qemu/module.h" > #include "qemu/sockets.h" > diff --git a/block/file-posix.c b/block/file-posix.c > index 61b02d85ebf1..bfd9b2111143 100644 > --- a/block/file-posix.c > +++ b/block/file-posix.c > @@ -23,7 +23,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qapi/error.h" > #include "qemu/cutils.h" > #include "qemu/error-report.h" > diff --git a/block/io_uring.c b/block/io_uring.c > index 782afdb433e1..0b401512b973 100644 > --- a/block/io_uring.c > +++ b/block/io_uring.c > @@ -10,7 +10,6 @@ > */ > #include "qemu/osdep.h" > #include > -#include "qemu-common.h" > #include "block/aio.h" > #include "qemu/queue.h" > #include "block/block.h" > diff --git a/bsd-user/freebsd/os-syscall.c b/bsd-user/freebsd/os-syscall.c > index a17ff9f6ecce..d272478e7b0a 100644 > --- a/bsd-user/freebsd/os-syscall.c > +++ b/bsd-user/freebsd/os-syscall.c > @@ -37,7 +37,6 @@ > #include > > #include "qemu.h" > -#include "qemu-common.h" > #include "signal-common.h" > #include "user/syscall-trace.h" > > diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c > index 07aa0a634dff..e54e26de17b0 100644 > --- a/bsd-user/mmap.c > +++ b/bsd-user/mmap.c > @@ -19,7 +19,6 @@ > #include "qemu/osdep.h" > > #include "qemu.h" > -#include "qemu-common.h" > > static pthread_mutex_t mmap_mutex = PTHREAD_MUTEX_INITIALIZER; > static __thread int mmap_lock_count; > diff --git a/chardev/char-fd.c b/chardev/char-fd.c > index 93c56913b49a..6ec9682b22f2 100644 > --- a/chardev/char-fd.c > +++ b/chardev/char-fd.c > @@ -23,7 +23,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/module.h" > #include "qemu/sockets.h" > #include "qapi/error.h" > diff --git a/chardev/char-pipe.c b/chardev/char-pipe.c > index 7eca5d9a56ae..66d3b8509183 100644 > --- a/chardev/char-pipe.c > +++ b/chardev/char-pipe.c > @@ -23,7 +23,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qapi/error.h" > #include "qemu/main-loop.h" > #include "qemu/module.h" > diff --git a/chardev/char-pty.c b/chardev/char-pty.c > index d73d8b23903d..1e2863f532a8 100644 > --- a/chardev/char-pty.c > +++ b/chardev/char-pty.c > @@ -23,7 +23,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qapi/error.h" > #include "chardev/char.h" > #include "io/channel-file.h" > diff --git a/cpu.c b/cpu.c > index ab2c7c81e460..0fef70e18e74 100644 > --- a/cpu.c > +++ b/cpu.c > @@ -18,7 +18,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qapi/error.h" > > #include "exec/target_page.h" > diff --git a/crypto/cipher-afalg.c b/crypto/cipher-afalg.c > index c55cd28bf01c..3df8fc54c051 100644 > --- a/crypto/cipher-afalg.c > +++ b/crypto/cipher-afalg.c > @@ -12,7 +12,6 @@ > */ > #include "qemu/osdep.h" > #include "qemu/sockets.h" > -#include "qemu-common.h" > #include "qapi/error.h" > #include "crypto/cipher.h" > #include "cipherpriv.h" > diff --git a/crypto/hash-afalg.c b/crypto/hash-afalg.c > index 4ac18c7c1db7..3ebea392920d 100644 > --- a/crypto/hash-afalg.c > +++ b/crypto/hash-afalg.c > @@ -13,7 +13,6 @@ > #include "qemu/osdep.h" > #include "qemu/iov.h" > #include "qemu/sockets.h" > -#include "qemu-common.h" > #include "qapi/error.h" > #include "crypto/hash.h" > #include "crypto/hmac.h" > diff --git a/dump/dump.c b/dump/dump.c > index 5d71c47d06aa..e766ce1d7d91 100644 > --- a/dump/dump.c > +++ b/dump/dump.c > @@ -12,7 +12,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/cutils.h" > #include "elf.h" > #include "exec/hwaddr.h" > diff --git a/dump/win_dump.c b/dump/win_dump.c > index c5eb5a9aacd7..fbdbb7bd93a6 100644 > --- a/dump/win_dump.c > +++ b/dump/win_dump.c > @@ -9,7 +9,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/cutils.h" > #include "elf.h" > #include "exec/hwaddr.h" > diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c > index d06a0f7b8326..2dde27922fe2 100644 > --- a/fsdev/virtfs-proxy-helper.c > +++ b/fsdev/virtfs-proxy-helper.c > @@ -21,7 +21,6 @@ > #include > #endif > #include > -#include "qemu-common.h" > #include "qemu/sockets.h" > #include "qemu/xattr.h" > #include "9p-iov-marshal.h" > diff --git a/gdbstub.c b/gdbstub.c > index c8375e3c3ffe..2c804d506629 100644 > --- a/gdbstub.c > +++ b/gdbstub.c > @@ -24,7 +24,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qapi/error.h" > #include "qemu/error-report.h" > #include "qemu/ctype.h" > diff --git a/hw/9pfs/9p-proxy.c b/hw/9pfs/9p-proxy.c > index 4c5e0fc217eb..99d115ff0db4 100644 > --- a/hw/9pfs/9p-proxy.c > +++ b/hw/9pfs/9p-proxy.c > @@ -18,7 +18,6 @@ > #include "qemu/osdep.h" > #include > #include > -#include "qemu-common.h" > #include "9p.h" > #include "qapi/error.h" > #include "qemu/cutils.h" > diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c > index c78ed96d0eca..f4349eba83fb 100644 > --- a/hw/alpha/dp264.c > +++ b/hw/alpha/dp264.c > @@ -7,7 +7,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "cpu.h" > #include "elf.h" > #include "hw/loader.h" > diff --git a/hw/avr/boot.c b/hw/avr/boot.c > index cbede775cee2..617f3a144c85 100644 > --- a/hw/avr/boot.c > +++ b/hw/avr/boot.c > @@ -9,7 +9,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/datadir.h" > #include "hw/loader.h" > #include "elf.h" > diff --git a/hw/core/loader.c b/hw/core/loader.c > index 8d9b2df6e725..8167301f0402 100644 > --- a/hw/core/loader.c > +++ b/hw/core/loader.c > @@ -43,7 +43,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/datadir.h" > #include "qapi/error.h" > #include "qapi/qapi-commands-machine.h" > diff --git a/hw/display/artist.c b/hw/display/artist.c > index 69a8f9eea8ba..8e121bb0b4dc 100644 > --- a/hw/display/artist.c > +++ b/hw/display/artist.c > @@ -7,7 +7,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/error-report.h" > #include "qemu/log.h" > #include "qemu/module.h" > diff --git a/hw/display/cg3.c b/hw/display/cg3.c > index 4b7e78d91924..2e9656ae1c39 100644 > --- a/hw/display/cg3.c > +++ b/hw/display/cg3.c > @@ -24,7 +24,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/datadir.h" > #include "qapi/error.h" > #include "qemu/error-report.h" > diff --git a/hw/display/tcx.c b/hw/display/tcx.c > index d4d09d0df8d5..1b27b64f6d14 100644 > --- a/hw/display/tcx.c > +++ b/hw/display/tcx.c > @@ -23,7 +23,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/datadir.h" > #include "qapi/error.h" > #include "ui/console.h" > diff --git a/hw/display/virtio-gpu-udmabuf.c > b/hw/display/virtio-gpu-udmabuf.c > index 1597921c51fc..8bdf4bac6e4b 100644 > --- a/hw/display/virtio-gpu-udmabuf.c > +++ b/hw/display/virtio-gpu-udmabuf.c > @@ -13,7 +13,6 @@ > > #include "qemu/osdep.h" > #include "qemu/units.h" > -#include "qemu-common.h" > #include "qemu/iov.h" > #include "ui/console.h" > #include "hw/virtio/virtio-gpu.h" > diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c > index 31ce01b7c57c..08e5938ec7b7 100644 > --- a/hw/dma/pl330.c > +++ b/hw/dma/pl330.c > @@ -15,7 +15,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "hw/irq.h" > #include "hw/qdev-properties.h" > #include "hw/sysbus.h" > diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c > index 98b30e0395ee..f7595c08577c 100644 > --- a/hw/hppa/machine.c > +++ b/hw/hppa/machine.c > @@ -4,7 +4,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/datadir.h" > #include "cpu.h" > #include "elf.h" > diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c > index c8b17af95353..0540047bad22 100644 > --- a/hw/i386/pc_sysfw.c > +++ b/hw/i386/pc_sysfw.c > @@ -24,7 +24,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qapi/error.h" > #include "sysemu/block-backend.h" > #include "qemu/error-report.h" > diff --git a/hw/i386/x86.c b/hw/i386/x86.c > index 4cf107baea34..bb6727279097 100644 > --- a/hw/i386/x86.c > +++ b/hw/i386/x86.c > @@ -25,7 +25,6 @@ > #include "qemu/option.h" > #include "qemu/cutils.h" > #include "qemu/units.h" > -#include "qemu-common.h" > #include "qemu/datadir.h" > #include "qapi/error.h" > #include "qapi/qmp/qerror.h" > diff --git a/hw/input/vhost-user-input.c b/hw/input/vhost-user-input.c > index 273e96a7b12d..aeb0624fe57e 100644 > --- a/hw/input/vhost-user-input.c > +++ b/hw/input/vhost-user-input.c > @@ -7,7 +7,6 @@ > #include "qemu/osdep.h" > #include "qemu/error-report.h" > #include "qapi/error.h" > -#include "qemu-common.h" > > #include "hw/virtio/virtio-input.h" > > diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c > index f5bfc501bc15..9719d98a179e 100644 > --- a/hw/intc/xics_kvm.c > +++ b/hw/intc/xics_kvm.c > @@ -27,7 +27,6 @@ > > #include "qemu/osdep.h" > #include "qapi/error.h" > -#include "qemu-common.h" > #include "trace.h" > #include "sysemu/kvm.h" > #include "hw/ppc/spapr.h" > diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c > index 93812ee206ea..655207e393dc 100644 > --- a/hw/m68k/mcf5208.c > +++ b/hw/m68k/mcf5208.c > @@ -11,7 +11,6 @@ > #include "qemu/error-report.h" > #include "qemu/log.h" > #include "qapi/error.h" > -#include "qemu-common.h" > #include "qemu/datadir.h" > #include "cpu.h" > #include "hw/irq.h" > diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c > index 66ca5c0df6ef..099a758c6f6a 100644 > --- a/hw/m68k/q800.c > +++ b/hw/m68k/q800.c > @@ -22,7 +22,6 @@ > > #include "qemu/osdep.h" > #include "qemu/units.h" > -#include "qemu-common.h" > #include "qemu/datadir.h" > #include "sysemu/sysemu.h" > #include "cpu.h" > diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c > index 8e630282e02c..7de8b5f83393 100644 > --- a/hw/m68k/virt.c > +++ b/hw/m68k/virt.c > @@ -9,7 +9,6 @@ > > #include "qemu/osdep.h" > #include "qemu/units.h" > -#include "qemu-common.h" > #include "sysemu/sysemu.h" > #include "cpu.h" > #include "hw/boards.h" > diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c > index 03c030aa2cf0..8b92a9801a02 100644 > --- a/hw/microblaze/boot.c > +++ b/hw/microblaze/boot.c > @@ -25,7 +25,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/datadir.h" > #include "cpu.h" > #include "qemu/option.h" > diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c > index c9f14e70a077..7b13098f9b1b 100644 > --- a/hw/mips/fuloong2e.c > +++ b/hw/mips/fuloong2e.c > @@ -19,7 +19,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/datadir.h" > #include "qemu/units.h" > #include "qapi/error.h" > diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c > index 4d6b44de342e..6598d7dddd59 100644 > --- a/hw/mips/jazz.c > +++ b/hw/mips/jazz.c > @@ -23,7 +23,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/datadir.h" > #include "hw/clock.h" > #include "hw/mips/mips.h" > diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c > index ae192db0c8b9..25534288dd81 100644 > --- a/hw/mips/loongson3_virt.c > +++ b/hw/mips/loongson3_virt.c > @@ -24,7 +24,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/units.h" > #include "qemu/cutils.h" > #include "qemu/datadir.h" > diff --git a/hw/mips/malta.c b/hw/mips/malta.c > index c4474b927c46..9ffdc5b8f187 100644 > --- a/hw/mips/malta.c > +++ b/hw/mips/malta.c > @@ -25,7 +25,6 @@ > #include "qemu/osdep.h" > #include "qemu/units.h" > #include "qemu/bitops.h" > -#include "qemu-common.h" > #include "qemu/datadir.h" > #include "hw/clock.h" > #include "hw/southbridge/piix.h" > diff --git a/hw/mips/mipssim.c b/hw/mips/mipssim.c > index 30bc1c4f086f..39f64448f244 100644 > --- a/hw/mips/mipssim.c > +++ b/hw/mips/mipssim.c > @@ -27,7 +27,6 @@ > > #include "qemu/osdep.h" > #include "qapi/error.h" > -#include "qemu-common.h" > #include "qemu/datadir.h" > #include "hw/clock.h" > #include "hw/mips/mips.h" > diff --git a/hw/misc/sbsa_ec.c b/hw/misc/sbsa_ec.c > index 83020fe9ac9b..8d939fe31b1b 100644 > --- a/hw/misc/sbsa_ec.c > +++ b/hw/misc/sbsa_ec.c > @@ -11,7 +11,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/log.h" > #include "hw/sysbus.h" > #include "sysemu/runstate.h" > diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c > index e7fc082518d2..6d50c395439a 100644 > --- a/hw/net/fsl_etsec/etsec.c > +++ b/hw/net/fsl_etsec/etsec.c > @@ -27,7 +27,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "hw/sysbus.h" > #include "hw/irq.h" > #include "hw/ptimer.h" > diff --git a/hw/net/fsl_etsec/rings.c b/hw/net/fsl_etsec/rings.c > index 8f084464155d..a32589e33be4 100644 > --- a/hw/net/fsl_etsec/rings.c > +++ b/hw/net/fsl_etsec/rings.c > @@ -22,7 +22,6 @@ > * THE SOFTWARE. > */ > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "net/checksum.h" > #include "qemu/log.h" > #include "etsec.h" > diff --git a/hw/net/msf2-emac.c b/hw/net/msf2-emac.c > index 9278fdce0b3d..7ccd3e514271 100644 > --- a/hw/net/msf2-emac.c > +++ b/hw/net/msf2-emac.c > @@ -29,7 +29,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/log.h" > #include "qapi/error.h" > #include "hw/registerfields.h" > diff --git a/hw/net/npcm7xx_emc.c b/hw/net/npcm7xx_emc.c > index 9a2328935c1c..7c86bb52e571 100644 > --- a/hw/net/npcm7xx_emc.c > +++ b/hw/net/npcm7xx_emc.c > @@ -32,7 +32,6 @@ > /* For crc32 */ > #include > > -#include "qemu-common.h" > #include "hw/irq.h" > #include "hw/qdev-clock.h" > #include "hw/qdev-properties.h" > diff --git a/hw/nios2/boot.c b/hw/nios2/boot.c > index e889595d5c2b..07b8d87633b6 100644 > --- a/hw/nios2/boot.c > +++ b/hw/nios2/boot.c > @@ -30,7 +30,6 @@ > > #include "qemu/osdep.h" > #include "qemu/units.h" > -#include "qemu-common.h" > #include "qemu/datadir.h" > #include "qemu/option.h" > #include "qemu/config-file.h" > diff --git a/hw/nios2/generic_nommu.c b/hw/nios2/generic_nommu.c > index fbc18dbd04c2..48edb3ae373d 100644 > --- a/hw/nios2/generic_nommu.c > +++ b/hw/nios2/generic_nommu.c > @@ -28,7 +28,6 @@ > > #include "qemu/osdep.h" > #include "qapi/error.h" > -#include "qemu-common.h" > > #include "hw/char/serial.h" > #include "hw/boards.h" > diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c > index ea2d56f9f2af..4125cbebcd38 100644 > --- a/hw/nvram/fw_cfg.c > +++ b/hw/nvram/fw_cfg.c > @@ -23,7 +23,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/datadir.h" > #include "sysemu/sysemu.h" > #include "sysemu/dma.h" > diff --git a/hw/pci-host/mv64361.c b/hw/pci-host/mv64361.c > index 00b3ff7d9098..cc9c4d6d3b33 100644 > --- a/hw/pci-host/mv64361.c > +++ b/hw/pci-host/mv64361.c > @@ -9,7 +9,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/units.h" > #include "qapi/error.h" > #include "hw/hw.h" > diff --git a/hw/pci-host/pnv_phb3.c b/hw/pci-host/pnv_phb3.c > index 6e9aa9d6ace2..4e68ad4f03fc 100644 > --- a/hw/pci-host/pnv_phb3.c > +++ b/hw/pci-host/pnv_phb3.c > @@ -10,7 +10,6 @@ > #include "qemu/log.h" > #include "qapi/visitor.h" > #include "qapi/error.h" > -#include "qemu-common.h" > #include "hw/pci-host/pnv_phb3_regs.h" > #include "hw/pci-host/pnv_phb3.h" > #include "hw/pci/pcie_host.h" > diff --git a/hw/pci-host/pnv_phb3_msi.c b/hw/pci-host/pnv_phb3_msi.c > index 8bcbc2cc4f37..2f4112907b84 100644 > --- a/hw/pci-host/pnv_phb3_msi.c > +++ b/hw/pci-host/pnv_phb3_msi.c > @@ -9,7 +9,6 @@ > #include "qemu/osdep.h" > #include "qemu/log.h" > #include "qapi/error.h" > -#include "qemu-common.h" > #include "hw/pci-host/pnv_phb3_regs.h" > #include "hw/pci-host/pnv_phb3.h" > #include "hw/ppc/pnv.h" > diff --git a/hw/pci-host/pnv_phb3_pbcq.c b/hw/pci-host/pnv_phb3_pbcq.c > index c7426cd27a20..82f70efa4311 100644 > --- a/hw/pci-host/pnv_phb3_pbcq.c > +++ b/hw/pci-host/pnv_phb3_pbcq.c > @@ -8,7 +8,6 @@ > */ > #include "qemu/osdep.h" > #include "qapi/error.h" > -#include "qemu-common.h" > #include "qemu/log.h" > #include "target/ppc/cpu.h" > #include "hw/ppc/fdt.h" > diff --git a/hw/pci-host/pnv_phb4.c b/hw/pci-host/pnv_phb4.c > index 11c97e27eb16..3c4c2dace0a3 100644 > --- a/hw/pci-host/pnv_phb4.c > +++ b/hw/pci-host/pnv_phb4.c > @@ -10,7 +10,6 @@ > #include "qemu/log.h" > #include "qapi/visitor.h" > #include "qapi/error.h" > -#include "qemu-common.h" > #include "monitor/monitor.h" > #include "target/ppc/cpu.h" > #include "hw/pci-host/pnv_phb4_regs.h" > diff --git a/hw/pci-host/pnv_phb4_pec.c b/hw/pci-host/pnv_phb4_pec.c > index 6f1121a9489a..61bc0b503e3e 100644 > --- a/hw/pci-host/pnv_phb4_pec.c > +++ b/hw/pci-host/pnv_phb4_pec.c > @@ -8,7 +8,6 @@ > */ > #include "qemu/osdep.h" > #include "qapi/error.h" > -#include "qemu-common.h" > #include "qemu/log.h" > #include "target/ppc/cpu.h" > #include "hw/ppc/fdt.h" > diff --git a/hw/pci-host/raven.c b/hw/pci-host/raven.c > index 6e514f75eb8f..7a105e4a63d3 100644 > --- a/hw/pci-host/raven.c > +++ b/hw/pci-host/raven.c > @@ -24,7 +24,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/datadir.h" > #include "qemu/units.h" > #include "qemu/log.h" > diff --git a/hw/pci-host/remote.c b/hw/pci-host/remote.c > index eee45444ef73..bfb25ef6af85 100644 > --- a/hw/pci-host/remote.c > +++ b/hw/pci-host/remote.c > @@ -22,7 +22,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > > #include "hw/pci/pci.h" > #include "hw/pci/pci_host.h" > diff --git a/hw/pci/pci.c b/hw/pci/pci.c > index dae9119bfe5f..e99417e50110 100644 > --- a/hw/pci/pci.c > +++ b/hw/pci/pci.c > @@ -23,7 +23,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/datadir.h" > #include "qemu/units.h" > #include "hw/irq.h" > diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c > index c7e6767f91a8..2bc3dce1fb7d 100644 > --- a/hw/ppc/e500.c > +++ b/hw/ppc/e500.c > @@ -15,7 +15,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/datadir.h" > #include "qemu/units.h" > #include "qapi/error.h" > diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c > index 7b5a205309af..e8ef1a9e5d9b 100644 > --- a/hw/ppc/mac_newworld.c > +++ b/hw/ppc/mac_newworld.c > @@ -47,7 +47,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/datadir.h" > #include "qapi/error.h" > #include "hw/ppc/ppc.h" > diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c > index 7016979a7cd0..fe2adb057b0c 100644 > --- a/hw/ppc/mac_oldworld.c > +++ b/hw/ppc/mac_oldworld.c > @@ -25,7 +25,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/datadir.h" > #include "qemu/units.h" > #include "qapi/error.h" > diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c > index d45008ac7131..56bf203dfddf 100644 > --- a/hw/ppc/pegasos2.c > +++ b/hw/ppc/pegasos2.c > @@ -8,7 +8,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/units.h" > #include "qapi/error.h" > #include "hw/hw.h" > diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c > index 00f57c9678e6..c5e48992d988 100644 > --- a/hw/ppc/pnv.c > +++ b/hw/ppc/pnv.c > @@ -18,7 +18,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/datadir.h" > #include "qemu/units.h" > #include "qemu/cutils.h" > diff --git a/hw/ppc/pnv_bmc.c b/hw/ppc/pnv_bmc.c > index 75a22ce50b11..99f1e8d7f9f3 100644 > --- a/hw/ppc/pnv_bmc.c > +++ b/hw/ppc/pnv_bmc.c > @@ -17,7 +17,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qapi/error.h" > #include "target/ppc/cpu.h" > #include "qemu/log.h" > diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c > index 7e1a4ac9553b..32013b89836a 100644 > --- a/hw/ppc/ppc405_boards.c > +++ b/hw/ppc/ppc405_boards.c > @@ -25,7 +25,6 @@ > #include "qemu/osdep.h" > #include "qemu/units.h" > #include "qapi/error.h" > -#include "qemu-common.h" > #include "qemu/datadir.h" > #include "cpu.h" > #include "hw/ppc/ppc.h" > diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c > index 7fb620b9a056..efa90ef5ba73 100644 > --- a/hw/ppc/ppc440_bamboo.c > +++ b/hw/ppc/ppc440_bamboo.c > @@ -14,7 +14,6 @@ > #include "qemu/osdep.h" > #include "qemu/units.h" > #include "qemu/error-report.h" > -#include "qemu-common.h" > #include "qemu/datadir.h" > #include "qemu/error-report.h" > #include "net/net.h" > diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c > index 0737234d66e5..2f24598f55db 100644 > --- a/hw/ppc/sam460ex.c > +++ b/hw/ppc/sam460ex.c > @@ -13,7 +13,6 @@ > > #include "qemu/osdep.h" > #include "qemu/units.h" > -#include "qemu-common.h" > #include "qemu/datadir.h" > #include "qemu/error-report.h" > #include "qapi/error.h" > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index a4372ba1891e..cc11fcc8b24d 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -25,7 +25,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/datadir.h" > #include "qemu/memalign.h" > #include "qapi/error.h" > diff --git a/hw/ppc/spapr_numa.c b/hw/ppc/spapr_numa.c > index d7c0e212baf8..a64098c375e0 100644 > --- a/hw/ppc/spapr_numa.c > +++ b/hw/ppc/spapr_numa.c > @@ -11,7 +11,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "hw/ppc/spapr_numa.h" > #include "hw/pci-host/spapr.h" > #include "hw/ppc/fdt.h" > diff --git a/hw/ppc/spapr_pci_nvlink2.c b/hw/ppc/spapr_pci_nvlink2.c > index 4678c79235f6..63b476c8f727 100644 > --- a/hw/ppc/spapr_pci_nvlink2.c > +++ b/hw/ppc/spapr_pci_nvlink2.c > @@ -23,7 +23,6 @@ > */ > #include "qemu/osdep.h" > #include "qapi/error.h" > -#include "qemu-common.h" > #include "hw/pci/pci.h" > #include "hw/pci-host/spapr.h" > #include "hw/ppc/spapr_numa.h" > diff --git a/hw/ppc/spapr_tpm_proxy.c b/hw/ppc/spapr_tpm_proxy.c > index 2454086744b1..e10af35a1850 100644 > --- a/hw/ppc/spapr_tpm_proxy.c > +++ b/hw/ppc/spapr_tpm_proxy.c > @@ -11,7 +11,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qapi/error.h" > #include "qemu/error-report.h" > #include "sysemu/reset.h" > diff --git a/hw/ppc/spapr_vof.c b/hw/ppc/spapr_vof.c > index a33f940c32bb..09f29be0b9de 100644 > --- a/hw/ppc/spapr_vof.c > +++ b/hw/ppc/spapr_vof.c > @@ -4,7 +4,6 @@ > * SPDX-License-Identifier: GPL-2.0-or-later > */ > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qapi/error.h" > #include "hw/ppc/spapr.h" > #include "hw/ppc/spapr_vio.h" > diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c > index 9c575403b85c..b67a709ddce2 100644 > --- a/hw/ppc/virtex_ml507.c > +++ b/hw/ppc/virtex_ml507.c > @@ -23,7 +23,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/datadir.h" > #include "qemu/units.h" > #include "cpu.h" > diff --git a/hw/ppc/vof.c b/hw/ppc/vof.c > index 2b63a6287561..8d96593677da 100644 > --- a/hw/ppc/vof.c > +++ b/hw/ppc/vof.c > @@ -10,7 +10,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/timer.h" > #include "qemu/range.h" > #include "qemu/units.h" > diff --git a/hw/remote/iohub.c b/hw/remote/iohub.c > index 547d597f0feb..40dfee4bad43 100644 > --- a/hw/remote/iohub.c > +++ b/hw/remote/iohub.c > @@ -9,7 +9,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > > #include "hw/pci/pci.h" > #include "hw/pci/pci_ids.h" > diff --git a/hw/remote/machine.c b/hw/remote/machine.c > index 952105eab5a2..92d71d47bb9c 100644 > --- a/hw/remote/machine.c > +++ b/hw/remote/machine.c > @@ -14,7 +14,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > > #include "hw/remote/machine.h" > #include "exec/memory.h" > diff --git a/hw/remote/memory.c b/hw/remote/memory.c > index 6e21ab1a45c9..6d60da91e01c 100644 > --- a/hw/remote/memory.c > +++ b/hw/remote/memory.c > @@ -9,7 +9,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > > #include "hw/remote/memory.h" > #include "exec/ram_addr.h" > diff --git a/hw/remote/message.c b/hw/remote/message.c > index 11d729845c5a..50f6bf2d495f 100644 > --- a/hw/remote/message.c > +++ b/hw/remote/message.c > @@ -8,7 +8,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > > #include "hw/remote/machine.h" > #include "io/channel.h" > diff --git a/hw/remote/mpqemu-link.c b/hw/remote/mpqemu-link.c > index 7e841820e521..2a4aa651ca26 100644 > --- a/hw/remote/mpqemu-link.c > +++ b/hw/remote/mpqemu-link.c > @@ -9,7 +9,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > > #include "qemu/module.h" > #include "hw/remote/mpqemu-link.h" > diff --git a/hw/remote/proxy-memory-listener.c > b/hw/remote/proxy-memory-listener.c > index 0e893f3189e9..eb9918fe72bb 100644 > --- a/hw/remote/proxy-memory-listener.c > +++ b/hw/remote/proxy-memory-listener.c > @@ -7,7 +7,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > > #include "qemu/compiler.h" > #include "qemu/int128.h" > diff --git a/hw/remote/proxy.c b/hw/remote/proxy.c > index bad164299dd4..1c7786b52cf1 100644 > --- a/hw/remote/proxy.c > +++ b/hw/remote/proxy.c > @@ -7,7 +7,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > > #include "hw/remote/proxy.h" > #include "hw/pci/pci.h" > diff --git a/hw/remote/remote-obj.c b/hw/remote/remote-obj.c > index 4f21254219f8..333e5ac44331 100644 > --- a/hw/remote/remote-obj.c > +++ b/hw/remote/remote-obj.c > @@ -8,7 +8,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > > #include "qemu/error-report.h" > #include "qemu/notify.h" > diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c > index cae74fcbcd9a..0f179d36014a 100644 > --- a/hw/riscv/boot.c > +++ b/hw/riscv/boot.c > @@ -18,7 +18,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/datadir.h" > #include "qemu/units.h" > #include "qemu/error-report.h" > diff --git a/hw/rx/rx-gdbsim.c b/hw/rx/rx-gdbsim.c > index 75d1fec6ca46..64f897e5b10a 100644 > --- a/hw/rx/rx-gdbsim.c > +++ b/hw/rx/rx-gdbsim.c > @@ -20,7 +20,6 @@ > #include "qemu/cutils.h" > #include "qemu/error-report.h" > #include "qapi/error.h" > -#include "qemu-common.h" > #include "hw/loader.h" > #include "hw/rx/rx62n.h" > #include "sysemu/qtest.h" > diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c > index eb7fc4c4ae87..84971e537b3e 100644 > --- a/hw/s390x/ipl.c > +++ b/hw/s390x/ipl.c > @@ -13,7 +13,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/datadir.h" > #include "qapi/error.h" > #include "sysemu/reset.h" > diff --git a/hw/sd/sd.c b/hw/sd/sd.c > index cd67a7bac8e2..8e6fa0915137 100644 > --- a/hw/sd/sd.c > +++ b/hw/sd/sd.c > @@ -47,7 +47,6 @@ > #include "qemu/timer.h" > #include "qemu/log.h" > #include "qemu/module.h" > -#include "qemu-common.h" > #include "sdmmc-internal.h" > #include "trace.h" > > diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c > index a9f24968275d..1e39d2e2d0ac 100644 > --- a/hw/sparc/leon3.c > +++ b/hw/sparc/leon3.c > @@ -26,7 +26,6 @@ > #include "qemu/units.h" > #include "qemu/error-report.h" > #include "qapi/error.h" > -#include "qemu-common.h" > #include "qemu/datadir.h" > #include "cpu.h" > #include "hw/irq.h" > diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c > index 7f3a7c002780..fccaed1eb444 100644 > --- a/hw/sparc/sun4m.c > +++ b/hw/sparc/sun4m.c > @@ -26,7 +26,6 @@ > #include "qemu/units.h" > #include "qapi/error.h" > #include "qemu/datadir.h" > -#include "qemu-common.h" > #include "cpu.h" > #include "hw/sysbus.h" > #include "qemu/error-report.h" > diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c > index cda7df36e312..6fd08e2298a6 100644 > --- a/hw/sparc64/sun4u.c > +++ b/hw/sparc64/sun4u.c > @@ -26,7 +26,6 @@ > #include "qemu/units.h" > #include "qemu/error-report.h" > #include "qapi/error.h" > -#include "qemu-common.h" > #include "qemu/datadir.h" > #include "cpu.h" > #include "hw/pci/pci.h" > diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c > index e6b77a2a941d..5831395cef75 100644 > --- a/hw/usb/dev-mtp.c > +++ b/hw/usb/dev-mtp.c > @@ -10,7 +10,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qapi/error.h" > #include "qemu/error-report.h" > #include > diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c > index 664cbd958323..6de58a76a7ff 100644 > --- a/hw/virtio/virtio-iommu.c > +++ b/hw/virtio/virtio-iommu.c > @@ -20,7 +20,6 @@ > #include "qemu/osdep.h" > #include "qemu/log.h" > #include "qemu/iov.h" > -#include "qemu-common.h" > #include "hw/qdev-properties.h" > #include "hw/virtio/virtio.h" > #include "sysemu/kvm.h" > diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c > index 35cbf1f21946..5aca40872695 100644 > --- a/hw/virtio/virtio-mem.c > +++ b/hw/virtio/virtio-mem.c > @@ -11,7 +11,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/iov.h" > #include "qemu/cutils.h" > #include "qemu/error-report.h" > diff --git a/hw/virtio/virtio-pmem.c b/hw/virtio/virtio-pmem.c > index 5419dca75e2c..5dd21c2c4408 100644 > --- a/hw/virtio/virtio-pmem.c > +++ b/hw/virtio/virtio-pmem.c > @@ -13,7 +13,6 @@ > > #include "qemu/osdep.h" > #include "qapi/error.h" > -#include "qemu-common.h" > #include "qemu/error-report.h" > #include "qemu/main-loop.h" > #include "hw/virtio/virtio-pmem.h" > diff --git a/io/channel-socket.c b/io/channel-socket.c > index 7a8d9f69c92d..9f5ddf68b687 100644 > --- a/io/channel-socket.c > +++ b/io/channel-socket.c > @@ -18,7 +18,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qapi/error.h" > #include "qapi/qapi-visit-sockets.h" > #include "qemu/module.h" > diff --git a/linux-user/aarch64/cpu_loop.c b/linux-user/aarch64/cpu_loop.c > index 31a66a4fa07c..3b273f62997a 100644 > --- a/linux-user/aarch64/cpu_loop.c > +++ b/linux-user/aarch64/cpu_loop.c > @@ -18,7 +18,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu.h" > #include "user-internals.h" > #include "cpu_loop-common.h" > diff --git a/linux-user/alpha/cpu_loop.c b/linux-user/alpha/cpu_loop.c > index de6e0c901cdf..2ea039aa71f7 100644 > --- a/linux-user/alpha/cpu_loop.c > +++ b/linux-user/alpha/cpu_loop.c > @@ -18,7 +18,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu.h" > #include "user-internals.h" > #include "cpu_loop-common.h" > diff --git a/linux-user/arm/cpu_loop.c b/linux-user/arm/cpu_loop.c > index 9dcb2e024eb0..683b8e47c2bd 100644 > --- a/linux-user/arm/cpu_loop.c > +++ b/linux-user/arm/cpu_loop.c > @@ -18,7 +18,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu.h" > #include "user-internals.h" > #include "elf.h" > diff --git a/linux-user/cris/cpu_loop.c b/linux-user/cris/cpu_loop.c > index 0f46b3c1a87a..01e6ff16fc92 100644 > --- a/linux-user/cris/cpu_loop.c > +++ b/linux-user/cris/cpu_loop.c > @@ -18,7 +18,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu.h" > #include "user-internals.h" > #include "cpu_loop-common.h" > diff --git a/linux-user/hexagon/cpu_loop.c b/linux-user/hexagon/cpu_loop.c > index 0d73934d31d5..b84e25bf71eb 100644 > --- a/linux-user/hexagon/cpu_loop.c > +++ b/linux-user/hexagon/cpu_loop.c > @@ -19,7 +19,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu.h" > #include "user-internals.h" > #include "cpu_loop-common.h" > diff --git a/linux-user/i386/cpu_loop.c b/linux-user/i386/cpu_loop.c > index 90bffc1956aa..492701dd9af9 100644 > --- a/linux-user/i386/cpu_loop.c > +++ b/linux-user/i386/cpu_loop.c > @@ -18,7 +18,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu.h" > #include "qemu/timer.h" > #include "user-internals.h" > diff --git a/linux-user/m68k/cpu_loop.c b/linux-user/m68k/cpu_loop.c > index 928a18e3cf05..d1bf8548b747 100644 > --- a/linux-user/m68k/cpu_loop.c > +++ b/linux-user/m68k/cpu_loop.c > @@ -18,7 +18,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu.h" > #include "user-internals.h" > #include "cpu_loop-common.h" > diff --git a/linux-user/microblaze/cpu_loop.c > b/linux-user/microblaze/cpu_loop.c > index 1a2556be2c5f..5ccf9e942eaa 100644 > --- a/linux-user/microblaze/cpu_loop.c > +++ b/linux-user/microblaze/cpu_loop.c > @@ -18,7 +18,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu.h" > #include "user-internals.h" > #include "cpu_loop-common.h" > diff --git a/linux-user/mips/cpu_loop.c b/linux-user/mips/cpu_loop.c > index 9bb12a07ba08..d5c1c7941d34 100644 > --- a/linux-user/mips/cpu_loop.c > +++ b/linux-user/mips/cpu_loop.c > @@ -18,7 +18,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu.h" > #include "user-internals.h" > #include "cpu_loop-common.h" > diff --git a/linux-user/openrisc/cpu_loop.c > b/linux-user/openrisc/cpu_loop.c > index 7683bea0649e..a7aa586c8f96 100644 > --- a/linux-user/openrisc/cpu_loop.c > +++ b/linux-user/openrisc/cpu_loop.c > @@ -18,7 +18,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu.h" > #include "user-internals.h" > #include "cpu_loop-common.h" > diff --git a/linux-user/ppc/cpu_loop.c b/linux-user/ppc/cpu_loop.c > index b468f199e4d2..02204ad8bebb 100644 > --- a/linux-user/ppc/cpu_loop.c > +++ b/linux-user/ppc/cpu_loop.c > @@ -18,7 +18,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu.h" > #include "qemu/timer.h" > #include "user-internals.h" > diff --git a/linux-user/riscv/cpu_loop.c b/linux-user/riscv/cpu_loop.c > index 26d446f32379..29084c142196 100644 > --- a/linux-user/riscv/cpu_loop.c > +++ b/linux-user/riscv/cpu_loop.c > @@ -18,7 +18,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/error-report.h" > #include "qemu.h" > #include "user-internals.h" > diff --git a/linux-user/s390x/cpu_loop.c b/linux-user/s390x/cpu_loop.c > index 7901dfe6f518..285bc60071a8 100644 > --- a/linux-user/s390x/cpu_loop.c > +++ b/linux-user/s390x/cpu_loop.c > @@ -18,7 +18,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu.h" > #include "user-internals.h" > #include "cpu_loop-common.h" > diff --git a/linux-user/sh4/cpu_loop.c b/linux-user/sh4/cpu_loop.c > index 1bd313cb19a2..c805f9db1104 100644 > --- a/linux-user/sh4/cpu_loop.c > +++ b/linux-user/sh4/cpu_loop.c > @@ -18,7 +18,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu.h" > #include "user-internals.h" > #include "cpu_loop-common.h" > diff --git a/linux-user/sparc/cpu_loop.c b/linux-user/sparc/cpu_loop.c > index baf3d9ae011f..434c90a55f8f 100644 > --- a/linux-user/sparc/cpu_loop.c > +++ b/linux-user/sparc/cpu_loop.c > @@ -18,7 +18,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu.h" > #include "user-internals.h" > #include "cpu_loop-common.h" > diff --git a/linux-user/uname.c b/linux-user/uname.c > index 0856783b2190..415fdf31b62d 100644 > --- a/linux-user/uname.c > +++ b/linux-user/uname.c > @@ -21,7 +21,6 @@ > > #include "qemu.h" > #include "user-internals.h" > -//#include "qemu-common.h" > #include "uname.h" > > /* return highest utsname machine name for emulated instruction set > diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c > index 883cf1ca4bbf..5e7302cbb995 100644 > --- a/monitor/qmp-cmds.c > +++ b/monitor/qmp-cmds.c > @@ -14,7 +14,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/cutils.h" > #include "qemu/option.h" > #include "monitor/monitor.h" > diff --git a/net/colo-compare.c b/net/colo-compare.c > index 62554b5b3c8f..d5d096580577 100644 > --- a/net/colo-compare.c > +++ b/net/colo-compare.c > @@ -13,7 +13,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/error-report.h" > #include "trace.h" > #include "qapi/error.h" > diff --git a/net/net.c b/net/net.c > index 9f17ab204422..a094cf1d2929 100644 > --- a/net/net.c > +++ b/net/net.c > @@ -23,7 +23,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > > #include "net/net.h" > #include "clients.h" > diff --git a/net/socket.c b/net/socket.c > index c4b80e9228d7..ea5220a2eb51 100644 > --- a/net/socket.c > +++ b/net/socket.c > @@ -27,7 +27,6 @@ > #include "clients.h" > #include "monitor/monitor.h" > #include "qapi/error.h" > -#include "qemu-common.h" > #include "qemu/error-report.h" > #include "qemu/option.h" > #include "qemu/sockets.h" > diff --git a/net/tap-bsd.c b/net/tap-bsd.c > index e45a6d124eb6..7e65bd391f0b 100644 > --- a/net/tap-bsd.c > +++ b/net/tap-bsd.c > @@ -23,7 +23,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qapi/error.h" > #include "tap_int.h" > #include "qemu/cutils.h" > diff --git a/net/tap-linux.c b/net/tap-linux.c > index 5e70b9303710..3e24d232e782 100644 > --- a/net/tap-linux.c > +++ b/net/tap-linux.c > @@ -24,7 +24,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "tap_int.h" > #include "tap-linux.h" > #include "net/tap.h" > diff --git a/net/tap-solaris.c b/net/tap-solaris.c > index d85224242b30..79919785c9f6 100644 > --- a/net/tap-solaris.c > +++ b/net/tap-solaris.c > @@ -27,7 +27,6 @@ > #include "tap_int.h" > #include "qemu/ctype.h" > #include "qemu/cutils.h" > -#include "qemu-common.h" > > #include > #include > diff --git a/net/tap-win32.c b/net/tap-win32.c > index 6096972f5d47..7466f22e77a4 100644 > --- a/net/tap-win32.c > +++ b/net/tap-win32.c > @@ -29,7 +29,6 @@ > #include "qemu/osdep.h" > #include "tap_int.h" > > -#include "qemu-common.h" > #include "clients.h" /* net_init_tap */ > #include "net/eth.h" > #include "net/net.h" > diff --git a/net/tap.c b/net/tap.c > index c5cbeaa7a2be..6190fa699d2f 100644 > --- a/net/tap.c > +++ b/net/tap.c > @@ -38,7 +38,6 @@ > #include "monitor/monitor.h" > #include "sysemu/sysemu.h" > #include "qapi/error.h" > -#include "qemu-common.h" > #include "qemu/cutils.h" > #include "qemu/error-report.h" > #include "qemu/main-loop.h" > diff --git a/net/vde.c b/net/vde.c > index 99189cccb694..1083916bcf52 100644 > --- a/net/vde.c > +++ b/net/vde.c > @@ -27,7 +27,6 @@ > > #include "net/net.h" > #include "clients.h" > -#include "qemu-common.h" > #include "qemu/option.h" > #include "qemu/main-loop.h" > #include "qapi/error.h" > diff --git a/os-posix.c b/os-posix.c > index 24692c8593f3..ee765f047dea 100644 > --- a/os-posix.c > +++ b/os-posix.c > @@ -29,7 +29,6 @@ > #include > #include > > -#include "qemu-common.h" > /* Needed early for CONFIG_BSD etc. */ > #include "net/slirp.h" > #include "qemu/qemu-options.h" > diff --git a/os-win32.c b/os-win32.c > index 6f21b578417c..725ad652e8bb 100644 > --- a/os-win32.c > +++ b/os-win32.c > @@ -26,7 +26,6 @@ > #include "qemu/osdep.h" > #include > #include > -#include "qemu-common.h" > #include "sysemu/runstate.h" > > static BOOL WINAPI qemu_ctrl_handler(DWORD type) > diff --git a/page-vary-common.c b/page-vary-common.c > index 91755564985c..ab77672dd412 100644 > --- a/page-vary-common.c > +++ b/page-vary-common.c > @@ -20,7 +20,6 @@ > #define IN_PAGE_VARY 1 > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "exec/page-vary.h" > > /* WARNING: This file must *not* be complied with -flto. */ > diff --git a/qga/commands-posix.c b/qga/commands-posix.c > index 4d7a2392c097..9924277c826e 100644 > --- a/qga/commands-posix.c > +++ b/qga/commands-posix.c > @@ -16,7 +16,6 @@ > #include > #include > #include > -#include "qemu-common.h" > #include "guest-agent-core.h" > #include "qga-qapi-commands.h" > #include "qapi/error.h" > diff --git a/softmmu/cpu-throttle.c b/softmmu/cpu-throttle.c > index 8c2144ab95cc..d9bb30a223d8 100644 > --- a/softmmu/cpu-throttle.c > +++ b/softmmu/cpu-throttle.c > @@ -23,7 +23,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/thread.h" > #include "hw/core/cpu.h" > #include "qemu/main-loop.h" > diff --git a/softmmu/cpu-timers.c b/softmmu/cpu-timers.c > index 204d946a1729..117408cb83af 100644 > --- a/softmmu/cpu-timers.c > +++ b/softmmu/cpu-timers.c > @@ -23,7 +23,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/cutils.h" > #include "migration/vmstate.h" > #include "qapi/error.h" > diff --git a/softmmu/cpus.c b/softmmu/cpus.c > index 7b75bb66d5e6..668bef9b4d62 100644 > --- a/softmmu/cpus.c > +++ b/softmmu/cpus.c > @@ -23,7 +23,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "monitor/monitor.h" > #include "qemu/coroutine-tls.h" > #include "qapi/error.h" > diff --git a/softmmu/datadir.c b/softmmu/datadir.c > index 504c4665bed7..160cac999a6f 100644 > --- a/softmmu/datadir.c > +++ b/softmmu/datadir.c > @@ -23,7 +23,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/datadir.h" > #include "qemu/cutils.h" > #include "trace.h" > diff --git a/softmmu/icount.c b/softmmu/icount.c > index 21341a4ce49e..5ca271620db6 100644 > --- a/softmmu/icount.c > +++ b/softmmu/icount.c > @@ -23,7 +23,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/cutils.h" > #include "migration/vmstate.h" > #include "qapi/error.h" > diff --git a/softmmu/runstate.c b/softmmu/runstate.c > index e0d869b21aa4..fac7b63259e8 100644 > --- a/softmmu/runstate.c > +++ b/softmmu/runstate.c > @@ -40,7 +40,6 @@ > #include "qapi/error.h" > #include "qapi/qapi-commands-run-state.h" > #include "qapi/qapi-events-run-state.h" > -#include "qemu-common.h" > #include "qemu/error-report.h" > #include "qemu/log.h" > #include "qemu/job.h" > diff --git a/stubs/monitor-core.c b/stubs/monitor-core.c > index d058a2a00d85..afa477aae656 100644 > --- a/stubs/monitor-core.c > +++ b/stubs/monitor-core.c > @@ -1,6 +1,5 @@ > #include "qemu/osdep.h" > #include "monitor/monitor.h" > -#include "qemu-common.h" > #include "qapi/qapi-emit-events.h" > > Monitor *monitor_cur(void) > diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c > index 8c34f86792ed..567e296b21c9 100644 > --- a/target/arm/hvf/hvf.c > +++ b/target/arm/hvf/hvf.c > @@ -10,7 +10,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/error-report.h" > > #include "sysemu/runstate.h" > diff --git a/target/arm/kvm.c b/target/arm/kvm.c > index bbf1ce7ba3bc..5fc37ac10a5b 100644 > --- a/target/arm/kvm.c > +++ b/target/arm/kvm.c > @@ -13,7 +13,6 @@ > > #include > > -#include "qemu-common.h" > #include "qemu/timer.h" > #include "qemu/error-report.h" > #include "qemu/main-loop.h" > diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c > index 9ec8875150d6..17dd2f77d9f5 100644 > --- a/target/arm/kvm64.c > +++ b/target/arm/kvm64.c > @@ -16,7 +16,6 @@ > #include > #include > > -#include "qemu-common.h" > #include "qapi/error.h" > #include "cpu.h" > #include "qemu/timer.h" > diff --git a/target/hexagon/gdbstub.c b/target/hexagon/gdbstub.c > index 9c8c04c961b1..d152d01bfe7e 100644 > --- a/target/hexagon/gdbstub.c > +++ b/target/hexagon/gdbstub.c > @@ -16,7 +16,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "exec/gdbstub.h" > #include "cpu.h" > #include "internal.h" > diff --git a/target/i386/hax/hax-all.c b/target/i386/hax/hax-all.c > index 81f665e21245..b185ee8de4fd 100644 > --- a/target/i386/hax/hax-all.c > +++ b/target/i386/hax/hax-all.c > @@ -27,7 +27,6 @@ > #include "cpu.h" > #include "exec/address-spaces.h" > > -#include "qemu-common.h" > #include "qemu/accel.h" > #include "sysemu/reset.h" > #include "sysemu/runstate.h" > diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c > index fc12c02fb217..f8833277ab6a 100644 > --- a/target/i386/hvf/hvf.c > +++ b/target/i386/hvf/hvf.c > @@ -47,7 +47,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/error-report.h" > #include "qemu/memalign.h" > > diff --git a/target/i386/hvf/x86.c b/target/i386/hvf/x86.c > index 91a3fe002c73..d086584f26d9 100644 > --- a/target/i386/hvf/x86.c > +++ b/target/i386/hvf/x86.c > @@ -19,7 +19,6 @@ > #include "qemu/osdep.h" > > #include "cpu.h" > -#include "qemu-common.h" > #include "x86_decode.h" > #include "x86_emu.h" > #include "vmcs.h" > diff --git a/target/i386/hvf/x86_cpuid.c b/target/i386/hvf/x86_cpuid.c > index 32b0d131df86..f24dd50e48ff 100644 > --- a/target/i386/hvf/x86_cpuid.c > +++ b/target/i386/hvf/x86_cpuid.c > @@ -21,7 +21,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "cpu.h" > #include "x86.h" > #include "vmx.h" > diff --git a/target/i386/hvf/x86_decode.c b/target/i386/hvf/x86_decode.c > index 062713b1a450..3728d7705e21 100644 > --- a/target/i386/hvf/x86_decode.c > +++ b/target/i386/hvf/x86_decode.c > @@ -18,7 +18,6 @@ > > #include "qemu/osdep.h" > > -#include "qemu-common.h" > #include "panic.h" > #include "x86_decode.h" > #include "vmx.h" > diff --git a/target/i386/hvf/x86_descr.c b/target/i386/hvf/x86_descr.c > index af15c06ac5db..a484942cfcd4 100644 > --- a/target/i386/hvf/x86_descr.c > +++ b/target/i386/hvf/x86_descr.c > @@ -18,7 +18,6 @@ > > #include "qemu/osdep.h" > > -#include "qemu-common.h" > #include "vmx.h" > #include "x86_descr.h" > > diff --git a/target/i386/hvf/x86_emu.c b/target/i386/hvf/x86_emu.c > index 050428795bbc..f5704f63e8da 100644 > --- a/target/i386/hvf/x86_emu.c > +++ b/target/i386/hvf/x86_emu.c > @@ -37,7 +37,6 @@ > > #include "qemu/osdep.h" > #include "panic.h" > -#include "qemu-common.h" > #include "x86_decode.h" > #include "x86.h" > #include "x86_emu.h" > diff --git a/target/i386/hvf/x86_flags.c b/target/i386/hvf/x86_flags.c > index fecbca751770..03d6de5efc3e 100644 > --- a/target/i386/hvf/x86_flags.c > +++ b/target/i386/hvf/x86_flags.c > @@ -23,7 +23,6 @@ > > #include "qemu/osdep.h" > > -#include "qemu-common.h" > #include "panic.h" > #include "cpu.h" > #include "x86_flags.h" > diff --git a/target/i386/hvf/x86_mmu.c b/target/i386/hvf/x86_mmu.c > index df0b91cd4208..96d117567ee8 100644 > --- a/target/i386/hvf/x86_mmu.c > +++ b/target/i386/hvf/x86_mmu.c > @@ -18,7 +18,6 @@ > > #include "qemu/osdep.h" > #include "panic.h" > -#include "qemu-common.h" > #include "cpu.h" > #include "x86.h" > #include "x86_mmu.h" > diff --git a/target/i386/hvf/x86_task.c b/target/i386/hvf/x86_task.c > index d24daf6a4110..beaeec068731 100644 > --- a/target/i386/hvf/x86_task.c > +++ b/target/i386/hvf/x86_task.c > @@ -8,7 +8,6 @@ > // GNU General Public License for more details. > #include "qemu/osdep.h" > #include "panic.h" > -#include "qemu-common.h" > #include "qemu/error-report.h" > > #include "sysemu/hvf.h" > diff --git a/target/i386/hvf/x86hvf.c b/target/i386/hvf/x86hvf.c > index bec9fc581463..69d4fb8cf555 100644 > --- a/target/i386/hvf/x86hvf.c > +++ b/target/i386/hvf/x86hvf.c > @@ -19,7 +19,6 @@ > > #include "qemu/osdep.h" > > -#include "qemu-common.h" > #include "x86hvf.h" > #include "vmx.h" > #include "vmcs.h" > diff --git a/target/i386/kvm/sev-stub.c b/target/i386/kvm/sev-stub.c > index 6080c007a2e4..1be5341e8a6a 100644 > --- a/target/i386/kvm/sev-stub.c > +++ b/target/i386/kvm/sev-stub.c > @@ -12,7 +12,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "sev.h" > > int sev_kvm_init(ConfidentialGuestSupport *cgs, Error **errp) > diff --git a/target/i386/nvmm/nvmm-all.c b/target/i386/nvmm/nvmm-all.c > index 9f940413318c..b75738ee9cdf 100644 > --- a/target/i386/nvmm/nvmm-all.c > +++ b/target/i386/nvmm/nvmm-all.c > @@ -11,7 +11,6 @@ > #include "cpu.h" > #include "exec/address-spaces.h" > #include "exec/ioport.h" > -#include "qemu-common.h" > #include "qemu/accel.h" > #include "sysemu/nvmm.h" > #include "sysemu/cpus.h" > diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c > index 68a4ebe909ad..5560a22ea5c2 100644 > --- a/target/i386/whpx/whpx-all.c > +++ b/target/i386/whpx/whpx-all.c > @@ -12,7 +12,6 @@ > #include "cpu.h" > #include "exec/address-spaces.h" > #include "exec/ioport.h" > -#include "qemu-common.h" > #include "qemu/accel.h" > #include "sysemu/whpx.h" > #include "sysemu/cpus.h" > diff --git a/target/i386/whpx/whpx-apic.c b/target/i386/whpx/whpx-apic.c > index bba36f3ec98f..c15df35ad60a 100644 > --- a/target/i386/whpx/whpx-apic.c > +++ b/target/i386/whpx/whpx-apic.c > @@ -11,7 +11,6 @@ > * See the COPYING file in the top-level directory. > */ > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "cpu.h" > #include "hw/i386/apic_internal.h" > #include "hw/i386/apic-msidef.h" > diff --git a/target/mips/kvm.c b/target/mips/kvm.c > index 086debd9f013..caf70decd2a5 100644 > --- a/target/mips/kvm.c > +++ b/target/mips/kvm.c > @@ -14,7 +14,6 @@ > > #include > > -#include "qemu-common.h" > #include "cpu.h" > #include "internal.h" > #include "qemu/error-report.h" > diff --git a/target/nios2/nios2-semi.c b/target/nios2/nios2-semi.c > index 5a7ad0c7108d..eda21c04434b 100644 > --- a/target/nios2/nios2-semi.c > +++ b/target/nios2/nios2-semi.c > @@ -28,7 +28,6 @@ > #if defined(CONFIG_USER_ONLY) > #include "qemu.h" > #else > -#include "qemu-common.h" > #include "exec/softmmu-semi.h" > #endif > #include "qemu/log.h" > diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c > index 8644b85de847..f905a2af17a7 100644 > --- a/target/ppc/kvm.c > +++ b/target/ppc/kvm.c > @@ -21,7 +21,6 @@ > > #include > > -#include "qemu-common.h" > #include "qapi/error.h" > #include "qemu/error-report.h" > #include "cpu.h" > diff --git a/target/riscv/kvm.c b/target/riscv/kvm.c > index e6b7cb6d4d5f..70b4cff06fbb 100644 > --- a/target/riscv/kvm.c > +++ b/target/riscv/kvm.c > @@ -21,7 +21,6 @@ > > #include > > -#include "qemu-common.h" > #include "qemu/timer.h" > #include "qemu/error-report.h" > #include "qemu/main-loop.h" > diff --git a/target/rx/cpu.c b/target/rx/cpu.c > index 25a4aa2976d3..fb30080ac4ea 100644 > --- a/target/rx/cpu.c > +++ b/target/rx/cpu.c > @@ -20,7 +20,6 @@ > #include "qemu/qemu-print.h" > #include "qapi/error.h" > #include "cpu.h" > -#include "qemu-common.h" > #include "migration/vmstate.h" > #include "exec/exec-all.h" > #include "hw/loader.h" > diff --git a/target/rx/gdbstub.c b/target/rx/gdbstub.c > index c811d4810b45..7eb2059a841b 100644 > --- a/target/rx/gdbstub.c > +++ b/target/rx/gdbstub.c > @@ -16,7 +16,6 @@ > * this program. If not, see . > */ > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "cpu.h" > #include "exec/gdbstub.h" > > diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c > index 6acf14d5ecb4..53098bf54104 100644 > --- a/target/s390x/kvm/kvm.c > +++ b/target/s390x/kvm/kvm.c > @@ -24,7 +24,6 @@ > #include > #include > > -#include "qemu-common.h" > #include "cpu.h" > #include "s390x-internal.h" > #include "kvm_s390x.h" > diff --git a/target/s390x/tcg/vec_fpu_helper.c > b/target/s390x/tcg/vec_fpu_helper.c > index 1a779934715f..aa2cc8e4a6b5 100644 > --- a/target/s390x/tcg/vec_fpu_helper.c > +++ b/target/s390x/tcg/vec_fpu_helper.c > @@ -10,7 +10,6 @@ > * See the COPYING file in the top-level directory. > */ > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "cpu.h" > #include "s390x-internal.h" > #include "vec.h" > diff --git a/target/s390x/tcg/vec_int_helper.c > b/target/s390x/tcg/vec_int_helper.c > index 5561b3ed9096..b44859ee1630 100644 > --- a/target/s390x/tcg/vec_int_helper.c > +++ b/target/s390x/tcg/vec_int_helper.c > @@ -10,7 +10,6 @@ > * See the COPYING file in the top-level directory. > */ > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "cpu.h" > #include "vec.h" > #include "exec/helper-proto.h" > diff --git a/target/s390x/tcg/vec_string_helper.c > b/target/s390x/tcg/vec_string_helper.c > index ac315eb095c1..f8b54bba4a9d 100644 > --- a/target/s390x/tcg/vec_string_helper.c > +++ b/target/s390x/tcg/vec_string_helper.c > @@ -10,7 +10,6 @@ > * See the COPYING file in the top-level directory. > */ > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "cpu.h" > #include "s390x-internal.h" > #include "vec.h" > diff --git a/target/tricore/gdbstub.c b/target/tricore/gdbstub.c > index 3ce55abb8e3b..ebf32defde3a 100644 > --- a/target/tricore/gdbstub.c > +++ b/target/tricore/gdbstub.c > @@ -18,7 +18,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "exec/gdbstub.h" > > > diff --git a/target/xtensa/core-de233_fpu.c > b/target/xtensa/core-de233_fpu.c > index c7cbeb1b4834..41af8057fbb9 100644 > --- a/target/xtensa/core-de233_fpu.c > +++ b/target/xtensa/core-de233_fpu.c > @@ -28,7 +28,6 @@ > #include "qemu/osdep.h" > #include "cpu.h" > #include "exec/gdbstub.h" > -#include "qemu-common.h" > #include "qemu/host-utils.h" > > #include "core-de233_fpu/core-isa.h" > diff --git a/target/xtensa/core-dsp3400.c b/target/xtensa/core-dsp3400.c > index 4e0bc8a8c46c..81e425c56828 100644 > --- a/target/xtensa/core-dsp3400.c > +++ b/target/xtensa/core-dsp3400.c > @@ -28,7 +28,6 @@ > #include "qemu/osdep.h" > #include "cpu.h" > #include "exec/gdbstub.h" > -#include "qemu-common.h" > #include "qemu/host-utils.h" > > #include "core-dsp3400/core-isa.h" > diff --git a/target/xtensa/core-test_mmuhifi_c3.c > b/target/xtensa/core-test_mmuhifi_c3.c > index 123c630b0da7..c0e5d32d1e47 100644 > --- a/target/xtensa/core-test_mmuhifi_c3.c > +++ b/target/xtensa/core-test_mmuhifi_c3.c > @@ -28,7 +28,6 @@ > #include "qemu/osdep.h" > #include "cpu.h" > #include "exec/gdbstub.h" > -#include "qemu-common.h" > #include "qemu/host-utils.h" > > #include "core-test_mmuhifi_c3/core-isa.h" > diff --git a/tcg/tci.c b/tcg/tci.c > index fe92b5d0844b..bdfac83492dd 100644 > --- a/tcg/tci.c > +++ b/tcg/tci.c > @@ -18,7 +18,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "tcg/tcg.h" /* MAX_OPC_PARAM_IARGS */ > #include "exec/cpu_ldst.h" > #include "tcg/tcg-op.h" > diff --git a/tests/qtest/acpi-utils.c b/tests/qtest/acpi-utils.c > index 766c48e3a6a4..673fc975862c 100644 > --- a/tests/qtest/acpi-utils.c > +++ b/tests/qtest/acpi-utils.c > @@ -14,7 +14,6 @@ > > #include "qemu/osdep.h" > #include > -#include "qemu-common.h" > #include "qemu/bitmap.h" > #include "acpi-utils.h" > #include "boot-sector.h" > diff --git a/tests/qtest/ahci-test.c b/tests/qtest/ahci-test.c > index 8073ccc20521..aff5f3f79776 100644 > --- a/tests/qtest/ahci-test.c > +++ b/tests/qtest/ahci-test.c > @@ -30,7 +30,6 @@ > #include "libqos/ahci.h" > #include "libqos/pci-pc.h" > > -#include "qemu-common.h" > #include "qapi/qmp/qdict.h" > #include "qemu/host-utils.h" > > diff --git a/tests/qtest/aspeed_hace-test.c > b/tests/qtest/aspeed_hace-test.c > index 09ee31545e41..58aa22014d04 100644 > --- a/tests/qtest/aspeed_hace-test.c > +++ b/tests/qtest/aspeed_hace-test.c > @@ -8,7 +8,6 @@ > #include "qemu/osdep.h" > > #include "libqos/libqtest.h" > -#include "qemu-common.h" > #include "qemu/bitops.h" > > #define HACE_CMD 0x10 > diff --git a/tests/qtest/bios-tables-test.c > b/tests/qtest/bios-tables-test.c > index c4a2d1e1664b..5dddedabcdde 100644 > --- a/tests/qtest/bios-tables-test.c > +++ b/tests/qtest/bios-tables-test.c > @@ -57,7 +57,6 @@ > > #include "qemu/osdep.h" > #include > -#include "qemu-common.h" > #include "hw/firmware/smbios.h" > #include "qemu/bitmap.h" > #include "acpi-utils.h" > diff --git a/tests/qtest/boot-sector.c b/tests/qtest/boot-sector.c > index ea8f264661c3..9d9825bc8145 100644 > --- a/tests/qtest/boot-sector.c > +++ b/tests/qtest/boot-sector.c > @@ -12,7 +12,6 @@ > */ > #include "qemu/osdep.h" > #include "boot-sector.h" > -#include "qemu-common.h" > #include "libqos/libqtest.h" > > #define LOW(x) ((x) & 0xff) > diff --git a/tests/qtest/cpu-plug-test.c b/tests/qtest/cpu-plug-test.c > index a1c689414be5..7f5dd5f85a78 100644 > --- a/tests/qtest/cpu-plug-test.c > +++ b/tests/qtest/cpu-plug-test.c > @@ -9,7 +9,6 @@ > > #include "qemu/osdep.h" > > -#include "qemu-common.h" > #include "libqtest-single.h" > #include "qapi/qmp/qdict.h" > #include "qapi/qmp/qlist.h" > diff --git a/tests/qtest/dbus-display-test.c > b/tests/qtest/dbus-display-test.c > index 43c77aff045c..81043162dfdd 100644 > --- a/tests/qtest/dbus-display-test.c > +++ b/tests/qtest/dbus-display-test.c > @@ -3,7 +3,6 @@ > #include > #include > #include "libqos/libqtest.h" > -#include "qemu-common.h" > #include "dbus-display1.h" > > static GDBusConnection* > diff --git a/tests/qtest/dbus-vmstate-test.c > b/tests/qtest/dbus-vmstate-test.c > index aca9b98b7a35..a8acab763f5d 100644 > --- a/tests/qtest/dbus-vmstate-test.c > +++ b/tests/qtest/dbus-vmstate-test.c > @@ -2,7 +2,6 @@ > #include > #include > #include "libqos/libqtest.h" > -#include "qemu-common.h" > #include "dbus-vmstate1.h" > #include "migration-helpers.h" > > diff --git a/tests/qtest/device-introspect-test.c > b/tests/qtest/device-introspect-test.c > index bbec166dbc2f..adf39b2518e8 100644 > --- a/tests/qtest/device-introspect-test.c > +++ b/tests/qtest/device-introspect-test.c > @@ -18,7 +18,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qapi/qmp/qstring.h" > #include "qapi/qmp/qdict.h" > #include "qapi/qmp/qlist.h" > diff --git a/tests/qtest/e1000e-test.c b/tests/qtest/e1000e-test.c > index e648fdd409cd..ddd6983ede14 100644 > --- a/tests/qtest/e1000e-test.c > +++ b/tests/qtest/e1000e-test.c > @@ -25,9 +25,7 @@ > > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "libqtest-single.h" > -#include "qemu-common.h" > #include "libqos/pci-pc.h" > #include "qemu/sockets.h" > #include "qemu/iov.h" > diff --git a/tests/qtest/erst-test.c b/tests/qtest/erst-test.c > index f94cd8dd8e05..a0adc35bef7f 100644 > --- a/tests/qtest/erst-test.c > +++ b/tests/qtest/erst-test.c > @@ -11,7 +11,6 @@ > #include > #include "libqos/libqos-pc.h" > #include "libqos/libqtest.h" > -#include "qemu-common.h" > > #include "hw/pci/pci.h" > > diff --git a/tests/qtest/fdc-test.c b/tests/qtest/fdc-test.c > index b0d40012e6a9..4aa72f36431f 100644 > --- a/tests/qtest/fdc-test.c > +++ b/tests/qtest/fdc-test.c > @@ -27,7 +27,6 @@ > > #include "libqtest-single.h" > #include "qapi/qmp/qdict.h" > -#include "qemu-common.h" > > /* TODO actually test the results and get rid of this */ > #define qmp_discard_response(...) qobject_unref(qmp(__VA_ARGS__)) > diff --git a/tests/qtest/fuzz/qos_fuzz.c b/tests/qtest/fuzz/qos_fuzz.c > index 7a244c951e5e..dc891d838b6a 100644 > --- a/tests/qtest/fuzz/qos_fuzz.c > +++ b/tests/qtest/fuzz/qos_fuzz.c > @@ -19,7 +19,6 @@ > #include "qemu/osdep.h" > #include "qemu/units.h" > #include "qapi/error.h" > -#include "qemu-common.h" > #include "exec/memory.h" > #include "qemu/main-loop.h" > > diff --git a/tests/qtest/hd-geo-test.c b/tests/qtest/hd-geo-test.c > index 64023c057408..da9c4c2792de 100644 > --- a/tests/qtest/hd-geo-test.c > +++ b/tests/qtest/hd-geo-test.c > @@ -16,7 +16,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qemu/bswap.h" > #include "qapi/qmp/qlist.h" > #include "libqos/libqtest.h" > diff --git a/tests/qtest/ide-test.c b/tests/qtest/ide-test.c > index 19de3b410405..b7243a17b11d 100644 > --- a/tests/qtest/ide-test.c > +++ b/tests/qtest/ide-test.c > @@ -30,7 +30,6 @@ > #include "libqos/pci-pc.h" > #include "libqos/malloc-pc.h" > #include "qapi/qmp/qdict.h" > -#include "qemu-common.h" > #include "qemu/bswap.h" > #include "hw/pci/pci_ids.h" > #include "hw/pci/pci_regs.h" > diff --git a/tests/qtest/ipmi-bt-test.c b/tests/qtest/ipmi-bt-test.c > index 19612e9405ae..ed431e34e68d 100644 > --- a/tests/qtest/ipmi-bt-test.c > +++ b/tests/qtest/ipmi-bt-test.c > @@ -31,7 +31,6 @@ > > > #include "libqtest-single.h" > -#include "qemu-common.h" > > #define IPMI_IRQ 5 > > diff --git a/tests/qtest/ivshmem-test.c b/tests/qtest/ivshmem-test.c > index 4e8af42a9d04..95628a418579 100644 > --- a/tests/qtest/ivshmem-test.c > +++ b/tests/qtest/ivshmem-test.c > @@ -14,7 +14,6 @@ > #include "libqos/libqos-pc.h" > #include "libqos/libqos-spapr.h" > #include "libqos/libqtest.h" > -#include "qemu-common.h" > > #define TMPSHMSIZE (1 << 20) > static char *tmpshm; > diff --git a/tests/qtest/libqos/ahci.c b/tests/qtest/libqos/ahci.c > index eaa2096512e5..41c4be5efa93 100644 > --- a/tests/qtest/libqos/ahci.c > +++ b/tests/qtest/libqos/ahci.c > @@ -28,7 +28,6 @@ > #include "ahci.h" > #include "pci-pc.h" > > -#include "qemu-common.h" > #include "qemu/host-utils.h" > > #include "hw/pci/pci_ids.h" > diff --git a/tests/qtest/libqos/malloc-pc.c > b/tests/qtest/libqos/malloc-pc.c > index f1e3b392a53c..bbd1b4827e54 100644 > --- a/tests/qtest/libqos/malloc-pc.c > +++ b/tests/qtest/libqos/malloc-pc.c > @@ -16,8 +16,6 @@ > > #include "standard-headers/linux/qemu_fw_cfg.h" > > -#include "qemu-common.h" > - > #define ALLOC_PAGE_SIZE (4096) > > void pc_alloc_init(QGuestAllocator *s, QTestState *qts, QAllocOpts flags) > diff --git a/tests/qtest/libqos/malloc-spapr.c > b/tests/qtest/libqos/malloc-spapr.c > index 05b306c191d3..d90ed3c51d7d 100644 > --- a/tests/qtest/libqos/malloc-spapr.c > +++ b/tests/qtest/libqos/malloc-spapr.c > @@ -8,8 +8,6 @@ > #include "qemu/osdep.h" > #include "malloc-spapr.h" > > -#include "qemu-common.h" > - > #define SPAPR_PAGE_SIZE 4096 > > /* Memory must be a multiple of 256 MB, > diff --git a/tests/qtest/libqos/malloc.c b/tests/qtest/libqos/malloc.c > index f708b0143262..f0c8f950c805 100644 > --- a/tests/qtest/libqos/malloc.c > +++ b/tests/qtest/libqos/malloc.c > @@ -12,7 +12,6 @@ > > #include "qemu/osdep.h" > #include "malloc.h" > -#include "qemu-common.h" > #include "qemu/host-utils.h" > > typedef struct MemBlock { > diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c > index dc5566ccfd60..7b5890dcc487 100644 > --- a/tests/qtest/libqtest.c > +++ b/tests/qtest/libqtest.c > @@ -21,7 +21,6 @@ > #include > > #include "libqos/libqtest.h" > -#include "qemu-common.h" > #include "qemu/ctype.h" > #include "qemu/cutils.h" > #include "qapi/error.h" > diff --git a/tests/qtest/machine-none-test.c > b/tests/qtest/machine-none-test.c > index 138101b46ac2..8ca18074b9f9 100644 > --- a/tests/qtest/machine-none-test.c > +++ b/tests/qtest/machine-none-test.c > @@ -12,7 +12,6 @@ > > #include "qemu/osdep.h" > > -#include "qemu-common.h" > #include "qemu/cutils.h" > #include "libqos/libqtest.h" > #include "qapi/qmp/qdict.h" > diff --git a/tests/qtest/npcm7xx_emc-test.c > b/tests/qtest/npcm7xx_emc-test.c > index 7c435ac91576..a353fef0ca13 100644 > --- a/tests/qtest/npcm7xx_emc-test.c > +++ b/tests/qtest/npcm7xx_emc-test.c > @@ -15,7 +15,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "libqos/libqos.h" > #include "qapi/qmp/qdict.h" > #include "qapi/qmp/qnum.h" > diff --git a/tests/qtest/pxe-test.c b/tests/qtest/pxe-test.c > index 32bbae33c597..3cb47d2c5496 100644 > --- a/tests/qtest/pxe-test.c > +++ b/tests/qtest/pxe-test.c > @@ -14,7 +14,6 @@ > > #include "qemu/osdep.h" > #include > -#include "qemu-common.h" > #include "libqos/libqtest.h" > #include "boot-sector.h" > #include "libqos/libqos-spapr.h" > diff --git a/tests/qtest/qom-test.c b/tests/qtest/qom-test.c > index eb34af843b79..6b162e12b5aa 100644 > --- a/tests/qtest/qom-test.c > +++ b/tests/qtest/qom-test.c > @@ -9,7 +9,6 @@ > > #include "qemu/osdep.h" > > -#include "qemu-common.h" > #include "qapi/qmp/qdict.h" > #include "qapi/qmp/qlist.h" > #include "qemu/cutils.h" > diff --git a/tests/qtest/rtl8139-test.c b/tests/qtest/rtl8139-test.c > index 450604926492..8fa3313cc333 100644 > --- a/tests/qtest/rtl8139-test.c > +++ b/tests/qtest/rtl8139-test.c > @@ -11,7 +11,6 @@ > #include "libqtest-single.h" > #include "libqos/pci-pc.h" > #include "qemu/timer.h" > -#include "qemu-common.h" > > /* Tests only initialization so far. TODO: Replace with functional tests > */ > static void nop(void) > diff --git a/tests/qtest/test-filter-mirror.c > b/tests/qtest/test-filter-mirror.c > index da4f94de727a..fdf66cebd62f 100644 > --- a/tests/qtest/test-filter-mirror.c > +++ b/tests/qtest/test-filter-mirror.c > @@ -9,7 +9,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "libqos/libqtest.h" > #include "qapi/qmp/qdict.h" > #include "qemu/iov.h" > diff --git a/tests/qtest/test-filter-redirector.c > b/tests/qtest/test-filter-redirector.c > index fc16cf7e8d5f..339d3c04cedc 100644 > --- a/tests/qtest/test-filter-redirector.c > +++ b/tests/qtest/test-filter-redirector.c > @@ -51,7 +51,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "libqos/libqtest.h" > #include "qapi/qmp/qdict.h" > #include "qemu/iov.h" > diff --git a/tests/qtest/test-x86-cpuid-compat.c > b/tests/qtest/test-x86-cpuid-compat.c > index 39138db7744b..b39c9055b309 100644 > --- a/tests/qtest/test-x86-cpuid-compat.c > +++ b/tests/qtest/test-x86-cpuid-compat.c > @@ -1,5 +1,4 @@ > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "qapi/qmp/qdict.h" > #include "qapi/qmp/qlist.h" > #include "qapi/qmp/qnum.h" > diff --git a/tests/qtest/virtio-net-test.c b/tests/qtest/virtio-net-test.c > index a71395849f33..fc9f2b94982d 100644 > --- a/tests/qtest/virtio-net-test.c > +++ b/tests/qtest/virtio-net-test.c > @@ -8,7 +8,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu-common.h" > #include "libqtest-single.h" > #include "qemu/iov.h" > #include "qemu/module.h" > diff --git a/tests/unit/check-qjson.c b/tests/unit/check-qjson.c > index c845f91d4377..c4e0f851bfc6 100644 > --- a/tests/unit/check-qjson.c > +++ b/tests/unit/check-qjson.c > @@ -21,7 +21,6 @@ > #include "qapi/qmp/qnum.h" > #include "qapi/qmp/qstring.h" > #include "qemu/unicode.h" > -#include "qemu-common.h" > > static QString *from_json_str(const char *jstr, bool single, Error **errp) > { > diff --git a/tests/unit/check-qnull.c b/tests/unit/check-qnull.c > index ebf21db83ccc..5ceacc65d7f3 100644 > --- a/tests/unit/check-qnull.c > +++ b/tests/unit/check-qnull.c > @@ -9,7 +9,6 @@ > #include "qemu/osdep.h" > > #include "qapi/qmp/qnull.h" > -#include "qemu-common.h" > #include "qapi/qobject-input-visitor.h" > #include "qapi/qobject-output-visitor.h" > #include "qapi/error.h" > diff --git a/tests/unit/check-qnum.c b/tests/unit/check-qnum.c > index b85fca23029e..bf7fe45bacc4 100644 > --- a/tests/unit/check-qnum.c > +++ b/tests/unit/check-qnum.c > @@ -15,7 +15,6 @@ > #include "qemu/osdep.h" > > #include "qapi/qmp/qnum.h" > -#include "qemu-common.h" > > /* > * Public Interface test-cases > diff --git a/tests/unit/check-qobject.c b/tests/unit/check-qobject.c > index 7903ebf4cf80..0ed094e55f3a 100644 > --- a/tests/unit/check-qobject.c > +++ b/tests/unit/check-qobject.c > @@ -15,7 +15,6 @@ > #include "qapi/qmp/qnull.h" > #include "qapi/qmp/qnum.h" > #include "qapi/qmp/qstring.h" > -#include "qemu-common.h" > > #include > > diff --git a/tests/unit/check-qstring.c b/tests/unit/check-qstring.c > index 4bf977209342..bd861f4f8b47 100644 > --- a/tests/unit/check-qstring.c > +++ b/tests/unit/check-qstring.c > @@ -12,7 +12,6 @@ > #include "qemu/osdep.h" > > #include "qapi/qmp/qstring.h" > -#include "qemu-common.h" > > /* > * Public Interface test-cases > diff --git a/tests/unit/socket-helpers.c b/tests/unit/socket-helpers.c > index ef31664d0224..0a9e090a68dd 100644 > --- a/tests/unit/socket-helpers.c > +++ b/tests/unit/socket-helpers.c > @@ -19,7 +19,6 @@ > */ > > #include "qemu/osde