* [PULL 00/23] Trivial branch for 6.1 patches
@ 2021-05-03 8:36 Laurent Vivier
2021-05-03 8:36 ` [PULL 01/23] accel: kvm: clarify that extra exit data is hexadecimal Laurent Vivier
` (23 more replies)
0 siblings, 24 replies; 25+ messages in thread
From: Laurent Vivier @ 2021-05-03 8:36 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Michael Tokarev, Laurent Vivier
The following changes since commit 53c5433e84e8935abed8e91d4a2eb813168a0ecf:
Merge remote-tracking branch 'remotes/rth-gitlab/tags/pull-tcg-20210501' into staging (2021-05-02 12:02:46 +0100)
are available in the Git repository at:
git://github.com/vivier/qemu.git tags/trivial-branch-for-6.1-pull-request
for you to fetch changes up to 9197b5d4b5f163455c891baec531ae73f5d3a73a:
hw/rx/rx-gdbsim: Do not accept invalid memory size (2021-05-03 10:07:41 +0200)
----------------------------------------------------------------
Trivial patches pull request 20210503
----------------------------------------------------------------
David Edmondson (1):
accel: kvm: clarify that extra exit data is hexadecimal
Gan Qixin (1):
mc146818rtc: put it into the 'misc' category
Greg Kurz (1):
docs/system: Document the removal of "compat" property for POWER CPUs
Keqian Zhu (1):
vmstate: Constify some VMStateDescriptions
Philippe Mathieu-Daudé (8):
hw/arm/pxa2xx: Declare PCMCIA bus with Kconfig
hw/ide: Add Kconfig dependency MICRODRIVE -> PCMCIA
hw/pcmcia: Do not register PCMCIA type if not required
hw/arm: Constify VMStateDescription
hw/display/qxl: Constify VMStateDescription
hw/usb: Constify VMStateDescription
ui: Fix memory leak in qemu_xkeymap_mapping_table()
hw/rx/rx-gdbsim: Do not accept invalid memory size
Robert Hoo (1):
docs: More precisely describe memory-backend-*::id's user
Serge Guelton (1):
Fix typo in CFI build documentation
Silvano Cirujano Cuesta (1):
scripts: fix generation update-binfmts templates
Thomas Huth (8):
hw: Remove superfluous includes of hw/hw.h
hw: Do not include hw/sysbus.h if it is not necessary
hw: Do not include hw/irq.h if it is not necessary
hw: Do not include qemu/log.h if it is not necessary
Do not include sysemu/sysemu.h if it's not really necessary
Do not include hw/boards.h if it's not really necessary
Do not include cpu.h if it's not really necessary
Do not include exec/address-spaces.h if it's not really necessary
accel/kvm/kvm-all.c | 4 +---
accel/stubs/kvm-stub.c | 1 -
accel/stubs/tcg-stub.c | 1 -
accel/tcg/cpu-exec-common.c | 1 -
accel/tcg/cpu-exec.c | 1 -
accel/tcg/cputlb.c | 2 --
accel/tcg/plugin-gen.c | 1 -
accel/tcg/tcg-accel-ops-icount.c | 1 -
accel/tcg/tcg-accel-ops-rr.c | 1 -
accel/tcg/tcg-accel-ops.c | 1 -
accel/tcg/translate-all.c | 1 -
accel/tcg/translator.c | 1 -
accel/tcg/user-exec-stub.c | 1 -
accel/tcg/user-exec.c | 1 -
backends/hostmem-file.c | 1 -
backends/hostmem-memfd.c | 1 -
backends/hostmem.c | 1 -
block.c | 1 -
block/block-backend.c | 1 -
block/nfs.c | 1 -
bsd-user/main.c | 1 -
chardev/char-mux.c | 1 -
chardev/char.c | 1 -
disas.c | 1 -
docs/devel/control-flow-integrity.rst | 4 ++--
docs/system/removed-features.rst | 6 ++++++
dump/dump.c | 1 -
dump/win_dump.c | 1 -
gdbstub.c | 1 -
hw/acpi/cpu.c | 1 -
hw/acpi/generic_event_device.c | 1 -
hw/acpi/ich9.c | 1 -
hw/acpi/memory_hotplug.c | 1 -
hw/acpi/pcihp.c | 1 -
hw/acpi/piix4.c | 1 -
hw/alpha/dp264.c | 1 -
hw/alpha/typhoon.c | 2 --
hw/arm/Kconfig | 1 +
hw/arm/allwinner-a10.c | 2 --
hw/arm/allwinner-h3.c | 2 --
hw/arm/armv7m.c | 2 --
hw/arm/aspeed.c | 5 -----
hw/arm/aspeed_ast2600.c | 3 ---
hw/arm/aspeed_soc.c | 3 ---
hw/arm/bcm2836.c | 1 -
hw/arm/boot.c | 1 -
hw/arm/cubieboard.c | 4 ----
hw/arm/digic_boards.c | 3 ---
hw/arm/exynos4210.c | 1 -
hw/arm/exynos4_boards.c | 2 --
hw/arm/fsl-imx25.c | 2 --
hw/arm/fsl-imx31.c | 1 -
hw/arm/highbank.c | 3 +--
hw/arm/imx25_pdk.c | 2 --
hw/arm/kzm.c | 1 -
hw/arm/mcimx6ul-evk.c | 1 -
hw/arm/mcimx7d-sabre.c | 1 -
hw/arm/msf2-soc.c | 1 -
hw/arm/msf2-som.c | 1 -
hw/arm/musicpal.c | 2 --
hw/arm/npcm7xx.c | 1 -
hw/arm/npcm7xx_boards.c | 2 --
hw/arm/nrf51_soc.c | 2 --
hw/arm/nseries.c | 1 -
hw/arm/omap1.c | 1 -
hw/arm/omap2.c | 1 -
hw/arm/orangepi.c | 3 ---
hw/arm/palm.c | 1 -
hw/arm/pxa2xx_pic.c | 2 +-
hw/arm/raspi.c | 2 --
hw/arm/realview.c | 1 -
hw/arm/sabrelite.c | 1 -
hw/arm/sbsa-ref.c | 1 -
hw/arm/smmu-common.c | 1 -
hw/arm/smmuv3.c | 1 -
hw/arm/spitz.c | 4 ++--
hw/arm/stellaris.c | 1 -
hw/arm/strongarm.c | 3 +--
hw/arm/versatilepb.c | 1 -
hw/arm/vexpress.c | 1 -
hw/arm/virt.c | 3 ---
hw/arm/xilinx_zynq.c | 1 -
hw/arm/xlnx-versal-virt.c | 2 --
hw/arm/xlnx-versal.c | 1 -
hw/arm/xlnx-zcu102.c | 1 -
hw/arm/xlnx-zynqmp.c | 2 --
hw/arm/z2.c | 4 ++--
hw/avr/arduino.c | 1 -
hw/avr/atmega.c | 1 -
hw/block/ecc.c | 2 +-
hw/block/nvme-subsys.c | 1 -
hw/char/mchp_pfsoc_mmuart.c | 1 -
hw/char/riscv_htif.c | 1 -
hw/char/sifive_uart.c | 2 --
hw/char/spapr_vty.c | 1 -
hw/char/virtio-serial-bus.c | 1 -
hw/core/generic-loader.c | 1 -
hw/core/guest-loader.c | 1 -
hw/core/loader.c | 1 -
hw/core/machine-qmp-cmds.c | 2 --
hw/core/null-machine.c | 1 -
hw/core/numa.c | 1 -
hw/cris/axis_dev88.c | 1 -
hw/display/next-fb.c | 2 --
hw/display/qxl.c | 8 ++++----
hw/dma/pl080.c | 1 -
hw/dma/pxa2xx_dma.c | 4 ++--
hw/dma/sifive_pdma.c | 1 -
hw/dma/xlnx_csu_dma.c | 1 -
hw/hppa/dino.c | 2 --
hw/hppa/lasi.c | 3 ---
hw/hppa/machine.c | 1 -
hw/i2c/mpc_i2c.c | 1 -
hw/i386/acpi-build.c | 1 -
hw/i386/acpi-microvm.c | 1 -
hw/i386/intel_iommu.c | 2 --
hw/i386/kvm/apic.c | 1 -
hw/i386/kvm/clock.c | 1 -
hw/i386/kvm/ioapic.c | 1 -
hw/i386/kvmvapic.c | 1 -
hw/i386/microvm.c | 1 -
hw/i386/pc.c | 2 --
hw/i386/pc_piix.c | 3 ---
hw/i386/pc_q35.c | 1 -
hw/i386/pc_sysfw.c | 1 -
hw/i386/vmport.c | 1 -
hw/i386/x86-iommu.c | 1 -
hw/i386/xen/xen-hvm.c | 1 -
hw/i386/xen/xen_platform.c | 2 --
hw/ide/Kconfig | 1 +
hw/ide/ahci_internal.h | 1 -
hw/input/lasips2.c | 3 ---
hw/intc/apic.c | 1 -
hw/intc/apic_common.c | 1 -
hw/intc/arm_gic_kvm.c | 2 --
hw/intc/arm_gicv3.c | 1 -
hw/intc/arm_gicv3_kvm.c | 1 -
hw/intc/armv7m_nvic.c | 1 -
hw/intc/grlib_irqmp.c | 1 -
hw/intc/imx_gpcv2.c | 1 -
hw/intc/ompic.c | 1 -
hw/intc/openpic.c | 1 -
hw/intc/openpic_kvm.c | 2 --
hw/intc/s390_flic.c | 1 -
hw/intc/s390_flic_kvm.c | 2 --
hw/intc/sifive_plic.c | 2 --
hw/intc/xics.c | 1 -
hw/intc/xics_kvm.c | 1 -
hw/intc/xics_spapr.c | 1 -
hw/ipmi/isa_ipmi_bt.c | 1 -
hw/ipmi/isa_ipmi_kcs.c | 1 -
hw/isa/isa-superio.c | 1 -
hw/isa/lpc_ich9.c | 2 --
hw/isa/piix3.c | 1 -
hw/isa/piix4.c | 1 -
hw/isa/vt82c686.c | 1 -
hw/lm32/lm32_boards.c | 1 -
hw/lm32/milkymist.c | 1 -
hw/m68k/an5206.c | 1 -
hw/m68k/mcf5208.c | 1 -
hw/m68k/mcf_intc.c | 1 -
hw/m68k/next-cube.c | 2 --
hw/m68k/next-kbd.c | 3 ---
hw/m68k/q800.c | 3 ---
hw/m68k/virt.c | 3 ---
hw/mem/sparse-mem.c | 1 -
hw/microblaze/boot.c | 1 -
hw/mips/boston.c | 1 -
hw/mips/fuloong2e.c | 2 --
hw/mips/gt64xxx_pci.c | 1 -
hw/mips/jazz.c | 1 -
hw/mips/loongson3_virt.c | 4 ----
hw/mips/malta.c | 3 ---
hw/mips/mips_int.c | 1 -
hw/mips/mipssim.c | 2 --
hw/misc/imx7_snvs.c | 1 -
hw/misc/imx_ccm.c | 1 -
hw/misc/imx_rngc.c | 1 -
hw/misc/led.c | 1 -
hw/misc/macio/macio.c | 1 -
hw/misc/mchp_pfsoc_dmc.c | 1 -
hw/misc/mchp_pfsoc_ioscb.c | 1 -
hw/misc/mchp_pfsoc_sysreg.c | 1 -
hw/misc/mips_itu.c | 1 -
hw/misc/mst_fpga.c | 2 +-
hw/misc/pvpanic-isa.c | 1 -
hw/misc/pvpanic-pci.c | 1 -
hw/misc/sifive_e_prci.c | 1 -
hw/misc/sifive_test.c | 1 -
hw/misc/virt_ctrl.c | 1 -
hw/moxie/moxiesim.c | 2 --
hw/net/can/xlnx-zynqmp-can.c | 1 -
hw/net/i82596.c | 1 -
hw/net/lasi_i82596.c | 1 -
hw/net/msf2-emac.c | 1 -
hw/net/spapr_llan.c | 1 -
hw/net/xgmac.c | 1 -
hw/nios2/10m50_devboard.c | 1 -
hw/nios2/boot.c | 2 --
hw/nios2/generic_nommu.c | 2 --
hw/nubus/nubus-bus.c | 1 -
hw/nvram/nrf51_nvm.c | 1 -
hw/nvram/spapr_nvram.c | 2 --
hw/openrisc/openrisc_sim.c | 1 -
hw/pci-host/bonito.c | 1 -
hw/pci-host/ppce500.c | 1 -
hw/pci-host/prep.c | 1 -
hw/pci-host/sabre.c | 1 -
hw/pci-host/sh_pci.c | 1 -
hw/pci/pci.c | 1 -
hw/pci/pcie_host.c | 1 -
hw/pcmcia/meson.build | 2 +-
hw/ppc/e500.c | 2 --
hw/ppc/mac_newworld.c | 2 --
hw/ppc/mac_oldworld.c | 2 --
hw/ppc/pnv.c | 3 ---
hw/ppc/pnv_pnor.c | 1 -
hw/ppc/pnv_psi.c | 1 -
hw/ppc/ppc.c | 1 -
hw/ppc/ppc405_boards.c | 3 ---
hw/ppc/ppc405_uc.c | 1 -
hw/ppc/ppc440_bamboo.c | 1 -
hw/ppc/ppc440_pcix.c | 1 -
hw/ppc/ppc440_uc.c | 2 --
hw/ppc/ppc4xx_devs.c | 1 -
hw/ppc/ppc4xx_pci.c | 1 -
hw/ppc/ppc_booke.c | 1 -
hw/ppc/prep.c | 4 ----
hw/ppc/rs6000_mc.c | 1 -
hw/ppc/sam460ex.c | 1 -
hw/ppc/spapr.c | 2 --
hw/ppc/spapr_drc.c | 1 -
hw/ppc/spapr_events.c | 1 -
hw/ppc/spapr_hcall.c | 1 -
hw/ppc/spapr_iommu.c | 1 -
hw/ppc/spapr_pci.c | 2 --
hw/ppc/spapr_pci_vfio.c | 1 -
hw/ppc/spapr_rng.c | 1 -
hw/ppc/spapr_rtas.c | 2 --
hw/ppc/spapr_rtas_ddw.c | 1 -
hw/ppc/spapr_rtc.c | 1 -
hw/ppc/spapr_tpm_proxy.c | 1 -
hw/ppc/virtex_ml507.c | 2 --
hw/remote/iohub.c | 1 -
hw/remote/machine.c | 1 -
hw/remote/memory.c | 1 -
hw/remote/proxy-memory-listener.c | 2 --
hw/riscv/microchip_pfsoc.c | 2 --
hw/riscv/numa.c | 1 -
hw/riscv/opentitan.c | 1 -
hw/riscv/sifive_e.c | 2 --
hw/riscv/sifive_u.c | 1 -
hw/riscv/spike.c | 1 -
hw/riscv/virt.c | 1 -
hw/rtc/m48t59.c | 1 -
hw/rtc/mc146818rtc.c | 2 +-
hw/rx/rx-gdbsim.c | 5 +----
hw/rx/rx62n.c | 2 --
hw/s390x/3270-ccw.c | 1 -
hw/s390x/css-bridge.c | 1 -
hw/s390x/css.c | 1 -
hw/s390x/ipl.c | 2 --
hw/s390x/pv.c | 1 -
hw/s390x/s390-ccw.c | 1 -
hw/s390x/s390-pci-bus.c | 1 -
hw/s390x/s390-pci-inst.c | 1 -
hw/s390x/s390-stattrib-kvm.c | 1 -
hw/s390x/s390-stattrib.c | 1 -
hw/s390x/s390-virtio-ccw.c | 4 ----
hw/s390x/sclp.c | 2 --
hw/s390x/sclpcpu.c | 1 -
hw/s390x/virtio-ccw.c | 1 -
hw/scsi/spapr_vscsi.c | 1 -
hw/sd/cadence_sdhci.c | 2 --
hw/sh4/r2d.c | 1 -
hw/sh4/sh7750.c | 1 -
hw/sh4/shix.c | 2 --
hw/sparc/leon3.c | 1 -
hw/sparc64/niagara.c | 1 -
hw/ssi/aspeed_smc.c | 1 -
hw/ssi/sifive_spi.c | 1 -
hw/ssi/xilinx_spi.c | 1 -
hw/timer/mips_gictimer.c | 1 -
hw/timer/sse-counter.c | 1 -
hw/tpm/tpm_crb.c | 1 -
hw/tricore/tc27x_soc.c | 4 ----
hw/tricore/triboard.c | 3 ---
hw/tricore/tricore_testboard.c | 1 -
hw/usb/ccid-card-passthru.c | 2 +-
hw/usb/chipidea.c | 1 -
hw/usb/dev-smartcard-reader.c | 8 ++++----
hw/usb/hcd-dwc3.c | 1 -
hw/usb/imx-usb-phy.c | 1 -
hw/usb/xen-usb.c | 1 -
hw/usb/xlnx-usb-subsystem.c | 2 --
hw/usb/xlnx-versal-usb2-ctrl-regs.c | 1 -
hw/vfio/ap.c | 2 --
hw/vfio/ccw.c | 1 -
hw/vfio/display.c | 1 -
hw/vfio/migration.c | 1 -
hw/vfio/pci-quirks.c | 1 -
hw/vfio/pci.c | 1 -
hw/vfio/spapr.c | 1 -
hw/virtio/vhost.c | 1 -
hw/virtio/virtio.c | 1 -
hw/xen/xen-bus-helper.c | 1 -
hw/xen/xen-legacy-backend.c | 1 -
hw/xen/xen_pt.c | 1 -
hw/xtensa/sim.c | 2 --
hw/xtensa/virt.c | 3 ---
hw/xtensa/xtensa_memory.c | 1 -
hw/xtensa/xtfpga.c | 1 -
include/hw/block/flash.h | 2 +-
include/hw/char/avr_usart.h | 1 -
include/hw/misc/avr_power.h | 1 -
include/hw/misc/stm32f4xx_exti.h | 1 -
include/hw/misc/stm32f4xx_syscfg.h | 1 -
include/hw/pci-host/i440fx.h | 1 -
include/hw/timer/avr_timer16.h | 1 -
linux-user/main.c | 1 -
linux-user/semihost.c | 1 -
migration/ram.c | 2 --
monitor/misc.c | 1 -
monitor/monitor.c | 1 -
net/dump.c | 1 -
net/filter-replay.c | 1 -
net/net.c | 2 --
net/netmap.c | 1 -
plugins/api.c | 2 --
plugins/core.c | 2 --
plugins/loader.c | 1 -
qemu-options.hx | 6 +++---
scripts/qemu-binfmt-conf.sh | 4 +++-
semihosting/arm-compat-semi.c | 2 --
semihosting/config.c | 1 -
semihosting/console.c | 2 --
softmmu/arch_init.c | 2 --
softmmu/device_tree.c | 1 -
softmmu/memory.c | 2 --
softmmu/memory_mapping.c | 1 -
softmmu/physmem.c | 3 ---
softmmu/qdev-monitor.c | 1 -
softmmu/vl.c | 1 -
stubs/semihost.c | 1 -
target/arm/cpu.c | 1 -
target/arm/op_helper.c | 1 -
target/hexagon/cpu.c | 1 -
target/hexagon/decode.c | 1 -
target/hexagon/genptr.c | 1 -
target/i386/cpu.h | 2 +-
target/i386/hvf/hvf.c | 1 -
target/i386/hvf/x86_mmu.c | 1 -
target/i386/machine.c | 2 +-
target/i386/sev.c | 1 -
target/lm32/lm32-semi.c | 1 -
target/openrisc/sys_helper.c | 1 -
target/riscv/op_helper.c | 1 -
target/rx/helper.c | 1 -
target/s390x/cpu.c | 1 -
target/s390x/diag.c | 1 -
target/s390x/excp_helper.c | 1 -
target/s390x/interrupt.c | 1 -
target/xtensa/op_helper.c | 1 -
tcg/tcg-op-vec.c | 1 -
tcg/tcg-op.c | 1 -
tcg/tcg.c | 2 --
tests/qtest/fuzz/fuzz.c | 1 -
tests/qtest/fuzz/generic_fuzz.c | 2 --
tests/qtest/fuzz/qos_fuzz.c | 2 --
ui/x_keymap.c | 15 ++++++++++-----
util/oslib-win32.c | 1 -
371 files changed, 53 insertions(+), 507 deletions(-)
--
2.31.1
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PULL 01/23] accel: kvm: clarify that extra exit data is hexadecimal
2021-05-03 8:36 [PULL 00/23] Trivial branch for 6.1 patches Laurent Vivier
@ 2021-05-03 8:36 ` Laurent Vivier
2021-05-03 8:36 ` [PULL 02/23] hw/arm/pxa2xx: Declare PCMCIA bus with Kconfig Laurent Vivier
` (22 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Laurent Vivier @ 2021-05-03 8:36 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, David Edmondson, Michael Tokarev, Laurent Vivier,
Philippe Mathieu-Daudé
From: David Edmondson <david.edmondson@oracle.com>
When dumping the extra exit data provided by KVM, make it clear that
the data is hexadecimal.
At the same time, zero-pad the output.
Signed-off-by: David Edmondson <david.edmondson@oracle.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210428142431.266879-1-david.edmondson@oracle.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
accel/kvm/kvm-all.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index b6d9f92f1513..93d7cbfeaf88 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -2269,7 +2269,7 @@ static int kvm_handle_internal_error(CPUState *cpu, struct kvm_run *run)
int i;
for (i = 0; i < run->internal.ndata; ++i) {
- fprintf(stderr, "extra data[%d]: %"PRIx64"\n",
+ fprintf(stderr, "extra data[%d]: 0x%016"PRIx64"\n",
i, (uint64_t)run->internal.data[i]);
}
}
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PULL 02/23] hw/arm/pxa2xx: Declare PCMCIA bus with Kconfig
2021-05-03 8:36 [PULL 00/23] Trivial branch for 6.1 patches Laurent Vivier
2021-05-03 8:36 ` [PULL 01/23] accel: kvm: clarify that extra exit data is hexadecimal Laurent Vivier
@ 2021-05-03 8:36 ` Laurent Vivier
2021-05-03 8:36 ` [PULL 03/23] hw/ide: Add Kconfig dependency MICRODRIVE -> PCMCIA Laurent Vivier
` (21 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Laurent Vivier @ 2021-05-03 8:36 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Michael Tokarev, Richard Henderson, Laurent Vivier,
Philippe Mathieu-Daudé,
Warner Losh
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
The Intel XScale PXA chipsets provide a PCMCIA controller,
which expose a PCMCIA bus. Express this dependency using
the Kconfig 'select' expression.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Warner Losh <imp@bsdimp.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210424222057.3434459-2-f4bug@amsat.org>
[lv: remove "(IDE)"]
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/arm/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 8c37cf00da74..b887f6a5b17d 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -142,6 +142,7 @@ config PXA2XX
select SD
select SSI
select USB_OHCI
+ select PCMCIA
config GUMSTIX
bool
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PULL 03/23] hw/ide: Add Kconfig dependency MICRODRIVE -> PCMCIA
2021-05-03 8:36 [PULL 00/23] Trivial branch for 6.1 patches Laurent Vivier
2021-05-03 8:36 ` [PULL 01/23] accel: kvm: clarify that extra exit data is hexadecimal Laurent Vivier
2021-05-03 8:36 ` [PULL 02/23] hw/arm/pxa2xx: Declare PCMCIA bus with Kconfig Laurent Vivier
@ 2021-05-03 8:36 ` Laurent Vivier
2021-05-03 8:36 ` [PULL 04/23] hw/pcmcia: Do not register PCMCIA type if not required Laurent Vivier
` (20 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Laurent Vivier @ 2021-05-03 8:36 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Michael Tokarev, Richard Henderson, Laurent Vivier,
Philippe Mathieu-Daudé,
Warner Losh
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
The Microdrive Compact Flash can be plugged on a PCMCIA bus.
Express the dependency using the 'depends on' Kconfig expression.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Warner Losh <imp@bsdimp.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210424222057.3434459-3-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/ide/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig
index 5d9106b1ac2b..8e2c89345497 100644
--- a/hw/ide/Kconfig
+++ b/hw/ide/Kconfig
@@ -41,6 +41,7 @@ config IDE_VIA
config MICRODRIVE
bool
select IDE_QDEV
+ depends on PCMCIA
config AHCI
bool
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PULL 04/23] hw/pcmcia: Do not register PCMCIA type if not required
2021-05-03 8:36 [PULL 00/23] Trivial branch for 6.1 patches Laurent Vivier
` (2 preceding siblings ...)
2021-05-03 8:36 ` [PULL 03/23] hw/ide: Add Kconfig dependency MICRODRIVE -> PCMCIA Laurent Vivier
@ 2021-05-03 8:36 ` Laurent Vivier
2021-05-03 8:36 ` [PULL 05/23] Fix typo in CFI build documentation Laurent Vivier
` (19 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Laurent Vivier @ 2021-05-03 8:36 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Richard Henderson, Michael Tokarev, Laurent Vivier,
Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
If the Kconfig 'PCMCIA' value is not selected, it is pointless
to build the PCMCIA core components.
(Currently only one machine of the ARM targets requires this).
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210424222057.3434459-4-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/pcmcia/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/pcmcia/meson.build b/hw/pcmcia/meson.build
index ab50bd325d6c..51f2512b8ed0 100644
--- a/hw/pcmcia/meson.build
+++ b/hw/pcmcia/meson.build
@@ -1,2 +1,2 @@
-softmmu_ss.add(files('pcmcia.c'))
+softmmu_ss.add(when: 'CONFIG_PCMCIA', if_true: files('pcmcia.c'))
softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx.c'))
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PULL 05/23] Fix typo in CFI build documentation
2021-05-03 8:36 [PULL 00/23] Trivial branch for 6.1 patches Laurent Vivier
` (3 preceding siblings ...)
2021-05-03 8:36 ` [PULL 04/23] hw/pcmcia: Do not register PCMCIA type if not required Laurent Vivier
@ 2021-05-03 8:36 ` Laurent Vivier
2021-05-03 8:36 ` [PULL 06/23] vmstate: Constify some VMStateDescriptions Laurent Vivier
` (18 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Laurent Vivier @ 2021-05-03 8:36 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Philippe Mathieu-Daudé,
Michael Tokarev, Laurent Vivier, Serge Guelton
From: Serge Guelton <sguelton@redhat.com>
Signed-off-by: Serge Guelton <sguelton@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210430150745.GA1401713@sguelton.remote.csb>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
docs/devel/control-flow-integrity.rst | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/devel/control-flow-integrity.rst b/docs/devel/control-flow-integrity.rst
index d89d70733d88..e6b73a4fe1a5 100644
--- a/docs/devel/control-flow-integrity.rst
+++ b/docs/devel/control-flow-integrity.rst
@@ -39,7 +39,7 @@ later).
Given the use of LTO, a version of AR that supports LLVM IR is required.
The easies way of doing this is by selecting the AR provided by LLVM::
- AR=llvm-ar-9 CC=clang-9 CXX=lang++-9 /path/to/configure --enable-cfi
+ AR=llvm-ar-9 CC=clang-9 CXX=clang++-9 /path/to/configure --enable-cfi
CFI is enabled on every binary produced.
@@ -131,7 +131,7 @@ lld with version 11+.
In other words, to compile with fuzzing and CFI, clang 11+ is required, and
lld needs to be used as a linker::
- AR=llvm-ar-11 CC=clang-11 CXX=lang++-11 /path/to/configure --enable-cfi \
+ AR=llvm-ar-11 CC=clang-11 CXX=clang++-11 /path/to/configure --enable-cfi \
-enable-fuzzing --extra-ldflags="-fuse-ld=lld"
and then, compile the fuzzers as usual.
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PULL 06/23] vmstate: Constify some VMStateDescriptions
2021-05-03 8:36 [PULL 00/23] Trivial branch for 6.1 patches Laurent Vivier
` (4 preceding siblings ...)
2021-05-03 8:36 ` [PULL 05/23] Fix typo in CFI build documentation Laurent Vivier
@ 2021-05-03 8:36 ` Laurent Vivier
2021-05-03 8:36 ` [PULL 07/23] hw/arm: Constify VMStateDescription Laurent Vivier
` (17 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Laurent Vivier @ 2021-05-03 8:36 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Michael Tokarev, Richard Henderson, Laurent Vivier,
Philippe Mathieu-Daudé,
Keqian Zhu
From: Keqian Zhu <zhukeqian1@huawei.com>
Constify vmstate_ecc_state and vmstate_x86_cpu.
Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210408140706.23412-1-zhukeqian1@huawei.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/block/ecc.c | 2 +-
include/hw/block/flash.h | 2 +-
target/i386/cpu.h | 2 +-
target/i386/machine.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/block/ecc.c b/hw/block/ecc.c
index 1a182367ee63..6e0d63842c14 100644
--- a/hw/block/ecc.c
+++ b/hw/block/ecc.c
@@ -78,7 +78,7 @@ void ecc_reset(ECCState *s)
}
/* Save/restore */
-VMStateDescription vmstate_ecc_state = {
+const VMStateDescription vmstate_ecc_state = {
.name = "ecc-state",
.version_id = 0,
.minimum_version_id = 0,
diff --git a/include/hw/block/flash.h b/include/hw/block/flash.h
index 7dde0adcee78..86d8363bb09e 100644
--- a/include/hw/block/flash.h
+++ b/include/hw/block/flash.h
@@ -74,6 +74,6 @@ typedef struct {
uint8_t ecc_digest(ECCState *s, uint8_t sample);
void ecc_reset(ECCState *s);
-extern VMStateDescription vmstate_ecc_state;
+extern const VMStateDescription vmstate_ecc_state;
#endif
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index 570f916878f9..1bc300ce85de 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -1786,7 +1786,7 @@ struct X86CPU {
#ifndef CONFIG_USER_ONLY
-extern VMStateDescription vmstate_x86_cpu;
+extern const VMStateDescription vmstate_x86_cpu;
#endif
int x86_cpu_pending_interrupt(CPUState *cs, int interrupt_request);
diff --git a/target/i386/machine.c b/target/i386/machine.c
index 137604ddb898..f6f094f1c938 100644
--- a/target/i386/machine.c
+++ b/target/i386/machine.c
@@ -1396,7 +1396,7 @@ static const VMStateDescription vmstate_msr_tsx_ctrl = {
}
};
-VMStateDescription vmstate_x86_cpu = {
+const VMStateDescription vmstate_x86_cpu = {
.name = "cpu",
.version_id = 12,
.minimum_version_id = 11,
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PULL 07/23] hw/arm: Constify VMStateDescription
2021-05-03 8:36 [PULL 00/23] Trivial branch for 6.1 patches Laurent Vivier
` (5 preceding siblings ...)
2021-05-03 8:36 ` [PULL 06/23] vmstate: Constify some VMStateDescriptions Laurent Vivier
@ 2021-05-03 8:36 ` Laurent Vivier
2021-05-03 8:36 ` [PULL 08/23] hw/display/qxl: " Laurent Vivier
` (16 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Laurent Vivier @ 2021-05-03 8:36 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Richard Henderson, Michael Tokarev, Laurent Vivier,
Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210313171150.2122409-2-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/arm/highbank.c | 2 +-
hw/arm/pxa2xx_pic.c | 2 +-
hw/arm/spitz.c | 4 ++--
hw/arm/strongarm.c | 2 +-
hw/arm/z2.c | 4 ++--
hw/dma/pxa2xx_dma.c | 4 ++--
hw/misc/mst_fpga.c | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c
index bf886268c57d..5afdd28b35c1 100644
--- a/hw/arm/highbank.c
+++ b/hw/arm/highbank.c
@@ -170,7 +170,7 @@ struct HighbankRegsState {
uint32_t regs[NUM_REGS];
};
-static VMStateDescription vmstate_highbank_regs = {
+static const VMStateDescription vmstate_highbank_regs = {
.name = "highbank-regs",
.version_id = 0,
.minimum_version_id = 0,
diff --git a/hw/arm/pxa2xx_pic.c b/hw/arm/pxa2xx_pic.c
index cf6cb2a373ac..ed032fed548d 100644
--- a/hw/arm/pxa2xx_pic.c
+++ b/hw/arm/pxa2xx_pic.c
@@ -301,7 +301,7 @@ DeviceState *pxa2xx_pic_init(hwaddr base, ARMCPU *cpu)
return dev;
}
-static VMStateDescription vmstate_pxa2xx_pic_regs = {
+static const VMStateDescription vmstate_pxa2xx_pic_regs = {
.name = "pxa2xx_pic",
.version_id = 0,
.minimum_version_id = 0,
diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c
index 6b3bf9828bcb..b45a929cbd9e 100644
--- a/hw/arm/spitz.c
+++ b/hw/arm/spitz.c
@@ -1134,7 +1134,7 @@ static bool is_version_0(void *opaque, int version_id)
return version_id == 0;
}
-static VMStateDescription vmstate_sl_nand_info = {
+static const VMStateDescription vmstate_sl_nand_info = {
.name = "sl-nand",
.version_id = 0,
.minimum_version_id = 0,
@@ -1170,7 +1170,7 @@ static const TypeInfo sl_nand_info = {
.class_init = sl_nand_class_init,
};
-static VMStateDescription vmstate_spitz_kbd = {
+static const VMStateDescription vmstate_spitz_kbd = {
.name = "spitz-keyboard",
.version_id = 1,
.minimum_version_id = 0,
diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c
index c7ca54bceaa4..e3e3ea61634f 100644
--- a/hw/arm/strongarm.c
+++ b/hw/arm/strongarm.c
@@ -207,7 +207,7 @@ static int strongarm_pic_post_load(void *opaque, int version_id)
return 0;
}
-static VMStateDescription vmstate_strongarm_pic_regs = {
+static const VMStateDescription vmstate_strongarm_pic_regs = {
.name = "strongarm_pic",
.version_id = 0,
.minimum_version_id = 0,
diff --git a/hw/arm/z2.c b/hw/arm/z2.c
index 5099bd83802e..9c1e876207b3 100644
--- a/hw/arm/z2.c
+++ b/hw/arm/z2.c
@@ -162,7 +162,7 @@ static void zipit_lcd_realize(SSIPeripheral *dev, Error **errp)
z->pos = 0;
}
-static VMStateDescription vmstate_zipit_lcd_state = {
+static const VMStateDescription vmstate_zipit_lcd_state = {
.name = "zipit-lcd",
.version_id = 2,
.minimum_version_id = 2,
@@ -268,7 +268,7 @@ static uint8_t aer915_recv(I2CSlave *slave)
return retval;
}
-static VMStateDescription vmstate_aer915_state = {
+static const VMStateDescription vmstate_aer915_state = {
.name = "aer915",
.version_id = 1,
.minimum_version_id = 1,
diff --git a/hw/dma/pxa2xx_dma.c b/hw/dma/pxa2xx_dma.c
index b3707ff3de25..fa896f7edf77 100644
--- a/hw/dma/pxa2xx_dma.c
+++ b/hw/dma/pxa2xx_dma.c
@@ -525,7 +525,7 @@ static bool is_version_0(void *opaque, int version_id)
return version_id == 0;
}
-static VMStateDescription vmstate_pxa2xx_dma_chan = {
+static const VMStateDescription vmstate_pxa2xx_dma_chan = {
.name = "pxa2xx_dma_chan",
.version_id = 1,
.minimum_version_id = 1,
@@ -540,7 +540,7 @@ static VMStateDescription vmstate_pxa2xx_dma_chan = {
},
};
-static VMStateDescription vmstate_pxa2xx_dma = {
+static const VMStateDescription vmstate_pxa2xx_dma = {
.name = "pxa2xx_dma",
.version_id = 1,
.minimum_version_id = 0,
diff --git a/hw/misc/mst_fpga.c b/hw/misc/mst_fpga.c
index edfc35d5f0f9..2aaadfa96681 100644
--- a/hw/misc/mst_fpga.c
+++ b/hw/misc/mst_fpga.c
@@ -222,7 +222,7 @@ static void mst_fpga_init(Object *obj)
sysbus_init_mmio(sbd, &s->iomem);
}
-static VMStateDescription vmstate_mst_fpga_regs = {
+static const VMStateDescription vmstate_mst_fpga_regs = {
.name = "mainstone_fpga",
.version_id = 0,
.minimum_version_id = 0,
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PULL 08/23] hw/display/qxl: Constify VMStateDescription
2021-05-03 8:36 [PULL 00/23] Trivial branch for 6.1 patches Laurent Vivier
` (6 preceding siblings ...)
2021-05-03 8:36 ` [PULL 07/23] hw/arm: Constify VMStateDescription Laurent Vivier
@ 2021-05-03 8:36 ` Laurent Vivier
2021-05-03 8:36 ` [PULL 09/23] hw/usb: " Laurent Vivier
` (15 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Laurent Vivier @ 2021-05-03 8:36 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Richard Henderson, Michael Tokarev, Laurent Vivier,
Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210313171150.2122409-3-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/display/qxl.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index 93907e82a332..2ba75637ec30 100644
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -2384,7 +2384,7 @@ static bool qxl_monitors_config_needed(void *opaque)
}
-static VMStateDescription qxl_memslot = {
+static const VMStateDescription qxl_memslot = {
.name = "qxl-memslot",
.version_id = QXL_SAVE_VERSION,
.minimum_version_id = QXL_SAVE_VERSION,
@@ -2396,7 +2396,7 @@ static VMStateDescription qxl_memslot = {
}
};
-static VMStateDescription qxl_surface = {
+static const VMStateDescription qxl_surface = {
.name = "qxl-surface",
.version_id = QXL_SAVE_VERSION,
.minimum_version_id = QXL_SAVE_VERSION,
@@ -2414,7 +2414,7 @@ static VMStateDescription qxl_surface = {
}
};
-static VMStateDescription qxl_vmstate_monitors_config = {
+static const VMStateDescription qxl_vmstate_monitors_config = {
.name = "qxl/monitors-config",
.version_id = 1,
.minimum_version_id = 1,
@@ -2425,7 +2425,7 @@ static VMStateDescription qxl_vmstate_monitors_config = {
},
};
-static VMStateDescription qxl_vmstate = {
+static const VMStateDescription qxl_vmstate = {
.name = "qxl",
.version_id = QXL_SAVE_VERSION,
.minimum_version_id = QXL_SAVE_VERSION,
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PULL 09/23] hw/usb: Constify VMStateDescription
2021-05-03 8:36 [PULL 00/23] Trivial branch for 6.1 patches Laurent Vivier
` (7 preceding siblings ...)
2021-05-03 8:36 ` [PULL 08/23] hw/display/qxl: " Laurent Vivier
@ 2021-05-03 8:36 ` Laurent Vivier
2021-05-03 8:36 ` [PULL 10/23] ui: Fix memory leak in qemu_xkeymap_mapping_table() Laurent Vivier
` (14 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Laurent Vivier @ 2021-05-03 8:36 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Richard Henderson, Michael Tokarev, Laurent Vivier,
Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210313171150.2122409-4-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/usb/ccid-card-passthru.c | 2 +-
hw/usb/dev-smartcard-reader.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c
index c1a90fcc7a52..7212d0d7fb5e 100644
--- a/hw/usb/ccid-card-passthru.c
+++ b/hw/usb/ccid-card-passthru.c
@@ -374,7 +374,7 @@ static void passthru_realize(CCIDCardState *base, Error **errp)
card->atr_length = sizeof(DEFAULT_ATR);
}
-static VMStateDescription passthru_vmstate = {
+static const VMStateDescription passthru_vmstate = {
.name = "ccid-card-passthru",
.version_id = 1,
.minimum_version_id = 1,
diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c
index bc3d94092a23..f7043075be58 100644
--- a/hw/usb/dev-smartcard-reader.c
+++ b/hw/usb/dev-smartcard-reader.c
@@ -1365,7 +1365,7 @@ static int ccid_pre_save(void *opaque)
return 0;
}
-static VMStateDescription bulk_in_vmstate = {
+static const VMStateDescription bulk_in_vmstate = {
.name = "CCID BulkIn state",
.version_id = 1,
.minimum_version_id = 1,
@@ -1377,7 +1377,7 @@ static VMStateDescription bulk_in_vmstate = {
}
};
-static VMStateDescription answer_vmstate = {
+static const VMStateDescription answer_vmstate = {
.name = "CCID Answer state",
.version_id = 1,
.minimum_version_id = 1,
@@ -1388,7 +1388,7 @@ static VMStateDescription answer_vmstate = {
}
};
-static VMStateDescription usb_device_vmstate = {
+static const VMStateDescription usb_device_vmstate = {
.name = "usb_device",
.version_id = 1,
.minimum_version_id = 1,
@@ -1400,7 +1400,7 @@ static VMStateDescription usb_device_vmstate = {
}
};
-static VMStateDescription ccid_vmstate = {
+static const VMStateDescription ccid_vmstate = {
.name = "usb-ccid",
.version_id = 1,
.minimum_version_id = 1,
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PULL 10/23] ui: Fix memory leak in qemu_xkeymap_mapping_table()
2021-05-03 8:36 [PULL 00/23] Trivial branch for 6.1 patches Laurent Vivier
` (8 preceding siblings ...)
2021-05-03 8:36 ` [PULL 09/23] hw/usb: " Laurent Vivier
@ 2021-05-03 8:36 ` Laurent Vivier
2021-05-03 8:36 ` [PULL 11/23] hw: Remove superfluous includes of hw/hw.h Laurent Vivier
` (13 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Laurent Vivier @ 2021-05-03 8:36 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Philippe Mathieu-Daudé,
Daniel P . Berrangé,
Michael Tokarev, Laurent Vivier
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Refactor qemu_xkeymap_mapping_table() to have a single exit point,
so we can easily free the memory allocated by XGetAtomName().
This fixes when running a binary configured with --enable-sanitizers:
Direct leak of 22 byte(s) in 1 object(s) allocated from:
#0 0x561344a7473f in malloc (qemu-system-x86_64+0x1dab73f)
#1 0x7fa4d9dc08aa in XGetAtomName (/lib64/libX11.so.6+0x2a8aa)
Fixes: 2ec78706d18 ("ui: convert GTK and SDL1 frontends to keycodemapdb")
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210430155009.259755-1-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
ui/x_keymap.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/ui/x_keymap.c b/ui/x_keymap.c
index 555086fb6bd5..2ce7b899615f 100644
--- a/ui/x_keymap.c
+++ b/ui/x_keymap.c
@@ -56,6 +56,7 @@ const guint16 *qemu_xkeymap_mapping_table(Display *dpy, size_t *maplen)
{
XkbDescPtr desc;
const gchar *keycodes = NULL;
+ const guint16 *map;
/* There is no easy way to determine what X11 server
* and platform & keyboard driver is in use. Thus we
@@ -83,21 +84,21 @@ const guint16 *qemu_xkeymap_mapping_table(Display *dpy, size_t *maplen)
if (check_for_xwin(dpy)) {
trace_xkeymap_keymap("xwin");
*maplen = qemu_input_map_xorgxwin_to_qcode_len;
- return qemu_input_map_xorgxwin_to_qcode;
+ map = qemu_input_map_xorgxwin_to_qcode;
} else if (check_for_xquartz(dpy)) {
trace_xkeymap_keymap("xquartz");
*maplen = qemu_input_map_xorgxquartz_to_qcode_len;
- return qemu_input_map_xorgxquartz_to_qcode;
+ map = qemu_input_map_xorgxquartz_to_qcode;
} else if ((keycodes && g_str_has_prefix(keycodes, "evdev")) ||
(XKeysymToKeycode(dpy, XK_Page_Up) == 0x70)) {
trace_xkeymap_keymap("evdev");
*maplen = qemu_input_map_xorgevdev_to_qcode_len;
- return qemu_input_map_xorgevdev_to_qcode;
+ map = qemu_input_map_xorgevdev_to_qcode;
} else if ((keycodes && g_str_has_prefix(keycodes, "xfree86")) ||
(XKeysymToKeycode(dpy, XK_Page_Up) == 0x63)) {
trace_xkeymap_keymap("kbd");
*maplen = qemu_input_map_xorgkbd_to_qcode_len;
- return qemu_input_map_xorgkbd_to_qcode;
+ map = qemu_input_map_xorgkbd_to_qcode;
} else {
trace_xkeymap_keymap("NULL");
g_warning("Unknown X11 keycode mapping '%s'.\n"
@@ -109,6 +110,10 @@ const guint16 *qemu_xkeymap_mapping_table(Display *dpy, size_t *maplen)
" - xprop -root\n"
" - xdpyinfo\n",
keycodes ? keycodes : "<null>");
- return NULL;
+ map = NULL;
}
+ if (keycodes) {
+ XFree((void *)keycodes);
+ }
+ return map;
}
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PULL 11/23] hw: Remove superfluous includes of hw/hw.h
2021-05-03 8:36 [PULL 00/23] Trivial branch for 6.1 patches Laurent Vivier
` (9 preceding siblings ...)
2021-05-03 8:36 ` [PULL 10/23] ui: Fix memory leak in qemu_xkeymap_mapping_table() Laurent Vivier
@ 2021-05-03 8:36 ` Laurent Vivier
2021-05-03 8:36 ` [PULL 12/23] hw: Do not include hw/sysbus.h if it is not necessary Laurent Vivier
` (12 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Laurent Vivier @ 2021-05-03 8:36 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Thomas Huth, Michael Tokarev, Laurent Vivier,
Philippe Mathieu-Daudé
From: Thomas Huth <thuth@redhat.com>
The include/hw/hw.h header only has a prototype for hw_error(),
so it does not make sense to include this in files that do not
use this function.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210326151848.2217216-1-thuth@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/arm/musicpal.c | 1 -
hw/char/sifive_uart.c | 1 -
hw/display/next-fb.c | 1 -
hw/dma/sifive_pdma.c | 1 -
hw/dma/xlnx_csu_dma.c | 1 -
hw/hppa/lasi.c | 1 -
hw/input/lasips2.c | 1 -
hw/m68k/mcf_intc.c | 1 -
hw/m68k/next-kbd.c | 1 -
hw/m68k/q800.c | 1 -
hw/m68k/virt.c | 1 -
hw/misc/mchp_pfsoc_dmc.c | 1 -
hw/misc/mchp_pfsoc_ioscb.c | 1 -
hw/misc/mchp_pfsoc_sysreg.c | 1 -
hw/misc/sifive_e_prci.c | 1 -
hw/misc/sifive_test.c | 1 -
hw/rx/rx-gdbsim.c | 1 -
hw/rx/rx62n.c | 1 -
hw/vfio/pci-quirks.c | 1 -
include/hw/char/avr_usart.h | 1 -
include/hw/misc/avr_power.h | 1 -
include/hw/misc/stm32f4xx_exti.h | 1 -
include/hw/misc/stm32f4xx_syscfg.h | 1 -
include/hw/pci-host/i440fx.h | 1 -
include/hw/timer/avr_timer16.h | 1 -
25 files changed, 25 deletions(-)
diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
index 9cebece2de0b..7d67dc72542e 100644
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@@ -19,7 +19,6 @@
#include "sysemu/sysemu.h"
#include "hw/boards.h"
#include "hw/char/serial.h"
-#include "hw/hw.h"
#include "qemu/timer.h"
#include "hw/ptimer.h"
#include "hw/qdev-properties.h"
diff --git a/hw/char/sifive_uart.c b/hw/char/sifive_uart.c
index 3a00ba7f006c..ee7adb8e3083 100644
--- a/hw/char/sifive_uart.c
+++ b/hw/char/sifive_uart.c
@@ -22,7 +22,6 @@
#include "hw/sysbus.h"
#include "chardev/char.h"
#include "chardev/char-fe.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/char/sifive_uart.h"
diff --git a/hw/display/next-fb.c b/hw/display/next-fb.c
index e2d895109dbe..cc134c2d5beb 100644
--- a/hw/display/next-fb.c
+++ b/hw/display/next-fb.c
@@ -24,7 +24,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "ui/console.h"
-#include "hw/hw.h"
#include "hw/boards.h"
#include "hw/loader.h"
#include "framebuffer.h"
diff --git a/hw/dma/sifive_pdma.c b/hw/dma/sifive_pdma.c
index e1f6fedbda73..9b2ac2017d9d 100644
--- a/hw/dma/sifive_pdma.c
+++ b/hw/dma/sifive_pdma.c
@@ -24,7 +24,6 @@
#include "qemu/bitops.h"
#include "qemu/log.h"
#include "qapi/error.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/qdev-properties.h"
#include "hw/sysbus.h"
diff --git a/hw/dma/xlnx_csu_dma.c b/hw/dma/xlnx_csu_dma.c
index 98324dadcd4c..797b4fed8f5f 100644
--- a/hw/dma/xlnx_csu_dma.c
+++ b/hw/dma/xlnx_csu_dma.c
@@ -21,7 +21,6 @@
#include "qemu/osdep.h"
#include "qemu/log.h"
#include "qapi/error.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/qdev-properties.h"
#include "hw/sysbus.h"
diff --git a/hw/hppa/lasi.c b/hw/hppa/lasi.c
index 1a8565794846..a8f5defcd01e 100644
--- a/hw/hppa/lasi.c
+++ b/hw/hppa/lasi.c
@@ -15,7 +15,6 @@
#include "qapi/error.h"
#include "cpu.h"
#include "trace.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "sysemu/sysemu.h"
#include "sysemu/runstate.h"
diff --git a/hw/input/lasips2.c b/hw/input/lasips2.c
index 0786e5733880..60afb94c780e 100644
--- a/hw/input/lasips2.c
+++ b/hw/input/lasips2.c
@@ -24,7 +24,6 @@
#include "qemu/osdep.h"
#include "qemu/log.h"
#include "hw/qdev-properties.h"
-#include "hw/hw.h"
#include "hw/input/ps2.h"
#include "hw/input/lasips2.h"
#include "hw/sysbus.h"
diff --git a/hw/m68k/mcf_intc.c b/hw/m68k/mcf_intc.c
index cf02f57a7117..4cd30188c053 100644
--- a/hw/m68k/mcf_intc.c
+++ b/hw/m68k/mcf_intc.c
@@ -11,7 +11,6 @@
#include "qemu/module.h"
#include "qemu/log.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/sysbus.h"
#include "hw/m68k/mcf.h"
diff --git a/hw/m68k/next-kbd.c b/hw/m68k/next-kbd.c
index c11b5281f199..bee40e25bca0 100644
--- a/hw/m68k/next-kbd.c
+++ b/hw/m68k/next-kbd.c
@@ -30,7 +30,6 @@
#include "qemu/osdep.h"
#include "qemu/log.h"
#include "exec/address-spaces.h"
-#include "hw/hw.h"
#include "hw/sysbus.h"
#include "hw/m68k/next-cube.h"
#include "ui/console.h"
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index 4d2e866eec7f..1c7f7aa07f07 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -26,7 +26,6 @@
#include "qemu/datadir.h"
#include "sysemu/sysemu.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/boards.h"
#include "hw/irq.h"
#include "hw/or-irq.h"
diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c
index e9a5d4c69b97..18e6f11041da 100644
--- a/hw/m68k/virt.c
+++ b/hw/m68k/virt.c
@@ -12,7 +12,6 @@
#include "qemu-common.h"
#include "sysemu/sysemu.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/boards.h"
#include "hw/irq.h"
#include "hw/qdev-properties.h"
diff --git a/hw/misc/mchp_pfsoc_dmc.c b/hw/misc/mchp_pfsoc_dmc.c
index 15cf3d77252c..43d8e970abc0 100644
--- a/hw/misc/mchp_pfsoc_dmc.c
+++ b/hw/misc/mchp_pfsoc_dmc.c
@@ -24,7 +24,6 @@
#include "qemu/bitops.h"
#include "qemu/log.h"
#include "qapi/error.h"
-#include "hw/hw.h"
#include "hw/sysbus.h"
#include "hw/misc/mchp_pfsoc_dmc.h"
diff --git a/hw/misc/mchp_pfsoc_ioscb.c b/hw/misc/mchp_pfsoc_ioscb.c
index 8b0d1cacd7ef..f4fd55a0e5c7 100644
--- a/hw/misc/mchp_pfsoc_ioscb.c
+++ b/hw/misc/mchp_pfsoc_ioscb.c
@@ -24,7 +24,6 @@
#include "qemu/bitops.h"
#include "qemu/log.h"
#include "qapi/error.h"
-#include "hw/hw.h"
#include "hw/sysbus.h"
#include "hw/misc/mchp_pfsoc_ioscb.h"
diff --git a/hw/misc/mchp_pfsoc_sysreg.c b/hw/misc/mchp_pfsoc_sysreg.c
index 248a3133455c..89571eded53f 100644
--- a/hw/misc/mchp_pfsoc_sysreg.c
+++ b/hw/misc/mchp_pfsoc_sysreg.c
@@ -24,7 +24,6 @@
#include "qemu/bitops.h"
#include "qemu/log.h"
#include "qapi/error.h"
-#include "hw/hw.h"
#include "hw/sysbus.h"
#include "hw/misc/mchp_pfsoc_sysreg.h"
diff --git a/hw/misc/sifive_e_prci.c b/hw/misc/sifive_e_prci.c
index 8ec4ee4b41fc..a8702c6a5d44 100644
--- a/hw/misc/sifive_e_prci.c
+++ b/hw/misc/sifive_e_prci.c
@@ -23,7 +23,6 @@
#include "qapi/error.h"
#include "qemu/log.h"
#include "qemu/module.h"
-#include "hw/hw.h"
#include "hw/misc/sifive_e_prci.h"
static uint64_t sifive_e_prci_read(void *opaque, hwaddr addr, unsigned int size)
diff --git a/hw/misc/sifive_test.c b/hw/misc/sifive_test.c
index 2deb2072cc8e..56df45bfe592 100644
--- a/hw/misc/sifive_test.c
+++ b/hw/misc/sifive_test.c
@@ -24,7 +24,6 @@
#include "qemu/log.h"
#include "qemu/module.h"
#include "sysemu/runstate.h"
-#include "hw/hw.h"
#include "hw/misc/sifive_test.h"
static uint64_t sifive_test_read(void *opaque, hwaddr addr, unsigned int size)
diff --git a/hw/rx/rx-gdbsim.c b/hw/rx/rx-gdbsim.c
index b1d7c2488ff3..8c611b0a59ea 100644
--- a/hw/rx/rx-gdbsim.c
+++ b/hw/rx/rx-gdbsim.c
@@ -22,7 +22,6 @@
#include "qapi/error.h"
#include "qemu-common.h"
#include "cpu.h"
-#include "hw/hw.h"
#include "hw/sysbus.h"
#include "hw/loader.h"
#include "hw/rx/rx62n.h"
diff --git a/hw/rx/rx62n.c b/hw/rx/rx62n.c
index 9c34ce14de64..31ddccf2cdbb 100644
--- a/hw/rx/rx62n.c
+++ b/hw/rx/rx62n.c
@@ -23,7 +23,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
-#include "hw/hw.h"
#include "hw/rx/rx62n.h"
#include "hw/loader.h"
#include "hw/sysbus.h"
diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c
index b90cf3d37c30..e21a6ede1140 100644
--- a/hw/vfio/pci-quirks.c
+++ b/hw/vfio/pci-quirks.c
@@ -22,7 +22,6 @@
#include "qapi/error.h"
#include "qapi/visitor.h"
#include <sys/ioctl.h>
-#include "hw/hw.h"
#include "hw/nvram/fw_cfg.h"
#include "hw/qdev-properties.h"
#include "pci.h"
diff --git a/include/hw/char/avr_usart.h b/include/hw/char/avr_usart.h
index bb5753240367..62eaa1528eff 100644
--- a/include/hw/char/avr_usart.h
+++ b/include/hw/char/avr_usart.h
@@ -24,7 +24,6 @@
#include "hw/sysbus.h"
#include "chardev/char-fe.h"
-#include "hw/hw.h"
#include "qom/object.h"
/* Offsets of registers. */
diff --git a/include/hw/misc/avr_power.h b/include/hw/misc/avr_power.h
index 707df030b187..388e421aa7ba 100644
--- a/include/hw/misc/avr_power.h
+++ b/include/hw/misc/avr_power.h
@@ -26,7 +26,6 @@
#define HW_MISC_AVR_POWER_H
#include "hw/sysbus.h"
-#include "hw/hw.h"
#include "qom/object.h"
diff --git a/include/hw/misc/stm32f4xx_exti.h b/include/hw/misc/stm32f4xx_exti.h
index 24b6fa7724b1..ea6b0097b0eb 100644
--- a/include/hw/misc/stm32f4xx_exti.h
+++ b/include/hw/misc/stm32f4xx_exti.h
@@ -26,7 +26,6 @@
#define HW_STM_EXTI_H
#include "hw/sysbus.h"
-#include "hw/hw.h"
#include "qom/object.h"
#define EXTI_IMR 0x00
diff --git a/include/hw/misc/stm32f4xx_syscfg.h b/include/hw/misc/stm32f4xx_syscfg.h
index 8c31feccd379..6f8ca49228b6 100644
--- a/include/hw/misc/stm32f4xx_syscfg.h
+++ b/include/hw/misc/stm32f4xx_syscfg.h
@@ -26,7 +26,6 @@
#define HW_STM_SYSCFG_H
#include "hw/sysbus.h"
-#include "hw/hw.h"
#include "qom/object.h"
#define SYSCFG_MEMRMP 0x00
diff --git a/include/hw/pci-host/i440fx.h b/include/hw/pci-host/i440fx.h
index 24fd53942cab..7fcfd9485c0f 100644
--- a/include/hw/pci-host/i440fx.h
+++ b/include/hw/pci-host/i440fx.h
@@ -11,7 +11,6 @@
#ifndef HW_PCI_I440FX_H
#define HW_PCI_I440FX_H
-#include "hw/hw.h"
#include "hw/pci/pci_bus.h"
#include "hw/pci-host/pam.h"
#include "qom/object.h"
diff --git a/include/hw/timer/avr_timer16.h b/include/hw/timer/avr_timer16.h
index 053625433789..a1a032a24dc8 100644
--- a/include/hw/timer/avr_timer16.h
+++ b/include/hw/timer/avr_timer16.h
@@ -30,7 +30,6 @@
#include "hw/sysbus.h"
#include "qemu/timer.h"
-#include "hw/hw.h"
#include "qom/object.h"
enum NextInterrupt {
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PULL 12/23] hw: Do not include hw/sysbus.h if it is not necessary
2021-05-03 8:36 [PULL 00/23] Trivial branch for 6.1 patches Laurent Vivier
` (10 preceding siblings ...)
2021-05-03 8:36 ` [PULL 11/23] hw: Remove superfluous includes of hw/hw.h Laurent Vivier
@ 2021-05-03 8:36 ` Laurent Vivier
2021-05-03 8:36 ` [PULL 13/23] hw: Do not include hw/irq.h " Laurent Vivier
` (11 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Laurent Vivier @ 2021-05-03 8:36 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Thomas Huth, Michael Tokarev, Laurent Vivier,
Philippe Mathieu-Daudé
From: Thomas Huth <thuth@redhat.com>
Many files include hw/sysbus.h without needing it. Remove the superfluous
include statements.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210327082804.2259480-1-thuth@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/arm/cubieboard.c | 1 -
hw/arm/orangepi.c | 1 -
hw/char/riscv_htif.c | 1 -
hw/char/sifive_uart.c | 1 -
hw/char/virtio-serial-bus.c | 1 -
hw/core/generic-loader.c | 1 -
hw/core/guest-loader.c | 1 -
hw/ide/ahci_internal.h | 1 -
hw/input/lasips2.c | 1 -
hw/intc/arm_gic_kvm.c | 1 -
hw/intc/arm_gicv3.c | 1 -
hw/intc/arm_gicv3_kvm.c | 1 -
hw/intc/s390_flic_kvm.c | 1 -
hw/isa/lpc_ich9.c | 1 -
hw/isa/piix4.c | 1 -
hw/moxie/moxiesim.c | 1 -
hw/nios2/generic_nommu.c | 1 -
hw/nubus/nubus-bus.c | 1 -
hw/nvram/spapr_nvram.c | 1 -
hw/rx/rx-gdbsim.c | 1 -
hw/s390x/s390-ccw.c | 1 -
hw/s390x/virtio-ccw.c | 1 -
hw/timer/mips_gictimer.c | 1 -
hw/usb/xen-usb.c | 1 -
hw/vfio/ap.c | 1 -
hw/vfio/ccw.c | 1 -
hw/xen/xen-bus-helper.c | 1 -
27 files changed, 27 deletions(-)
diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c
index 9d0d728180bc..3ec30ca5afa4 100644
--- a/hw/arm/cubieboard.c
+++ b/hw/arm/cubieboard.c
@@ -20,7 +20,6 @@
#include "qapi/error.h"
#include "cpu.h"
#include "sysemu/sysemu.h"
-#include "hw/sysbus.h"
#include "hw/boards.h"
#include "hw/qdev-properties.h"
#include "hw/arm/allwinner-a10.h"
diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c
index 40cdb5c6d2cb..b8d38c9e8d04 100644
--- a/hw/arm/orangepi.c
+++ b/hw/arm/orangepi.c
@@ -22,7 +22,6 @@
#include "exec/address-spaces.h"
#include "qapi/error.h"
#include "cpu.h"
-#include "hw/sysbus.h"
#include "hw/boards.h"
#include "hw/qdev-properties.h"
#include "hw/arm/allwinner-h3.h"
diff --git a/hw/char/riscv_htif.c b/hw/char/riscv_htif.c
index ba1af1cfc450..ddae738d5631 100644
--- a/hw/char/riscv_htif.c
+++ b/hw/char/riscv_htif.c
@@ -23,7 +23,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu/log.h"
-#include "hw/sysbus.h"
#include "hw/char/riscv_htif.h"
#include "hw/char/serial.h"
#include "chardev/char.h"
diff --git a/hw/char/sifive_uart.c b/hw/char/sifive_uart.c
index ee7adb8e3083..fe1266678932 100644
--- a/hw/char/sifive_uart.c
+++ b/hw/char/sifive_uart.c
@@ -19,7 +19,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu/log.h"
-#include "hw/sysbus.h"
#include "chardev/char.h"
#include "chardev/char-fe.h"
#include "hw/irq.h"
diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c
index b20038991a6c..dd6bc27b3b5d 100644
--- a/hw/char/virtio-serial-bus.c
+++ b/hw/char/virtio-serial-bus.c
@@ -28,7 +28,6 @@
#include "qemu/error-report.h"
#include "qemu/queue.h"
#include "hw/qdev-properties.h"
-#include "hw/sysbus.h"
#include "trace.h"
#include "hw/virtio/virtio-serial.h"
#include "hw/virtio/virtio-access.h"
diff --git a/hw/core/generic-loader.c b/hw/core/generic-loader.c
index 2b2a7b5e9aab..d14f932eea2e 100644
--- a/hw/core/generic-loader.c
+++ b/hw/core/generic-loader.c
@@ -32,7 +32,6 @@
#include "qemu/osdep.h"
#include "hw/core/cpu.h"
-#include "hw/sysbus.h"
#include "sysemu/dma.h"
#include "sysemu/reset.h"
#include "hw/boards.h"
diff --git a/hw/core/guest-loader.c b/hw/core/guest-loader.c
index bde44e27b432..d3f9d1a06eb3 100644
--- a/hw/core/guest-loader.c
+++ b/hw/core/guest-loader.c
@@ -26,7 +26,6 @@
#include "qemu/osdep.h"
#include "hw/core/cpu.h"
-#include "hw/sysbus.h"
#include "sysemu/dma.h"
#include "hw/loader.h"
#include "hw/qdev-properties.h"
diff --git a/hw/ide/ahci_internal.h b/hw/ide/ahci_internal.h
index 7f32e87731d9..109de9e2d112 100644
--- a/hw/ide/ahci_internal.h
+++ b/hw/ide/ahci_internal.h
@@ -26,7 +26,6 @@
#include "hw/ide/ahci.h"
#include "hw/ide/internal.h"
-#include "hw/sysbus.h"
#include "hw/pci/pci.h"
#define AHCI_MEM_BAR_SIZE 0x1000
diff --git a/hw/input/lasips2.c b/hw/input/lasips2.c
index 60afb94c780e..275737842e95 100644
--- a/hw/input/lasips2.c
+++ b/hw/input/lasips2.c
@@ -26,7 +26,6 @@
#include "hw/qdev-properties.h"
#include "hw/input/ps2.h"
#include "hw/input/lasips2.h"
-#include "hw/sysbus.h"
#include "exec/hwaddr.h"
#include "sysemu/sysemu.h"
#include "trace.h"
diff --git a/hw/intc/arm_gic_kvm.c b/hw/intc/arm_gic_kvm.c
index 9494185cf467..49f79a8674b0 100644
--- a/hw/intc/arm_gic_kvm.c
+++ b/hw/intc/arm_gic_kvm.c
@@ -23,7 +23,6 @@
#include "qapi/error.h"
#include "qemu/module.h"
#include "cpu.h"
-#include "hw/sysbus.h"
#include "migration/blocker.h"
#include "sysemu/kvm.h"
#include "kvm_arm.h"
diff --git a/hw/intc/arm_gicv3.c b/hw/intc/arm_gicv3.c
index 66eaa9719828..d63f8af604d6 100644
--- a/hw/intc/arm_gicv3.c
+++ b/hw/intc/arm_gicv3.c
@@ -18,7 +18,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu/module.h"
-#include "hw/sysbus.h"
#include "hw/intc/arm_gicv3.h"
#include "gicv3_internal.h"
diff --git a/hw/intc/arm_gicv3_kvm.c b/hw/intc/arm_gicv3_kvm.c
index 65a4c880a351..5c09f00dec2b 100644
--- a/hw/intc/arm_gicv3_kvm.c
+++ b/hw/intc/arm_gicv3_kvm.c
@@ -22,7 +22,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "hw/intc/arm_gicv3_common.h"
-#include "hw/sysbus.h"
#include "qemu/error-report.h"
#include "qemu/module.h"
#include "sysemu/kvm.h"
diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c
index b3fb9f83952e..d1c8fb8016a0 100644
--- a/hw/intc/s390_flic_kvm.c
+++ b/hw/intc/s390_flic_kvm.c
@@ -17,7 +17,6 @@
#include "qemu/error-report.h"
#include "qemu/module.h"
#include "qapi/error.h"
-#include "hw/sysbus.h"
#include "sysemu/kvm.h"
#include "hw/s390x/s390_flic.h"
#include "hw/s390x/adapter.h"
diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c
index 3963b7352070..160bea447aab 100644
--- a/hw/isa/lpc_ich9.c
+++ b/hw/isa/lpc_ich9.c
@@ -34,7 +34,6 @@
#include "qapi/visitor.h"
#include "qemu/range.h"
#include "hw/isa/isa.h"
-#include "hw/sysbus.h"
#include "migration/vmstate.h"
#include "hw/irq.h"
#include "hw/isa/apm.h"
diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
index b3b6a4378a33..48c5dda2b659 100644
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@@ -29,7 +29,6 @@
#include "hw/southbridge/piix.h"
#include "hw/pci/pci.h"
#include "hw/isa/isa.h"
-#include "hw/sysbus.h"
#include "hw/intc/i8259.h"
#include "hw/dma/i8257.h"
#include "hw/timer/i8254.h"
diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c
index f7b57fcae190..196b730589d4 100644
--- a/hw/moxie/moxiesim.c
+++ b/hw/moxie/moxiesim.c
@@ -29,7 +29,6 @@
#include "qemu/error-report.h"
#include "qapi/error.h"
#include "cpu.h"
-#include "hw/sysbus.h"
#include "net/net.h"
#include "sysemu/reset.h"
#include "sysemu/sysemu.h"
diff --git a/hw/nios2/generic_nommu.c b/hw/nios2/generic_nommu.c
index 19899e2c1ef8..b70a42dc2fc2 100644
--- a/hw/nios2/generic_nommu.c
+++ b/hw/nios2/generic_nommu.c
@@ -31,7 +31,6 @@
#include "qemu-common.h"
#include "cpu.h"
-#include "hw/sysbus.h"
#include "hw/char/serial.h"
#include "hw/boards.h"
#include "exec/memory.h"
diff --git a/hw/nubus/nubus-bus.c b/hw/nubus/nubus-bus.c
index 942a6d5342d3..5c134523082e 100644
--- a/hw/nubus/nubus-bus.c
+++ b/hw/nubus/nubus-bus.c
@@ -10,7 +10,6 @@
#include "qemu/osdep.h"
#include "hw/nubus/nubus.h"
-#include "hw/sysbus.h"
#include "qapi/error.h"
diff --git a/hw/nvram/spapr_nvram.c b/hw/nvram/spapr_nvram.c
index 01f775201463..3bb4654c5895 100644
--- a/hw/nvram/spapr_nvram.c
+++ b/hw/nvram/spapr_nvram.c
@@ -33,7 +33,6 @@
#include "sysemu/device_tree.h"
#include "sysemu/sysemu.h"
#include "sysemu/runstate.h"
-#include "hw/sysbus.h"
#include "migration/vmstate.h"
#include "hw/nvram/chrp_nvram.h"
#include "hw/ppc/spapr.h"
diff --git a/hw/rx/rx-gdbsim.c b/hw/rx/rx-gdbsim.c
index 8c611b0a59ea..9b82feff5284 100644
--- a/hw/rx/rx-gdbsim.c
+++ b/hw/rx/rx-gdbsim.c
@@ -22,7 +22,6 @@
#include "qapi/error.h"
#include "qemu-common.h"
#include "cpu.h"
-#include "hw/sysbus.h"
#include "hw/loader.h"
#include "hw/rx/rx62n.h"
#include "sysemu/sysemu.h"
diff --git a/hw/s390x/s390-ccw.c b/hw/s390x/s390-ccw.c
index b497571863f6..242491a1aea0 100644
--- a/hw/s390x/s390-ccw.c
+++ b/hw/s390x/s390-ccw.c
@@ -15,7 +15,6 @@
#include <libgen.h>
#include "qapi/error.h"
#include "qemu/module.h"
-#include "hw/sysbus.h"
#include "hw/s390x/css.h"
#include "hw/s390x/css-bridge.h"
#include "hw/s390x/s390-ccw.h"
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index 8195f3546e43..92b950e09a13 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -17,7 +17,6 @@
#include "hw/virtio/virtio.h"
#include "migration/qemu-file-types.h"
#include "hw/virtio/virtio-net.h"
-#include "hw/sysbus.h"
#include "qemu/bitops.h"
#include "qemu/error-report.h"
#include "qemu/module.h"
diff --git a/hw/timer/mips_gictimer.c b/hw/timer/mips_gictimer.c
index bc44cd934e85..2b0696d4acb5 100644
--- a/hw/timer/mips_gictimer.c
+++ b/hw/timer/mips_gictimer.c
@@ -7,7 +7,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/sysbus.h"
#include "qemu/timer.h"
#include "hw/timer/mips_gictimer.h"
diff --git a/hw/usb/xen-usb.c b/hw/usb/xen-usb.c
index 4d266d7bb450..0f7369e7ed64 100644
--- a/hw/usb/xen-usb.c
+++ b/hw/usb/xen-usb.c
@@ -26,7 +26,6 @@
#include "qemu/config-file.h"
#include "qemu/main-loop.h"
#include "qemu/option.h"
-#include "hw/sysbus.h"
#include "hw/usb.h"
#include "hw/xen/xen-legacy-backend.h"
#include "monitor/qdev.h"
diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c
index 9571c2f91fdc..f9dbec37da20 100644
--- a/hw/vfio/ap.c
+++ b/hw/vfio/ap.c
@@ -14,7 +14,6 @@
#include <linux/vfio.h>
#include <sys/ioctl.h>
#include "qapi/error.h"
-#include "hw/sysbus.h"
#include "hw/vfio/vfio.h"
#include "hw/vfio/vfio-common.h"
#include "hw/s390x/ap-device.h"
diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c
index b2df708e4b01..e752c845e9e4 100644
--- a/hw/vfio/ccw.c
+++ b/hw/vfio/ccw.c
@@ -20,7 +20,6 @@
#include <sys/ioctl.h>
#include "qapi/error.h"
-#include "hw/sysbus.h"
#include "hw/vfio/vfio.h"
#include "hw/vfio/vfio-common.h"
#include "hw/s390x/s390-ccw.h"
diff --git a/hw/xen/xen-bus-helper.c b/hw/xen/xen-bus-helper.c
index b459bb939680..5a1e12b374e7 100644
--- a/hw/xen/xen-bus-helper.c
+++ b/hw/xen/xen-bus-helper.c
@@ -6,7 +6,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/sysbus.h"
#include "hw/xen/xen.h"
#include "hw/xen/xen-bus.h"
#include "hw/xen/xen-bus-helper.h"
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PULL 13/23] hw: Do not include hw/irq.h if it is not necessary
2021-05-03 8:36 [PULL 00/23] Trivial branch for 6.1 patches Laurent Vivier
` (11 preceding siblings ...)
2021-05-03 8:36 ` [PULL 12/23] hw: Do not include hw/sysbus.h if it is not necessary Laurent Vivier
@ 2021-05-03 8:36 ` Laurent Vivier
2021-05-03 8:36 ` [PULL 14/23] hw: Do not include qemu/log.h " Laurent Vivier
` (10 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Laurent Vivier @ 2021-05-03 8:36 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Alistair Francis, Thomas Huth, Michael Tokarev,
Laurent Vivier
From: Thomas Huth <thuth@redhat.com>
Many files include hw/irq.h without needing it. Remove the superfluous
include statements.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-Id: <20210327050236.2232347-1-thuth@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/arm/msf2-soc.c | 1 -
hw/i386/kvm/ioapic.c | 1 -
hw/i386/xen/xen_platform.c | 1 -
hw/m68k/q800.c | 1 -
hw/m68k/virt.c | 1 -
hw/misc/led.c | 1 -
hw/misc/virt_ctrl.c | 1 -
hw/ppc/prep.c | 1 -
hw/riscv/microchip_pfsoc.c | 1 -
hw/sd/cadence_sdhci.c | 1 -
hw/timer/sse-counter.c | 1 -
hw/usb/xlnx-usb-subsystem.c | 1 -
12 files changed, 12 deletions(-)
diff --git a/hw/arm/msf2-soc.c b/hw/arm/msf2-soc.c
index d2c29e82d13a..5cfe7caf8349 100644
--- a/hw/arm/msf2-soc.c
+++ b/hw/arm/msf2-soc.c
@@ -27,7 +27,6 @@
#include "qapi/error.h"
#include "exec/address-spaces.h"
#include "hw/char/serial.h"
-#include "hw/irq.h"
#include "hw/arm/msf2-soc.h"
#include "hw/misc/unimp.h"
#include "sysemu/sysemu.h"
diff --git a/hw/i386/kvm/ioapic.c b/hw/i386/kvm/ioapic.c
index dfc3c9800574..71a563181e03 100644
--- a/hw/i386/kvm/ioapic.c
+++ b/hw/i386/kvm/ioapic.c
@@ -13,7 +13,6 @@
#include "qemu/osdep.h"
#include "monitor/monitor.h"
#include "hw/i386/x86.h"
-#include "hw/irq.h"
#include "hw/qdev-properties.h"
#include "hw/i386/ioapic_internal.h"
#include "hw/i386/apic_internal.h"
diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c
index 01ae1fb16184..bf4f20e92b6f 100644
--- a/hw/i386/xen/xen_platform.c
+++ b/hw/i386/xen/xen_platform.c
@@ -27,7 +27,6 @@
#include "qapi/error.h"
#include "hw/ide.h"
#include "hw/pci/pci.h"
-#include "hw/irq.h"
#include "hw/xen/xen_common.h"
#include "migration/vmstate.h"
#include "hw/xen/xen-legacy-backend.h"
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index 1c7f7aa07f07..d1ab1ff77d5c 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -27,7 +27,6 @@
#include "sysemu/sysemu.h"
#include "cpu.h"
#include "hw/boards.h"
-#include "hw/irq.h"
#include "hw/or-irq.h"
#include "elf.h"
#include "hw/loader.h"
diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c
index 18e6f11041da..9469f82800c9 100644
--- a/hw/m68k/virt.c
+++ b/hw/m68k/virt.c
@@ -13,7 +13,6 @@
#include "sysemu/sysemu.h"
#include "cpu.h"
#include "hw/boards.h"
-#include "hw/irq.h"
#include "hw/qdev-properties.h"
#include "elf.h"
#include "hw/loader.h"
diff --git a/hw/misc/led.c b/hw/misc/led.c
index f552b8b6483c..f6d6d68bce59 100644
--- a/hw/misc/led.c
+++ b/hw/misc/led.c
@@ -10,7 +10,6 @@
#include "migration/vmstate.h"
#include "hw/qdev-properties.h"
#include "hw/misc/led.h"
-#include "hw/irq.h"
#include "trace.h"
#define LED_INTENSITY_PERCENT_MAX 100
diff --git a/hw/misc/virt_ctrl.c b/hw/misc/virt_ctrl.c
index 2ea01bd7a1f0..3552d7a09abd 100644
--- a/hw/misc/virt_ctrl.c
+++ b/hw/misc/virt_ctrl.c
@@ -5,7 +5,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/irq.h"
#include "hw/qdev-properties.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index f1b1efdcef9f..af4ccb9f431f 100644
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -38,7 +38,6 @@
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "qemu/log.h"
-#include "hw/irq.h"
#include "hw/loader.h"
#include "hw/rtc/mc146818rtc.h"
#include "hw/isa/pc87312.h"
diff --git a/hw/riscv/microchip_pfsoc.c b/hw/riscv/microchip_pfsoc.c
index c4146b7a6b38..01537b30ebc9 100644
--- a/hw/riscv/microchip_pfsoc.c
+++ b/hw/riscv/microchip_pfsoc.c
@@ -41,7 +41,6 @@
#include "qemu/cutils.h"
#include "qapi/error.h"
#include "hw/boards.h"
-#include "hw/irq.h"
#include "hw/loader.h"
#include "hw/sysbus.h"
#include "chardev/char.h"
diff --git a/hw/sd/cadence_sdhci.c b/hw/sd/cadence_sdhci.c
index 0b371c843d8e..c89538b491f7 100644
--- a/hw/sd/cadence_sdhci.c
+++ b/hw/sd/cadence_sdhci.c
@@ -26,7 +26,6 @@
#include "qemu/log.h"
#include "qapi/error.h"
#include "migration/vmstate.h"
-#include "hw/irq.h"
#include "hw/sd/cadence_sdhci.h"
#include "sdhci-internal.h"
diff --git a/hw/timer/sse-counter.c b/hw/timer/sse-counter.c
index 0384051f1511..16c0e8ad15db 100644
--- a/hw/timer/sse-counter.c
+++ b/hw/timer/sse-counter.c
@@ -33,7 +33,6 @@
#include "trace.h"
#include "hw/timer/sse-counter.h"
#include "hw/sysbus.h"
-#include "hw/irq.h"
#include "hw/registerfields.h"
#include "hw/clock.h"
#include "hw/qdev-clock.h"
diff --git a/hw/usb/xlnx-usb-subsystem.c b/hw/usb/xlnx-usb-subsystem.c
index 568257370cb0..c760c3058a42 100644
--- a/hw/usb/xlnx-usb-subsystem.c
+++ b/hw/usb/xlnx-usb-subsystem.c
@@ -24,7 +24,6 @@
#include "qemu/osdep.h"
#include "hw/sysbus.h"
-#include "hw/irq.h"
#include "hw/register.h"
#include "qemu/bitops.h"
#include "qemu/log.h"
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PULL 14/23] hw: Do not include qemu/log.h if it is not necessary
2021-05-03 8:36 [PULL 00/23] Trivial branch for 6.1 patches Laurent Vivier
` (12 preceding siblings ...)
2021-05-03 8:36 ` [PULL 13/23] hw: Do not include hw/irq.h " Laurent Vivier
@ 2021-05-03 8:36 ` Laurent Vivier
2021-05-03 8:36 ` [PULL 15/23] Do not include sysemu/sysemu.h if it's not really necessary Laurent Vivier
` (9 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Laurent Vivier @ 2021-05-03 8:36 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Alistair Francis, Thomas Huth, Michael Tokarev,
Laurent Vivier
From: Thomas Huth <thuth@redhat.com>
Many files include qemu/log.h without needing it. Remove the superfluous
include statements.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-Id: <20210328054833.2351597-1-thuth@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/arm/aspeed.c | 1 -
hw/arm/aspeed_ast2600.c | 1 -
hw/arm/aspeed_soc.c | 1 -
hw/arm/exynos4210.c | 1 -
hw/arm/xlnx-versal-virt.c | 1 -
hw/arm/xlnx-versal.c | 1 -
hw/i2c/mpc_i2c.c | 1 -
hw/intc/imx_gpcv2.c | 1 -
hw/intc/ompic.c | 1 -
hw/intc/openpic.c | 1 -
hw/ipmi/isa_ipmi_bt.c | 1 -
hw/ipmi/isa_ipmi_kcs.c | 1 -
hw/mips/fuloong2e.c | 1 -
hw/mips/loongson3_virt.c | 1 -
hw/misc/imx7_snvs.c | 1 -
hw/misc/imx_ccm.c | 1 -
hw/misc/imx_rngc.c | 1 -
hw/misc/pvpanic-isa.c | 1 -
hw/misc/pvpanic-pci.c | 1 -
hw/net/xgmac.c | 1 -
hw/ppc/pnv.c | 1 -
hw/ppc/pnv_pnor.c | 1 -
hw/ppc/ppc405_boards.c | 1 -
hw/ppc/ppc405_uc.c | 1 -
hw/ppc/ppc_booke.c | 1 -
hw/ppc/virtex_ml507.c | 1 -
hw/riscv/microchip_pfsoc.c | 1 -
hw/riscv/numa.c | 1 -
hw/riscv/sifive_e.c | 1 -
hw/riscv/sifive_u.c | 1 -
hw/riscv/spike.c | 1 -
hw/riscv/virt.c | 1 -
hw/sd/cadence_sdhci.c | 1 -
hw/ssi/xilinx_spi.c | 1 -
hw/tricore/tc27x_soc.c | 1 -
hw/usb/chipidea.c | 1 -
hw/usb/hcd-dwc3.c | 1 -
hw/usb/imx-usb-phy.c | 1 -
hw/usb/xlnx-usb-subsystem.c | 1 -
hw/usb/xlnx-versal-usb2-ctrl-regs.c | 1 -
hw/xen/xen-legacy-backend.c | 1 -
net/dump.c | 1 -
net/filter-replay.c | 1 -
semihosting/arm-compat-semi.c | 1 -
target/arm/op_helper.c | 1 -
target/hexagon/cpu.c | 1 -
target/hexagon/decode.c | 1 -
target/hexagon/genptr.c | 1 -
target/lm32/lm32-semi.c | 1 -
target/riscv/op_helper.c | 1 -
target/s390x/interrupt.c | 1 -
51 files changed, 51 deletions(-)
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index a17b75f4940a..c3345fce5366 100644
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -22,7 +22,6 @@
#include "hw/misc/tmp105.h"
#include "hw/misc/led.h"
#include "hw/qdev-properties.h"
-#include "qemu/log.h"
#include "sysemu/block-backend.h"
#include "sysemu/sysemu.h"
#include "hw/loader.h"
diff --git a/hw/arm/aspeed_ast2600.c b/hw/arm/aspeed_ast2600.c
index bc87e754a3cc..504aabf17371 100644
--- a/hw/arm/aspeed_ast2600.c
+++ b/hw/arm/aspeed_ast2600.c
@@ -14,7 +14,6 @@
#include "hw/misc/unimp.h"
#include "hw/arm/aspeed_soc.h"
#include "hw/char/serial.h"
-#include "qemu/log.h"
#include "qemu/module.h"
#include "qemu/error-report.h"
#include "hw/i2c/aspeed_i2c.h"
diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c
index 057d053c8478..516277800c9c 100644
--- a/hw/arm/aspeed_soc.c
+++ b/hw/arm/aspeed_soc.c
@@ -17,7 +17,6 @@
#include "hw/misc/unimp.h"
#include "hw/arm/aspeed_soc.h"
#include "hw/char/serial.h"
-#include "qemu/log.h"
#include "qemu/module.h"
#include "qemu/error-report.h"
#include "hw/i2c/aspeed_i2c.h"
diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c
index ced2769b102a..5c7a51bbad75 100644
--- a/hw/arm/exynos4210.c
+++ b/hw/arm/exynos4210.c
@@ -23,7 +23,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qemu/log.h"
#include "cpu.h"
#include "hw/cpu/a9mpcore.h"
#include "hw/irq.h"
diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c
index 8482cd61960e..73e8268b353b 100644
--- a/hw/arm/xlnx-versal-virt.c
+++ b/hw/arm/xlnx-versal-virt.c
@@ -10,7 +10,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu/log.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
#include "sysemu/device_tree.h"
diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c
index 79609692e4eb..fb776834f7e9 100644
--- a/hw/arm/xlnx-versal.c
+++ b/hw/arm/xlnx-versal.c
@@ -12,7 +12,6 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
#include "qapi/error.h"
-#include "qemu/log.h"
#include "qemu/module.h"
#include "hw/sysbus.h"
#include "net/net.h"
diff --git a/hw/i2c/mpc_i2c.c b/hw/i2c/mpc_i2c.c
index 720d2331e952..845392505ff2 100644
--- a/hw/i2c/mpc_i2c.c
+++ b/hw/i2c/mpc_i2c.c
@@ -20,7 +20,6 @@
#include "qemu/osdep.h"
#include "hw/i2c/i2c.h"
#include "hw/irq.h"
-#include "qemu/log.h"
#include "qemu/module.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
diff --git a/hw/intc/imx_gpcv2.c b/hw/intc/imx_gpcv2.c
index 17007a407803..237d5f97eba3 100644
--- a/hw/intc/imx_gpcv2.c
+++ b/hw/intc/imx_gpcv2.c
@@ -12,7 +12,6 @@
#include "qemu/osdep.h"
#include "hw/intc/imx_gpcv2.h"
#include "migration/vmstate.h"
-#include "qemu/log.h"
#include "qemu/module.h"
#define GPC_PU_PGC_SW_PUP_REQ 0x0f8
diff --git a/hw/intc/ompic.c b/hw/intc/ompic.c
index 1731a1068385..1f10314807d8 100644
--- a/hw/intc/ompic.c
+++ b/hw/intc/ompic.c
@@ -7,7 +7,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu/log.h"
#include "qemu/module.h"
#include "qapi/error.h"
#include "hw/irq.h"
diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c
index 65970e1b3781..9b4c17854d29 100644
--- a/hw/intc/openpic.c
+++ b/hw/intc/openpic.c
@@ -47,7 +47,6 @@
#include "qapi/error.h"
#include "qemu/bitops.h"
#include "qapi/qmp/qerror.h"
-#include "qemu/log.h"
#include "qemu/module.h"
#include "qemu/timer.h"
#include "qemu/error-report.h"
diff --git a/hw/ipmi/isa_ipmi_bt.c b/hw/ipmi/isa_ipmi_bt.c
index b7c2ad557b2c..02625eb94ed2 100644
--- a/hw/ipmi/isa_ipmi_bt.c
+++ b/hw/ipmi/isa_ipmi_bt.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu/log.h"
#include "qemu/module.h"
#include "qapi/error.h"
#include "hw/irq.h"
diff --git a/hw/ipmi/isa_ipmi_kcs.c b/hw/ipmi/isa_ipmi_kcs.c
index 7dd6bf0040a4..3b23ad08b348 100644
--- a/hw/ipmi/isa_ipmi_kcs.c
+++ b/hw/ipmi/isa_ipmi_kcs.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu/log.h"
#include "qemu/module.h"
#include "qapi/error.h"
#include "hw/irq.h"
diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c
index 4f61f2c873b2..1851eb0944b1 100644
--- a/hw/mips/fuloong2e.c
+++ b/hw/mips/fuloong2e.c
@@ -33,7 +33,6 @@
#include "hw/mips/bootloader.h"
#include "hw/mips/cpudevs.h"
#include "hw/pci/pci.h"
-#include "qemu/log.h"
#include "hw/loader.h"
#include "hw/ide/pci.h"
#include "hw/qdev-properties.h"
diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c
index b15071defc65..f9c0873a9865 100644
--- a/hw/mips/loongson3_virt.c
+++ b/hw/mips/loongson3_virt.c
@@ -54,7 +54,6 @@
#include "sysemu/qtest.h"
#include "sysemu/reset.h"
#include "sysemu/runstate.h"
-#include "qemu/log.h"
#include "qemu/error-report.h"
#define PM_CNTL_MODE 0x10
diff --git a/hw/misc/imx7_snvs.c b/hw/misc/imx7_snvs.c
index 45972a592029..ee7698bd9cdf 100644
--- a/hw/misc/imx7_snvs.c
+++ b/hw/misc/imx7_snvs.c
@@ -14,7 +14,6 @@
#include "qemu/osdep.h"
#include "hw/misc/imx7_snvs.h"
-#include "qemu/log.h"
#include "qemu/module.h"
#include "sysemu/runstate.h"
diff --git a/hw/misc/imx_ccm.c b/hw/misc/imx_ccm.c
index 08a50ee4c8ae..9403c5daa360 100644
--- a/hw/misc/imx_ccm.c
+++ b/hw/misc/imx_ccm.c
@@ -13,7 +13,6 @@
#include "qemu/osdep.h"
#include "hw/misc/imx_ccm.h"
-#include "qemu/log.h"
#include "qemu/module.h"
#ifndef DEBUG_IMX_CCM
diff --git a/hw/misc/imx_rngc.c b/hw/misc/imx_rngc.c
index 4c270df2db07..632c03779cbb 100644
--- a/hw/misc/imx_rngc.c
+++ b/hw/misc/imx_rngc.c
@@ -14,7 +14,6 @@
#include "qemu/osdep.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"
-#include "qemu/log.h"
#include "qemu/guest-random.h"
#include "hw/irq.h"
#include "hw/misc/imx_rngc.h"
diff --git a/hw/misc/pvpanic-isa.c b/hw/misc/pvpanic-isa.c
index 27113abd6cfb..7b66d58acc80 100644
--- a/hw/misc/pvpanic-isa.c
+++ b/hw/misc/pvpanic-isa.c
@@ -13,7 +13,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu/log.h"
#include "qemu/module.h"
#include "sysemu/runstate.h"
diff --git a/hw/misc/pvpanic-pci.c b/hw/misc/pvpanic-pci.c
index d629639d8f49..af8cbe283055 100644
--- a/hw/misc/pvpanic-pci.c
+++ b/hw/misc/pvpanic-pci.c
@@ -12,7 +12,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu/log.h"
#include "qemu/module.h"
#include "sysemu/runstate.h"
diff --git a/hw/net/xgmac.c b/hw/net/xgmac.c
index 00859a7d508c..0ab6ae91aa11 100644
--- a/hw/net/xgmac.c
+++ b/hw/net/xgmac.c
@@ -29,7 +29,6 @@
#include "hw/qdev-properties.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
-#include "qemu/log.h"
#include "qemu/module.h"
#include "net/net.h"
#include "qom/object.h"
diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index 77af846cdfea..6faf1fe4733d 100644
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -32,7 +32,6 @@
#include "sysemu/device_tree.h"
#include "sysemu/hw_accel.h"
#include "target/ppc/cpu.h"
-#include "qemu/log.h"
#include "hw/ppc/fdt.h"
#include "hw/ppc/ppc.h"
#include "hw/ppc/pnv.h"
diff --git a/hw/ppc/pnv_pnor.c b/hw/ppc/pnv_pnor.c
index 4b455de1ea77..5ef1cf2afbe1 100644
--- a/hw/ppc/pnv_pnor.c
+++ b/hw/ppc/pnv_pnor.c
@@ -10,7 +10,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
-#include "qemu/log.h"
#include "qemu/units.h"
#include "sysemu/block-backend.h"
#include "sysemu/blockdev.h"
diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c
index 8f77887fb18b..f4e804cdb528 100644
--- a/hw/ppc/ppc405_boards.c
+++ b/hw/ppc/ppc405_boards.c
@@ -39,7 +39,6 @@
#include "sysemu/reset.h"
#include "sysemu/block-backend.h"
#include "hw/boards.h"
-#include "qemu/log.h"
#include "qemu/error-report.h"
#include "hw/loader.h"
#include "exec/address-spaces.h"
diff --git a/hw/ppc/ppc405_uc.c b/hw/ppc/ppc405_uc.c
index fe047074a174..e632c408bdf8 100644
--- a/hw/ppc/ppc405_uc.c
+++ b/hw/ppc/ppc405_uc.c
@@ -34,7 +34,6 @@
#include "qemu/timer.h"
#include "sysemu/reset.h"
#include "sysemu/sysemu.h"
-#include "qemu/log.h"
#include "exec/address-spaces.h"
#include "hw/intc/ppc-uic.h"
#include "hw/qdev-properties.h"
diff --git a/hw/ppc/ppc_booke.c b/hw/ppc/ppc_booke.c
index 974c0c8a7528..10b643861f23 100644
--- a/hw/ppc/ppc_booke.c
+++ b/hw/ppc/ppc_booke.c
@@ -28,7 +28,6 @@
#include "qemu/timer.h"
#include "sysemu/reset.h"
#include "sysemu/runstate.h"
-#include "qemu/log.h"
#include "hw/loader.h"
#include "kvm_ppc.h"
diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
index cb421570dab3..3a57604ac03e 100644
--- a/hw/ppc/virtex_ml507.c
+++ b/hw/ppc/virtex_ml507.c
@@ -38,7 +38,6 @@
#include "elf.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
-#include "qemu/log.h"
#include "qemu/option.h"
#include "exec/address-spaces.h"
diff --git a/hw/riscv/microchip_pfsoc.c b/hw/riscv/microchip_pfsoc.c
index 01537b30ebc9..6cbd17ebf2e8 100644
--- a/hw/riscv/microchip_pfsoc.c
+++ b/hw/riscv/microchip_pfsoc.c
@@ -36,7 +36,6 @@
#include "qemu/osdep.h"
#include "qemu/error-report.h"
-#include "qemu/log.h"
#include "qemu/units.h"
#include "qemu/cutils.h"
#include "qapi/error.h"
diff --git a/hw/riscv/numa.c b/hw/riscv/numa.c
index 4f92307102ff..7fe92d402f69 100644
--- a/hw/riscv/numa.c
+++ b/hw/riscv/numa.c
@@ -18,7 +18,6 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
-#include "qemu/log.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
#include "hw/boards.h"
diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c
index f939bcf9ea67..97e8b0b0a2c7 100644
--- a/hw/riscv/sifive_e.c
+++ b/hw/riscv/sifive_e.c
@@ -29,7 +29,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu/log.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
#include "hw/boards.h"
diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c
index 7b59942369cc..698637e8e141 100644
--- a/hw/riscv/sifive_u.c
+++ b/hw/riscv/sifive_u.c
@@ -35,7 +35,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu/log.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
#include "qapi/visitor.h"
diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c
index ec7cb2f70748..fe0806a476d3 100644
--- a/hw/riscv/spike.c
+++ b/hw/riscv/spike.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu/log.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
#include "hw/boards.h"
diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
index c0dc69ff33de..95a11adaa2f2 100644
--- a/hw/riscv/virt.c
+++ b/hw/riscv/virt.c
@@ -20,7 +20,6 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
-#include "qemu/log.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
#include "hw/boards.h"
diff --git a/hw/sd/cadence_sdhci.c b/hw/sd/cadence_sdhci.c
index c89538b491f7..56b8bae1c3ff 100644
--- a/hw/sd/cadence_sdhci.c
+++ b/hw/sd/cadence_sdhci.c
@@ -23,7 +23,6 @@
#include "qemu/osdep.h"
#include "qemu/bitops.h"
#include "qemu/error-report.h"
-#include "qemu/log.h"
#include "qapi/error.h"
#include "migration/vmstate.h"
#include "hw/sd/cadence_sdhci.h"
diff --git a/hw/ssi/xilinx_spi.c b/hw/ssi/xilinx_spi.c
index 49ff27559355..b2819a7ff092 100644
--- a/hw/ssi/xilinx_spi.c
+++ b/hw/ssi/xilinx_spi.c
@@ -27,7 +27,6 @@
#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
-#include "qemu/log.h"
#include "qemu/module.h"
#include "qemu/fifo8.h"
diff --git a/hw/tricore/tc27x_soc.c b/hw/tricore/tc27x_soc.c
index 8af079e6b25a..dea9ba3cca79 100644
--- a/hw/tricore/tc27x_soc.c
+++ b/hw/tricore/tc27x_soc.c
@@ -26,7 +26,6 @@
#include "qemu/units.h"
#include "hw/misc/unimp.h"
#include "exec/address-spaces.h"
-#include "qemu/log.h"
#include "cpu.h"
#include "hw/tricore/tc27x_soc.h"
diff --git a/hw/usb/chipidea.c b/hw/usb/chipidea.c
index 3dcd22ccba87..b1c85404d6fa 100644
--- a/hw/usb/chipidea.c
+++ b/hw/usb/chipidea.c
@@ -12,7 +12,6 @@
#include "qemu/osdep.h"
#include "hw/usb/hcd-ehci.h"
#include "hw/usb/chipidea.h"
-#include "qemu/log.h"
#include "qemu/module.h"
enum {
diff --git a/hw/usb/hcd-dwc3.c b/hw/usb/hcd-dwc3.c
index d547d0538ddf..279263489e46 100644
--- a/hw/usb/hcd-dwc3.c
+++ b/hw/usb/hcd-dwc3.c
@@ -31,7 +31,6 @@
#include "hw/sysbus.h"
#include "hw/register.h"
#include "qemu/bitops.h"
-#include "qemu/log.h"
#include "qom/object.h"
#include "migration/vmstate.h"
#include "hw/qdev-properties.h"
diff --git a/hw/usb/imx-usb-phy.c b/hw/usb/imx-usb-phy.c
index e705a03a1fc5..5d7a549e34d1 100644
--- a/hw/usb/imx-usb-phy.c
+++ b/hw/usb/imx-usb-phy.c
@@ -13,7 +13,6 @@
#include "qemu/osdep.h"
#include "hw/usb/imx-usb-phy.h"
#include "migration/vmstate.h"
-#include "qemu/log.h"
#include "qemu/module.h"
static const VMStateDescription vmstate_imx_usbphy = {
diff --git a/hw/usb/xlnx-usb-subsystem.c b/hw/usb/xlnx-usb-subsystem.c
index c760c3058a42..d8deeb6ced55 100644
--- a/hw/usb/xlnx-usb-subsystem.c
+++ b/hw/usb/xlnx-usb-subsystem.c
@@ -26,7 +26,6 @@
#include "hw/sysbus.h"
#include "hw/register.h"
#include "qemu/bitops.h"
-#include "qemu/log.h"
#include "qom/object.h"
#include "qapi/error.h"
#include "hw/qdev-properties.h"
diff --git a/hw/usb/xlnx-versal-usb2-ctrl-regs.c b/hw/usb/xlnx-versal-usb2-ctrl-regs.c
index 9eaa59ebb8b0..1c094aa1a63f 100644
--- a/hw/usb/xlnx-versal-usb2-ctrl-regs.c
+++ b/hw/usb/xlnx-versal-usb2-ctrl-regs.c
@@ -32,7 +32,6 @@
#include "hw/irq.h"
#include "hw/register.h"
#include "qemu/bitops.h"
-#include "qemu/log.h"
#include "qom/object.h"
#include "migration/vmstate.h"
#include "hw/usb/xlnx-versal-usb2-ctrl-regs.h"
diff --git a/hw/xen/xen-legacy-backend.c b/hw/xen/xen-legacy-backend.c
index b61a4855b7b8..dd8ae1452d1e 100644
--- a/hw/xen/xen-legacy-backend.c
+++ b/hw/xen/xen-legacy-backend.c
@@ -27,7 +27,6 @@
#include "hw/sysbus.h"
#include "hw/boards.h"
#include "hw/qdev-properties.h"
-#include "qemu/log.h"
#include "qemu/main-loop.h"
#include "qapi/error.h"
#include "hw/xen/xen-legacy-backend.h"
diff --git a/net/dump.c b/net/dump.c
index 4d538d82a696..a07ba624011c 100644
--- a/net/dump.c
+++ b/net/dump.c
@@ -28,7 +28,6 @@
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "qemu/iov.h"
-#include "qemu/log.h"
#include "qemu/module.h"
#include "qemu/timer.h"
#include "qapi/visitor.h"
diff --git a/net/filter-replay.c b/net/filter-replay.c
index eef8443059b5..54690676ef0d 100644
--- a/net/filter-replay.c
+++ b/net/filter-replay.c
@@ -13,7 +13,6 @@
#include "clients.h"
#include "qemu/error-report.h"
#include "qemu/iov.h"
-#include "qemu/log.h"
#include "qemu/module.h"
#include "qemu/timer.h"
#include "qapi/visitor.h"
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index fe079ca93abe..f9c87245b82c 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -37,7 +37,6 @@
#include "semihosting/semihost.h"
#include "semihosting/console.h"
#include "semihosting/common-semi.h"
-#include "qemu/log.h"
#include "qemu/timer.h"
#ifdef CONFIG_USER_ONLY
#include "qemu.h"
diff --git a/target/arm/op_helper.c b/target/arm/op_helper.c
index 65cb37d088f8..78b831f1811d 100644
--- a/target/arm/op_helper.c
+++ b/target/arm/op_helper.c
@@ -17,7 +17,6 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "qemu/osdep.h"
-#include "qemu/log.h"
#include "qemu/main-loop.h"
#include "cpu.h"
#include "exec/helper-proto.h"
diff --git a/target/hexagon/cpu.c b/target/hexagon/cpu.c
index b0b3040dd130..543fceb41c74 100644
--- a/target/hexagon/cpu.c
+++ b/target/hexagon/cpu.c
@@ -16,7 +16,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu/log.h"
#include "qemu/qemu-print.h"
#include "cpu.h"
#include "internal.h"
diff --git a/target/hexagon/decode.c b/target/hexagon/decode.c
index c9bacaa1eef6..9bcc8c9f3280 100644
--- a/target/hexagon/decode.c
+++ b/target/hexagon/decode.c
@@ -16,7 +16,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu/log.h"
#include "iclass.h"
#include "attribs.h"
#include "genptr.h"
diff --git a/target/hexagon/genptr.c b/target/hexagon/genptr.c
index 7481f4c1dd31..cea1f221e26c 100644
--- a/target/hexagon/genptr.c
+++ b/target/hexagon/genptr.c
@@ -17,7 +17,6 @@
#define QEMU_GENERATE
#include "qemu/osdep.h"
-#include "qemu/log.h"
#include "cpu.h"
#include "internal.h"
#include "tcg/tcg-op.h"
diff --git a/target/lm32/lm32-semi.c b/target/lm32/lm32-semi.c
index 6a11a6299ad6..661a77024906 100644
--- a/target/lm32/lm32-semi.c
+++ b/target/lm32/lm32-semi.c
@@ -13,7 +13,6 @@
#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/helper-proto.h"
-#include "qemu/log.h"
#include "exec/softmmu-semi.h"
enum {
diff --git a/target/riscv/op_helper.c b/target/riscv/op_helper.c
index 1eddcb94de7e..f0bbd73ca521 100644
--- a/target/riscv/op_helper.c
+++ b/target/riscv/op_helper.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu/log.h"
#include "cpu.h"
#include "qemu/main-loop.h"
#include "exec/exec-all.h"
diff --git a/target/s390x/interrupt.c b/target/s390x/interrupt.c
index 4cdbbc8849a2..9b4d08f2be37 100644
--- a/target/s390x/interrupt.c
+++ b/target/s390x/interrupt.c
@@ -8,7 +8,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu/log.h"
#include "cpu.h"
#include "kvm_s390x.h"
#include "internal.h"
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PULL 15/23] Do not include sysemu/sysemu.h if it's not really necessary
2021-05-03 8:36 [PULL 00/23] Trivial branch for 6.1 patches Laurent Vivier
` (13 preceding siblings ...)
2021-05-03 8:36 ` [PULL 14/23] hw: Do not include qemu/log.h " Laurent Vivier
@ 2021-05-03 8:36 ` Laurent Vivier
2021-05-03 8:36 ` [PULL 16/23] Do not include hw/boards.h " Laurent Vivier
` (8 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Laurent Vivier @ 2021-05-03 8:36 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Thomas Huth, Michael Tokarev, Laurent Vivier
From: Thomas Huth <thuth@redhat.com>
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>
---
accel/kvm/kvm-all.c | 1 -
accel/tcg/user-exec-stub.c | 1 -
backends/hostmem-file.c | 1 -
backends/hostmem-memfd.c | 1 -
backends/hostmem.c | 1 -
block.c | 1 -
block/block-backend.c | 1 -
block/nfs.c | 1 -
chardev/char-mux.c | 1 -
chardev/char.c | 1 -
gdbstub.c | 1 -
hw/alpha/dp264.c | 1 -
hw/arm/aspeed.c | 1 -
hw/arm/cubieboard.c | 1 -
hw/arm/digic_boards.c | 1 -
hw/arm/exynos4_boards.c | 1 -
hw/arm/mcimx6ul-evk.c | 1 -
hw/arm/mcimx7d-sabre.c | 1 -
hw/arm/npcm7xx_boards.c | 1 -
hw/arm/orangepi.c | 1 -
hw/arm/raspi.c | 1 -
hw/arm/sabrelite.c | 1 -
hw/arm/virt.c | 1 -
hw/block/nvme-subsys.c | 1 -
hw/core/machine-qmp-cmds.c | 1 -
hw/core/null-machine.c | 1 -
hw/core/numa.c | 1 -
hw/i386/pc_piix.c | 1 -
hw/i386/pc_sysfw.c | 1 -
hw/input/lasips2.c | 1 -
hw/intc/sifive_plic.c | 1 -
hw/isa/isa-superio.c | 1 -
hw/isa/piix3.c | 1 -
hw/m68k/next-kbd.c | 1 -
hw/microblaze/boot.c | 1 -
hw/mips/malta.c | 1 -
hw/misc/macio/macio.c | 1 -
hw/net/can/xlnx-zynqmp-can.c | 1 -
hw/net/i82596.c | 1 -
hw/net/lasi_i82596.c | 1 -
hw/nios2/boot.c | 1 -
hw/ppc/ppc405_boards.c | 1 -
hw/ppc/prep.c | 1 -
hw/rx/rx-gdbsim.c | 1 -
hw/s390x/ipl.c | 1 -
hw/s390x/sclp.c | 1 -
hw/sh4/shix.c | 1 -
hw/ssi/sifive_spi.c | 1 -
hw/vfio/display.c | 1 -
hw/vfio/pci.c | 1 -
hw/xtensa/virt.c | 1 -
migration/ram.c | 1 -
monitor/monitor.c | 1 -
net/net.c | 2 --
net/netmap.c | 1 -
plugins/api.c | 1 -
plugins/core.c | 1 -
semihosting/config.c | 1 -
semihosting/console.c | 1 -
softmmu/arch_init.c | 1 -
softmmu/device_tree.c | 1 -
softmmu/physmem.c | 1 -
softmmu/qdev-monitor.c | 1 -
stubs/semihost.c | 1 -
target/arm/cpu.c | 1 -
target/openrisc/sys_helper.c | 1 -
target/rx/helper.c | 1 -
target/s390x/cpu.c | 1 -
target/s390x/excp_helper.c | 1 -
tcg/tcg.c | 1 -
tests/qtest/fuzz/fuzz.c | 1 -
tests/qtest/fuzz/qos_fuzz.c | 1 -
util/oslib-win32.c | 1 -
73 files changed, 74 deletions(-)
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 93d7cbfeaf88..50e56664cc6d 100644
--- 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 b876f5c1e45d..968cd3ca60d7 100644
--- 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 b683da9daf81..9b1b9f0a5604 100644
--- 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 69b0ae30bb08..da75e270573f 100644
--- 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 c6c1ff5b99c2..aab3de84083e 100644
--- 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 874c22c43e3d..9ad725d2057d 100644
--- 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 6fca9853e125..de5496af66fc 100644
--- 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 8c1968bb415d..7dff64f48962 100644
--- 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 72beef29d21c..5baf41901083 100644
--- 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 398f09df19cd..a4ebfcc5ac20 100644
--- 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 054665e93ea6..9103ffc9028d 100644
--- 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 c8e300d93f61..1017ecf330db 100644
--- 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 c3345fce5366..c4f85dab63b3 100644
--- 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 3ec30ca5afa4..9e872135ae72 100644
--- 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 6cdc1d83fcac..65d3a9ba740b 100644
--- 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 56b729141b51..8ae136bbdf36 100644
--- 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 ed69a7b037ad..ce16b6b31744 100644
--- 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 e57d52b3441c..e896222c34c9 100644
--- 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 e22fe4bf8f06..d91d6877001e 100644
--- 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 b8d38c9e8d04..6ccb61c149ec 100644
--- 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 990509d38521..1b7e9c4cb418 100644
--- 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 a3dbf85e0edb..42348e5cb15b 100644
--- 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 fee696fb0e34..881969af6b25 100644
--- 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 283a97b79d57..9604c19117de 100644
--- 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 68a942595a26..2ad004430e4a 100644
--- 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 7e693523d752..f586a4bef543 100644
--- 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 68cee65f6143..ac6bed5817f8 100644
--- 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 4e8edffeaf66..ac24f70a5dc7 100644
--- 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 9fe72b370e8e..6ce37a2b052d 100644
--- 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 275737842e95..e7faf24058b4 100644
--- 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 97a1a27a9acd..6a53e6329924 100644
--- 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 179c1856956b..c81bfe58ef8d 100644
--- 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 f46ccae25cf7..dab901c9ad99 100644
--- 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 bee40e25bca0..30a8c9fbfabf 100644
--- 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 caaba1aa4c1d..8821d009f1a9 100644
--- 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 26e7b1bd9f64..5adb67ad2a42 100644
--- 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 e6eeb575d53c..4515296e66a6 100644
--- 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 affa21a5ed35..22bb8910fa8c 100644
--- 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 055c3a1470ca..ec21e2699a18 100644
--- 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 820b63f35098..e37f7fabe952 100644
--- 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 d9969ac14828..95bdc18052c8 100644
--- 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 f4e804cdb528..8da7bc7af971 100644
--- 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 af4ccb9f431f..b41570c7472b 100644
--- 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 9b82feff5284..1f53fdb08289 100644
--- 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 ff6b55e8167d..f12af5e35b88 100644
--- 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 0cf229082670..f57340a7d789 100644
--- 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 d9a9fcbc5989..1a44378df421 100644
--- 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 0c9ebca3c86c..03540cf5ca66 100644
--- 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 f04473e3cece..89bc90508fb8 100644
--- 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 5c65aa0a98e2..ab4077aad23e 100644
--- 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 e47e1de67671..bbf6200c4964 100644
--- 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 4682f3625c4d..9e9b7380bf6c 100644
--- 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 636bcc81c5ba..b90c0f40516f 100644
--- 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 edf9b954185f..2a472604ecec 100644
--- 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 350f097f91c1..9e0cec58d379 100644
--- 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 b22998cd7c91..218e1342cda3 100644
--- 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 87b823bbc470..93b595a8d684 100644
--- 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 3548e0f627f4..137171b717b2 100644
--- 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 c9ebd6fdd053..a78af6938727 100644
--- 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 7fd5c09b2b93..8471711c54cc 100644
--- 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 2691c58cf633..b621f63fbac8 100644
--- 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 85034d9c11e3..7ed276b9b5f9 100644
--- 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 a9955b97a078..721dec2d8200 100644
--- 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 1b30f38b03d1..4bf2cf71b9b4 100644
--- 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 0dd623e59094..4eb0d2f85c4d 100644
--- 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 41390d046f64..48674231e743 100644
--- 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 3e380a94fe60..db6b07e38900 100644
--- 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 d35eb39a1bbd..64455cf309af 100644
--- 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 c48cd6b46f49..20625c2c8f6b 100644
--- 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 1fbe0b686d57..cc947bf6f6a2 100644
--- 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 496d11a23131..04b70e114bf9 100644
--- 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 cee1a2a60f62..2bc474645c56 100644
--- 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 f68b8012bb8c..1fc42ec0e388 100644
--- 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"
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PULL 16/23] Do not include hw/boards.h if it's not really necessary
2021-05-03 8:36 [PULL 00/23] Trivial branch for 6.1 patches Laurent Vivier
` (14 preceding siblings ...)
2021-05-03 8:36 ` [PULL 15/23] Do not include sysemu/sysemu.h if it's not really necessary Laurent Vivier
@ 2021-05-03 8:36 ` Laurent Vivier
2021-05-03 8:36 ` [PULL 17/23] Do not include cpu.h " Laurent Vivier
` (7 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Laurent Vivier @ 2021-05-03 8:36 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Thomas Huth, Michael Tokarev, Laurent Vivier
From: Thomas Huth <thuth@redhat.com>
Stop including hw/boards.h in files that don't need it.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210416171314.2074665-3-thuth@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
accel/tcg/tcg-accel-ops-icount.c | 1 -
accel/tcg/tcg-accel-ops-rr.c | 1 -
accel/tcg/tcg-accel-ops.c | 1 -
hw/acpi/cpu.c | 1 -
hw/acpi/memory_hotplug.c | 1 -
hw/alpha/typhoon.c | 1 -
hw/arm/aspeed.c | 1 -
hw/arm/omap1.c | 1 -
hw/arm/omap2.c | 1 -
hw/arm/strongarm.c | 1 -
hw/arm/virt.c | 1 -
hw/avr/arduino.c | 1 -
hw/avr/atmega.c | 1 -
hw/display/next-fb.c | 1 -
hw/hppa/machine.c | 1 -
hw/i386/acpi-build.c | 1 -
hw/i386/acpi-microvm.c | 1 -
hw/i386/intel_iommu.c | 1 -
hw/i386/pc.c | 1 -
hw/i386/x86-iommu.c | 1 -
hw/intc/sifive_plic.c | 1 -
hw/mips/loongson3_virt.c | 1 -
hw/ppc/e500.c | 1 -
hw/ppc/mac_newworld.c | 1 -
hw/ppc/mac_oldworld.c | 1 -
hw/ppc/pnv.c | 1 -
hw/ppc/ppc4xx_devs.c | 1 -
hw/ppc/rs6000_mc.c | 1 -
hw/ppc/spapr.c | 1 -
hw/ppc/spapr_rtas.c | 1 -
hw/remote/iohub.c | 1 -
hw/s390x/s390-virtio-ccw.c | 2 --
hw/tricore/tc27x_soc.c | 1 -
hw/tricore/triboard.c | 1 -
softmmu/vl.c | 1 -
35 files changed, 36 deletions(-)
diff --git a/accel/tcg/tcg-accel-ops-icount.c b/accel/tcg/tcg-accel-ops-icount.c
index 13b8fbeb699d..ea42d1d51b10 100644
--- a/accel/tcg/tcg-accel-ops-icount.c
+++ b/accel/tcg/tcg-accel-ops-icount.c
@@ -30,7 +30,6 @@
#include "qemu/main-loop.h"
#include "qemu/guest-random.h"
#include "exec/exec-all.h"
-#include "hw/boards.h"
#include "tcg-accel-ops.h"
#include "tcg-accel-ops-icount.h"
diff --git a/accel/tcg/tcg-accel-ops-rr.c b/accel/tcg/tcg-accel-ops-rr.c
index 018b54c508fa..c02c061ecb35 100644
--- a/accel/tcg/tcg-accel-ops-rr.c
+++ b/accel/tcg/tcg-accel-ops-rr.c
@@ -30,7 +30,6 @@
#include "qemu/main-loop.h"
#include "qemu/guest-random.h"
#include "exec/exec-all.h"
-#include "hw/boards.h"
#include "tcg-accel-ops.h"
#include "tcg-accel-ops-rr.h"
diff --git a/accel/tcg/tcg-accel-ops.c b/accel/tcg/tcg-accel-ops.c
index 6cdcaa2855c8..7191315aeed4 100644
--- a/accel/tcg/tcg-accel-ops.c
+++ b/accel/tcg/tcg-accel-ops.c
@@ -32,7 +32,6 @@
#include "qemu/main-loop.h"
#include "qemu/guest-random.h"
#include "exec/exec-all.h"
-#include "hw/boards.h"
#include "tcg-accel-ops.h"
#include "tcg-accel-ops-mttcg.h"
diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c
index e2317be546b3..f82e9512fdf5 100644
--- a/hw/acpi/cpu.c
+++ b/hw/acpi/cpu.c
@@ -1,5 +1,4 @@
#include "qemu/osdep.h"
-#include "hw/boards.h"
#include "migration/vmstate.h"
#include "hw/acpi/cpu.h"
#include "qapi/error.h"
diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c
index 0bdcf15528f3..af3788942350 100644
--- a/hw/acpi/memory_hotplug.c
+++ b/hw/acpi/memory_hotplug.c
@@ -2,7 +2,6 @@
#include "hw/acpi/memory_hotplug.h"
#include "hw/acpi/pc-hotplug.h"
#include "hw/mem/pc-dimm.h"
-#include "hw/boards.h"
#include "hw/qdev-core.h"
#include "migration/vmstate.h"
#include "trace.h"
diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c
index a42b31981216..96c35c5fdbd8 100644
--- a/hw/alpha/typhoon.c
+++ b/hw/alpha/typhoon.c
@@ -11,7 +11,6 @@
#include "qemu/units.h"
#include "qapi/error.h"
#include "cpu.h"
-#include "hw/boards.h"
#include "hw/irq.h"
#include "alpha_sys.h"
#include "exec/address-spaces.h"
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index c4f85dab63b3..b1e5bc76e4d2 100644
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -16,7 +16,6 @@
#include "hw/arm/boot.h"
#include "hw/arm/aspeed.h"
#include "hw/arm/aspeed_soc.h"
-#include "hw/boards.h"
#include "hw/i2c/smbus_eeprom.h"
#include "hw/misc/pca9552.h"
#include "hw/misc/tmp105.h"
diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c
index 02c0f66431b9..180d3788f891 100644
--- a/hw/arm/omap1.c
+++ b/hw/arm/omap1.c
@@ -24,7 +24,6 @@
#include "qemu-common.h"
#include "cpu.h"
#include "exec/address-spaces.h"
-#include "hw/boards.h"
#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/qdev-properties.h"
diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c
index 16d388fc79d5..02b1aa8c974b 100644
--- a/hw/arm/omap2.c
+++ b/hw/arm/omap2.c
@@ -27,7 +27,6 @@
#include "sysemu/qtest.h"
#include "sysemu/reset.h"
#include "sysemu/runstate.h"
-#include "hw/boards.h"
#include "hw/irq.h"
#include "hw/qdev-properties.h"
#include "hw/arm/boot.h"
diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c
index e3e3ea61634f..939a57dda558 100644
--- a/hw/arm/strongarm.c
+++ b/hw/arm/strongarm.c
@@ -30,7 +30,6 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
#include "cpu.h"
-#include "hw/boards.h"
#include "hw/irq.h"
#include "hw/qdev-properties.h"
#include "hw/qdev-properties-system.h"
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 881969af6b25..d8cfdf23c622 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -36,7 +36,6 @@
#include "monitor/qdev.h"
#include "qapi/error.h"
#include "hw/sysbus.h"
-#include "hw/boards.h"
#include "hw/arm/boot.h"
#include "hw/arm/primecell.h"
#include "hw/arm/virt.h"
diff --git a/hw/avr/arduino.c b/hw/avr/arduino.c
index 3ff31492fa6d..48ef478346e9 100644
--- a/hw/avr/arduino.c
+++ b/hw/avr/arduino.c
@@ -12,7 +12,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "hw/boards.h"
#include "atmega.h"
#include "boot.h"
#include "qom/object.h"
diff --git a/hw/avr/atmega.c b/hw/avr/atmega.c
index 44c6afebbb66..80b8a41cb5a5 100644
--- a/hw/avr/atmega.c
+++ b/hw/avr/atmega.c
@@ -18,7 +18,6 @@
#include "hw/qdev-properties.h"
#include "hw/sysbus.h"
#include "qom/object.h"
-#include "hw/boards.h" /* FIXME memory_region_allocate_system_memory for sram */
#include "hw/misc/unimp.h"
#include "atmega.h"
diff --git a/hw/display/next-fb.c b/hw/display/next-fb.c
index cc134c2d5beb..dd6a1aa8aeeb 100644
--- a/hw/display/next-fb.c
+++ b/hw/display/next-fb.c
@@ -24,7 +24,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "ui/console.h"
-#include "hw/boards.h"
#include "hw/loader.h"
#include "framebuffer.h"
#include "ui/pixel_ops.h"
diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index f2b71db9bd79..2a46af5bc9b7 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -9,7 +9,6 @@
#include "cpu.h"
#include "elf.h"
#include "hw/loader.h"
-#include "hw/boards.h"
#include "qemu/error-report.h"
#include "sysemu/reset.h"
#include "sysemu/sysemu.h"
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index de98750aeff6..bfecb0038cb9 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -43,7 +43,6 @@
#include "sysemu/tpm.h"
#include "hw/acpi/tpm.h"
#include "hw/acpi/vmgenid.h"
-#include "hw/boards.h"
#include "sysemu/tpm_backend.h"
#include "hw/rtc/mc146818rtc_regs.h"
#include "migration/vmstate.h"
diff --git a/hw/i386/acpi-microvm.c b/hw/i386/acpi-microvm.c
index ccd3303aacac..1a0f77b91111 100644
--- a/hw/i386/acpi-microvm.c
+++ b/hw/i386/acpi-microvm.c
@@ -30,7 +30,6 @@
#include "hw/acpi/bios-linker-loader.h"
#include "hw/acpi/generic_event_device.h"
#include "hw/acpi/utils.h"
-#include "hw/boards.h"
#include "hw/i386/fw_cfg.h"
#include "hw/i386/microvm.h"
#include "hw/pci/pci.h"
diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
index 6be8f3291854..1c106434325d 100644
--- a/hw/i386/intel_iommu.c
+++ b/hw/i386/intel_iommu.c
@@ -31,7 +31,6 @@
#include "hw/qdev-properties.h"
#include "hw/i386/pc.h"
#include "hw/i386/apic-msidef.h"
-#include "hw/boards.h"
#include "hw/i386/x86-iommu.h"
#include "hw/pci-host/q35.h"
#include "sysemu/kvm.h"
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 364816efc9d2..88ca37bb6591 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -74,7 +74,6 @@
#include "qemu/cutils.h"
#include "hw/acpi/acpi.h"
#include "hw/acpi/cpu_hotplug.h"
-#include "hw/boards.h"
#include "acpi-build.h"
#include "hw/mem/pc-dimm.h"
#include "hw/mem/nvdimm.h"
diff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c
index 5f4301639c5b..86ad03972e70 100644
--- a/hw/i386/x86-iommu.c
+++ b/hw/i386/x86-iommu.c
@@ -19,7 +19,6 @@
#include "qemu/osdep.h"
#include "hw/sysbus.h"
-#include "hw/boards.h"
#include "hw/i386/x86-iommu.h"
#include "hw/qdev-properties.h"
#include "hw/i386/pc.h"
diff --git a/hw/intc/sifive_plic.c b/hw/intc/sifive_plic.c
index 6a53e6329924..78903beb06d3 100644
--- a/hw/intc/sifive_plic.c
+++ b/hw/intc/sifive_plic.c
@@ -25,7 +25,6 @@
#include "qemu/error-report.h"
#include "hw/sysbus.h"
#include "hw/pci/msi.h"
-#include "hw/boards.h"
#include "hw/qdev-properties.h"
#include "hw/intc/sifive_plic.h"
#include "target/riscv/cpu.h"
diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c
index f9c0873a9865..1d6573bc6335 100644
--- a/hw/mips/loongson3_virt.c
+++ b/hw/mips/loongson3_virt.c
@@ -32,7 +32,6 @@
#include "cpu.h"
#include "elf.h"
#include "kvm_mips.h"
-#include "hw/boards.h"
#include "hw/char/serial.h"
#include "hw/intc/loongson_liointc.h"
#include "hw/mips/mips.h"
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 79467ac51237..03b3bd322fdf 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -25,7 +25,6 @@
#include "qemu/config-file.h"
#include "hw/char/serial.h"
#include "hw/pci/pci.h"
-#include "hw/boards.h"
#include "sysemu/sysemu.h"
#include "sysemu/kvm.h"
#include "sysemu/reset.h"
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 21759628466f..9659857dba8c 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -58,7 +58,6 @@
#include "hw/pci/pci.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
-#include "hw/boards.h"
#include "hw/nvram/fw_cfg.h"
#include "hw/char/escc.h"
#include "hw/misc/macio/macio.h"
diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index 963d247f5f54..95d3d9515854 100644
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -38,7 +38,6 @@
#include "hw/isa/isa.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_host.h"
-#include "hw/boards.h"
#include "hw/nvram/fw_cfg.h"
#include "hw/char/escc.h"
#include "hw/misc/macio/macio.h"
diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index 6faf1fe4733d..22b1c4f1f3c2 100644
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -52,7 +52,6 @@
#include "hw/ppc/pnv_pnor.h"
#include "hw/isa/isa.h"
-#include "hw/boards.h"
#include "hw/char/serial.h"
#include "hw/rtc/mc146818rtc.h"
diff --git a/hw/ppc/ppc4xx_devs.c b/hw/ppc/ppc4xx_devs.c
index fe9d4f7155e1..980c48944fc7 100644
--- a/hw/ppc/ppc4xx_devs.c
+++ b/hw/ppc/ppc4xx_devs.c
@@ -29,7 +29,6 @@
#include "hw/irq.h"
#include "hw/ppc/ppc.h"
#include "hw/ppc/ppc4xx.h"
-#include "hw/boards.h"
#include "hw/intc/ppc-uic.h"
#include "hw/qdev-properties.h"
#include "qemu/log.h"
diff --git a/hw/ppc/rs6000_mc.c b/hw/ppc/rs6000_mc.c
index 4db5b51a2dd0..c0bc212e9240 100644
--- a/hw/ppc/rs6000_mc.c
+++ b/hw/ppc/rs6000_mc.c
@@ -23,7 +23,6 @@
#include "hw/qdev-properties.h"
#include "migration/vmstate.h"
#include "exec/address-spaces.h"
-#include "hw/boards.h"
#include "qapi/error.h"
#include "trace.h"
#include "qom/object.h"
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 529ff056dd2a..0ee61b312859 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -54,7 +54,6 @@
#include "cpu-models.h"
#include "hw/core/cpu.h"
-#include "hw/boards.h"
#include "hw/ppc/ppc.h"
#include "hw/loader.h"
diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c
index 8a79f9c6289b..fb64be1150db 100644
--- a/hw/ppc/spapr_rtas.c
+++ b/hw/ppc/spapr_rtas.c
@@ -41,7 +41,6 @@
#include "hw/ppc/spapr_rtas.h"
#include "hw/ppc/spapr_cpu_core.h"
#include "hw/ppc/ppc.h"
-#include "hw/boards.h"
#include <libfdt.h>
#include "hw/ppc/spapr_drc.h"
diff --git a/hw/remote/iohub.c b/hw/remote/iohub.c
index e4ff131a6b84..547d597f0feb 100644
--- a/hw/remote/iohub.c
+++ b/hw/remote/iohub.c
@@ -15,7 +15,6 @@
#include "hw/pci/pci_ids.h"
#include "hw/pci/pci_bus.h"
#include "qemu/thread.h"
-#include "hw/boards.h"
#include "hw/remote/machine.h"
#include "hw/remote/iohub.h"
#include "qemu/main-loop.h"
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 56b52d2d3091..0a97310d4239 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -14,10 +14,8 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "cpu.h"
-#include "hw/boards.h"
#include "exec/address-spaces.h"
#include "exec/ram_addr.h"
-#include "hw/boards.h"
#include "hw/s390x/s390-virtio-hcall.h"
#include "hw/s390x/sclp.h"
#include "hw/s390x/s390_flic.h"
diff --git a/hw/tricore/tc27x_soc.c b/hw/tricore/tc27x_soc.c
index dea9ba3cca79..dcccdba78623 100644
--- a/hw/tricore/tc27x_soc.c
+++ b/hw/tricore/tc27x_soc.c
@@ -21,7 +21,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "hw/sysbus.h"
-#include "hw/boards.h"
#include "hw/loader.h"
#include "qemu/units.h"
#include "hw/misc/unimp.h"
diff --git a/hw/tricore/triboard.c b/hw/tricore/triboard.c
index 16e2fd7e27ed..f8d5f7a78761 100644
--- a/hw/tricore/triboard.c
+++ b/hw/tricore/triboard.c
@@ -24,7 +24,6 @@
#include "hw/qdev-properties.h"
#include "cpu.h"
#include "net/net.h"
-#include "hw/boards.h"
#include "hw/loader.h"
#include "exec/address-spaces.h"
#include "elf.h"
diff --git a/softmmu/vl.c b/softmmu/vl.c
index aadb52613888..307944aef302 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -27,7 +27,6 @@
#include "qemu/datadir.h"
#include "qemu/units.h"
#include "exec/cpu-common.h"
-#include "hw/boards.h"
#include "hw/qdev-properties.h"
#include "qapi/compat-policy.h"
#include "qapi/error.h"
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PULL 17/23] Do not include cpu.h if it's not really necessary
2021-05-03 8:36 [PULL 00/23] Trivial branch for 6.1 patches Laurent Vivier
` (15 preceding siblings ...)
2021-05-03 8:36 ` [PULL 16/23] Do not include hw/boards.h " Laurent Vivier
@ 2021-05-03 8:36 ` Laurent Vivier
2021-05-03 8:36 ` [PULL 18/23] Do not include exec/address-spaces.h " Laurent Vivier
` (6 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Laurent Vivier @ 2021-05-03 8:36 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Thomas Huth, Michael Tokarev, Laurent Vivier
From: Thomas Huth <thuth@redhat.com>
Stop including cpu.h in files that don't need it.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210416171314.2074665-4-thuth@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
accel/stubs/kvm-stub.c | 1 -
accel/stubs/tcg-stub.c | 1 -
accel/tcg/cpu-exec-common.c | 1 -
accel/tcg/cpu-exec.c | 1 -
accel/tcg/cputlb.c | 1 -
accel/tcg/plugin-gen.c | 1 -
accel/tcg/translate-all.c | 1 -
accel/tcg/translator.c | 1 -
accel/tcg/user-exec.c | 1 -
bsd-user/main.c | 1 -
disas.c | 1 -
dump/dump.c | 1 -
dump/win_dump.c | 1 -
hw/arm/allwinner-a10.c | 1 -
hw/arm/allwinner-h3.c | 1 -
hw/arm/armv7m.c | 1 -
hw/arm/aspeed.c | 1 -
hw/arm/aspeed_ast2600.c | 1 -
hw/arm/aspeed_soc.c | 1 -
hw/arm/bcm2836.c | 1 -
hw/arm/cubieboard.c | 1 -
hw/arm/digic_boards.c | 1 -
hw/arm/exynos4_boards.c | 1 -
hw/arm/fsl-imx25.c | 1 -
hw/arm/fsl-imx31.c | 1 -
hw/arm/imx25_pdk.c | 1 -
hw/arm/kzm.c | 1 -
hw/arm/msf2-som.c | 1 -
hw/arm/nrf51_soc.c | 1 -
hw/arm/orangepi.c | 1 -
hw/arm/raspi.c | 1 -
hw/arm/stellaris.c | 1 -
hw/arm/xlnx-zcu102.c | 1 -
hw/arm/xlnx-zynqmp.c | 1 -
hw/char/spapr_vty.c | 1 -
hw/core/machine-qmp-cmds.c | 1 -
hw/hppa/dino.c | 1 -
hw/hppa/lasi.c | 1 -
hw/i386/kvm/apic.c | 1 -
hw/i386/kvm/clock.c | 1 -
hw/i386/kvmvapic.c | 1 -
hw/i386/microvm.c | 1 -
hw/i386/pc_piix.c | 1 -
hw/i386/vmport.c | 1 -
hw/intc/apic.c | 1 -
hw/intc/apic_common.c | 1 -
hw/intc/arm_gic_kvm.c | 1 -
hw/intc/armv7m_nvic.c | 1 -
hw/intc/grlib_irqmp.c | 1 -
hw/intc/openpic_kvm.c | 1 -
hw/intc/s390_flic.c | 1 -
hw/intc/s390_flic_kvm.c | 1 -
hw/intc/xics.c | 1 -
hw/intc/xics_kvm.c | 1 -
hw/intc/xics_spapr.c | 1 -
hw/m68k/next-cube.c | 1 -
hw/mips/loongson3_virt.c | 1 -
hw/mips/malta.c | 1 -
hw/mips/mips_int.c | 1 -
hw/mips/mipssim.c | 1 -
hw/misc/mips_itu.c | 1 -
hw/net/spapr_llan.c | 1 -
hw/nios2/10m50_devboard.c | 1 -
hw/nios2/boot.c | 1 -
hw/nios2/generic_nommu.c | 1 -
hw/nvram/spapr_nvram.c | 1 -
hw/ppc/ppc.c | 1 -
hw/ppc/ppc440_uc.c | 1 -
hw/ppc/prep.c | 1 -
hw/ppc/spapr_drc.c | 1 -
hw/ppc/spapr_events.c | 1 -
hw/ppc/spapr_hcall.c | 1 -
hw/ppc/spapr_pci.c | 1 -
hw/ppc/spapr_pci_vfio.c | 1 -
hw/ppc/spapr_rng.c | 1 -
hw/ppc/spapr_rtas.c | 1 -
hw/ppc/spapr_rtas_ddw.c | 1 -
hw/ppc/spapr_rtc.c | 1 -
hw/ppc/spapr_tpm_proxy.c | 1 -
hw/remote/proxy-memory-listener.c | 1 -
hw/rx/rx-gdbsim.c | 1 -
hw/rx/rx62n.c | 1 -
hw/s390x/3270-ccw.c | 1 -
hw/s390x/css-bridge.c | 1 -
hw/s390x/css.c | 1 -
hw/s390x/ipl.c | 1 -
hw/s390x/pv.c | 1 -
hw/s390x/s390-pci-bus.c | 1 -
hw/s390x/s390-pci-inst.c | 1 -
hw/s390x/s390-stattrib-kvm.c | 1 -
hw/s390x/s390-stattrib.c | 1 -
hw/s390x/s390-virtio-ccw.c | 1 -
hw/s390x/sclp.c | 1 -
hw/s390x/sclpcpu.c | 1 -
hw/scsi/spapr_vscsi.c | 1 -
hw/sh4/sh7750.c | 1 -
hw/tricore/tc27x_soc.c | 1 -
hw/tricore/triboard.c | 1 -
hw/vfio/ap.c | 1 -
hw/vfio/migration.c | 1 -
hw/vfio/spapr.c | 1 -
hw/xtensa/sim.c | 1 -
hw/xtensa/virt.c | 1 -
hw/xtensa/xtensa_memory.c | 1 -
linux-user/main.c | 1 -
linux-user/semihost.c | 1 -
migration/ram.c | 1 -
monitor/misc.c | 1 -
plugins/api.c | 1 -
plugins/core.c | 1 -
plugins/loader.c | 1 -
semihosting/arm-compat-semi.c | 1 -
semihosting/console.c | 1 -
softmmu/arch_init.c | 1 -
softmmu/memory.c | 1 -
softmmu/memory_mapping.c | 1 -
softmmu/physmem.c | 1 -
tcg/tcg-op-vec.c | 1 -
tcg/tcg-op.c | 1 -
tcg/tcg.c | 1 -
120 files changed, 120 deletions(-)
diff --git a/accel/stubs/kvm-stub.c b/accel/stubs/kvm-stub.c
index 0f17acfac0f7..5b1d00a2224a 100644
--- a/accel/stubs/kvm-stub.c
+++ b/accel/stubs/kvm-stub.c
@@ -11,7 +11,6 @@
*/
#include "qemu/osdep.h"
-#include "cpu.h"
#include "sysemu/kvm.h"
#ifndef CONFIG_USER_ONLY
diff --git a/accel/stubs/tcg-stub.c b/accel/stubs/tcg-stub.c
index 2304606f8e00..d8162673ae8d 100644
--- a/accel/stubs/tcg-stub.c
+++ b/accel/stubs/tcg-stub.c
@@ -11,7 +11,6 @@
*/
#include "qemu/osdep.h"
-#include "cpu.h"
#include "exec/exec-all.h"
void tb_flush(CPUState *cpu)
diff --git a/accel/tcg/cpu-exec-common.c b/accel/tcg/cpu-exec-common.c
index 12c1e3e97448..be6fe45aa5a8 100644
--- a/accel/tcg/cpu-exec-common.c
+++ b/accel/tcg/cpu-exec-common.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "cpu.h"
#include "sysemu/cpus.h"
#include "sysemu/tcg.h"
#include "exec/exec-all.h"
diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
index f62f12e717ca..0dc5271715ea 100644
--- a/accel/tcg/cpu-exec.c
+++ b/accel/tcg/cpu-exec.c
@@ -20,7 +20,6 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/qemu-print.h"
-#include "cpu.h"
#include "hw/core/tcg-cpu-ops.h"
#include "trace.h"
#include "disas/disas.h"
diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index 8a7b779270a4..502f803e5e73 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -19,7 +19,6 @@
#include "qemu/osdep.h"
#include "qemu/main-loop.h"
-#include "cpu.h"
#include "hw/core/tcg-cpu-ops.h"
#include "exec/exec-all.h"
#include "exec/memory.h"
diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c
index c3dc3effe7ee..7627225aef6b 100644
--- a/accel/tcg/plugin-gen.c
+++ b/accel/tcg/plugin-gen.c
@@ -43,7 +43,6 @@
* CPU's index into a TCG temp, since the first callback did it already.
*/
#include "qemu/osdep.h"
-#include "cpu.h"
#include "tcg/tcg.h"
#include "tcg/tcg-op.h"
#include "trace/mem.h"
diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
index b12d0898d0aa..ae7e873713a5 100644
--- a/accel/tcg/translate-all.c
+++ b/accel/tcg/translate-all.c
@@ -22,7 +22,6 @@
#include "qemu-common.h"
#define NO_CPU_IO_DEFS
-#include "cpu.h"
#include "trace.h"
#include "disas/disas.h"
#include "exec/exec-all.h"
diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c
index 2dfc27102f94..1d327321981d 100644
--- a/accel/tcg/translator.c
+++ b/accel/tcg/translator.c
@@ -9,7 +9,6 @@
#include "qemu/osdep.h"
#include "qemu/error-report.h"
-#include "cpu.h"
#include "tcg/tcg.h"
#include "tcg/tcg-op.h"
#include "exec/exec-all.h"
diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c
index 0d8cc27b213f..fb2d43e6a9a0 100644
--- a/accel/tcg/user-exec.c
+++ b/accel/tcg/user-exec.c
@@ -17,7 +17,6 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "qemu/osdep.h"
-#include "cpu.h"
#include "hw/core/tcg-cpu-ops.h"
#include "disas/disas.h"
#include "exec/exec-all.h"
diff --git a/bsd-user/main.c b/bsd-user/main.c
index 798aba512c1c..36a889d084e5 100644
--- a/bsd-user/main.c
+++ b/bsd-user/main.c
@@ -32,7 +32,6 @@
#include "qemu/path.h"
#include "qemu/help_option.h"
#include "qemu/module.h"
-#include "cpu.h"
#include "exec/exec-all.h"
#include "tcg/tcg.h"
#include "qemu/timer.h"
diff --git a/disas.c b/disas.c
index a61f95b580b8..3dab4482d1a1 100644
--- a/disas.c
+++ b/disas.c
@@ -4,7 +4,6 @@
#include "elf.h"
#include "qemu/qemu-print.h"
-#include "cpu.h"
#include "disas/disas.h"
#include "disas/capstone.h"
diff --git a/dump/dump.c b/dump/dump.c
index 929138e91d08..ab625909f305 100644
--- a/dump/dump.c
+++ b/dump/dump.c
@@ -15,7 +15,6 @@
#include "qemu-common.h"
#include "qemu/cutils.h"
#include "elf.h"
-#include "cpu.h"
#include "exec/hwaddr.h"
#include "monitor/monitor.h"
#include "sysemu/kvm.h"
diff --git a/dump/win_dump.c b/dump/win_dump.c
index 652c7bad9950..c5eb5a9aacd7 100644
--- a/dump/win_dump.c
+++ b/dump/win_dump.c
@@ -12,7 +12,6 @@
#include "qemu-common.h"
#include "qemu/cutils.h"
#include "elf.h"
-#include "cpu.h"
#include "exec/hwaddr.h"
#include "monitor/monitor.h"
#include "sysemu/kvm.h"
diff --git a/hw/arm/allwinner-a10.c b/hw/arm/allwinner-a10.c
index d404f31e02f1..0844a656417d 100644
--- a/hw/arm/allwinner-a10.c
+++ b/hw/arm/allwinner-a10.c
@@ -19,7 +19,6 @@
#include "exec/address-spaces.h"
#include "qapi/error.h"
#include "qemu/module.h"
-#include "cpu.h"
#include "hw/sysbus.h"
#include "hw/arm/allwinner-a10.h"
#include "hw/misc/unimp.h"
diff --git a/hw/arm/allwinner-h3.c b/hw/arm/allwinner-h3.c
index 88259a9c0d1f..bbe65d1860c6 100644
--- a/hw/arm/allwinner-h3.c
+++ b/hw/arm/allwinner-h3.c
@@ -24,7 +24,6 @@
#include "qemu/module.h"
#include "qemu/units.h"
#include "hw/qdev-core.h"
-#include "cpu.h"
#include "hw/sysbus.h"
#include "hw/char/serial.h"
#include "hw/misc/unimp.h"
diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
index 6dd10d847031..caeed29670a9 100644
--- a/hw/arm/armv7m.c
+++ b/hw/arm/armv7m.c
@@ -10,7 +10,6 @@
#include "qemu/osdep.h"
#include "hw/arm/armv7m.h"
#include "qapi/error.h"
-#include "cpu.h"
#include "hw/sysbus.h"
#include "hw/arm/boot.h"
#include "hw/loader.h"
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index b1e5bc76e4d2..7480533cb7cf 100644
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -11,7 +11,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "cpu.h"
#include "exec/address-spaces.h"
#include "hw/arm/boot.h"
#include "hw/arm/aspeed.h"
diff --git a/hw/arm/aspeed_ast2600.c b/hw/arm/aspeed_ast2600.c
index 504aabf17371..8e4ef07b148c 100644
--- a/hw/arm/aspeed_ast2600.c
+++ b/hw/arm/aspeed_ast2600.c
@@ -9,7 +9,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "cpu.h"
#include "exec/address-spaces.h"
#include "hw/misc/unimp.h"
#include "hw/arm/aspeed_soc.h"
diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c
index 516277800c9c..fc270daa579b 100644
--- a/hw/arm/aspeed_soc.c
+++ b/hw/arm/aspeed_soc.c
@@ -12,7 +12,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "cpu.h"
#include "exec/address-spaces.h"
#include "hw/misc/unimp.h"
#include "hw/arm/aspeed_soc.h"
diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c
index de7ade2878e4..24354338cad9 100644
--- a/hw/arm/bcm2836.c
+++ b/hw/arm/bcm2836.c
@@ -12,7 +12,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu/module.h"
-#include "cpu.h"
#include "hw/arm/bcm2836.h"
#include "hw/arm/raspi_platform.h"
#include "hw/sysbus.h"
diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c
index 9e872135ae72..d7184e5ec281 100644
--- a/hw/arm/cubieboard.c
+++ b/hw/arm/cubieboard.c
@@ -18,7 +18,6 @@
#include "qemu/osdep.h"
#include "exec/address-spaces.h"
#include "qapi/error.h"
-#include "cpu.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 65d3a9ba740b..fdb678156767 100644
--- a/hw/arm/digic_boards.c
+++ b/hw/arm/digic_boards.c
@@ -27,7 +27,6 @@
#include "qapi/error.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
-#include "cpu.h"
#include "hw/boards.h"
#include "exec/address-spaces.h"
#include "qemu/error-report.h"
diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c
index 8ae136bbdf36..35dd9875da14 100644
--- a/hw/arm/exynos4_boards.c
+++ b/hw/arm/exynos4_boards.c
@@ -25,7 +25,6 @@
#include "qemu/units.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
-#include "cpu.h"
#include "hw/sysbus.h"
#include "net/net.h"
#include "hw/arm/boot.h"
diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c
index 08a98f828fc8..dafc0bef470f 100644
--- a/hw/arm/fsl-imx25.c
+++ b/hw/arm/fsl-imx25.c
@@ -24,7 +24,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "cpu.h"
#include "hw/arm/fsl-imx25.h"
#include "sysemu/sysemu.h"
#include "exec/address-spaces.h"
diff --git a/hw/arm/fsl-imx31.c b/hw/arm/fsl-imx31.c
index 0983998bb4b0..def27bb91360 100644
--- a/hw/arm/fsl-imx31.c
+++ b/hw/arm/fsl-imx31.c
@@ -21,7 +21,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "cpu.h"
#include "hw/arm/fsl-imx31.h"
#include "sysemu/sysemu.h"
#include "exec/address-spaces.h"
diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c
index 1c201d0d8ed9..9c58fbde57ae 100644
--- a/hw/arm/imx25_pdk.c
+++ b/hw/arm/imx25_pdk.c
@@ -25,7 +25,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "cpu.h"
#include "hw/qdev-properties.h"
#include "hw/arm/fsl-imx25.h"
#include "hw/boards.h"
diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c
index e3f7d4ead232..39559c44c293 100644
--- a/hw/arm/kzm.c
+++ b/hw/arm/kzm.c
@@ -15,7 +15,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "cpu.h"
#include "hw/arm/fsl-imx31.h"
#include "hw/boards.h"
#include "qemu/error-report.h"
diff --git a/hw/arm/msf2-som.c b/hw/arm/msf2-som.c
index f9b61c36ddba..343ec977c071 100644
--- a/hw/arm/msf2-som.c
+++ b/hw/arm/msf2-som.c
@@ -31,7 +31,6 @@
#include "hw/arm/boot.h"
#include "exec/address-spaces.h"
#include "hw/arm/msf2-soc.h"
-#include "cpu.h"
#define DDR_BASE_ADDRESS 0xA0000000
#define DDR_SIZE (64 * MiB)
diff --git a/hw/arm/nrf51_soc.c b/hw/arm/nrf51_soc.c
index e15981e019f4..71bdcf06b49d 100644
--- a/hw/arm/nrf51_soc.c
+++ b/hw/arm/nrf51_soc.c
@@ -15,7 +15,6 @@
#include "hw/misc/unimp.h"
#include "exec/address-spaces.h"
#include "qemu/log.h"
-#include "cpu.h"
#include "hw/arm/nrf51.h"
#include "hw/arm/nrf51_soc.h"
diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c
index 6ccb61c149ec..0cf9895ce797 100644
--- a/hw/arm/orangepi.c
+++ b/hw/arm/orangepi.c
@@ -21,7 +21,6 @@
#include "qemu/units.h"
#include "exec/address-spaces.h"
#include "qapi/error.h"
-#include "cpu.h"
#include "hw/boards.h"
#include "hw/qdev-properties.h"
#include "hw/arm/allwinner-h3.h"
diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c
index 1b7e9c4cb418..b30a17871f7a 100644
--- a/hw/arm/raspi.c
+++ b/hw/arm/raspi.c
@@ -16,7 +16,6 @@
#include "qemu/units.h"
#include "qemu/cutils.h"
#include "qapi/error.h"
-#include "cpu.h"
#include "hw/arm/bcm2836.h"
#include "hw/registerfields.h"
#include "qemu/error-report.h"
diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
index 27292ec4113e..8b4dab9b79fe 100644
--- a/hw/arm/stellaris.c
+++ b/hw/arm/stellaris.c
@@ -27,7 +27,6 @@
#include "migration/vmstate.h"
#include "hw/misc/unimp.h"
#include "hw/qdev-clock.h"
-#include "cpu.h"
#include "qom/object.h"
#define GPIO_A 0
diff --git a/hw/arm/xlnx-zcu102.c b/hw/arm/xlnx-zcu102.c
index a9db25eb99f0..6c6cb02e8613 100644
--- a/hw/arm/xlnx-zcu102.c
+++ b/hw/arm/xlnx-zcu102.c
@@ -17,7 +17,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "cpu.h"
#include "hw/arm/xlnx-zynqmp.h"
#include "hw/boards.h"
#include "qemu/error-report.h"
diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c
index 7f01284a5c06..6c93dcb8203b 100644
--- a/hw/arm/xlnx-zynqmp.c
+++ b/hw/arm/xlnx-zynqmp.c
@@ -18,7 +18,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu/module.h"
-#include "cpu.h"
#include "hw/arm/xlnx-zynqmp.h"
#include "hw/intc/arm_gic_common.h"
#include "hw/boards.h"
diff --git a/hw/char/spapr_vty.c b/hw/char/spapr_vty.c
index 79eaa2fa523d..91eae1a59881 100644
--- a/hw/char/spapr_vty.c
+++ b/hw/char/spapr_vty.c
@@ -2,7 +2,6 @@
#include "qemu/error-report.h"
#include "qemu/module.h"
#include "qapi/error.h"
-#include "cpu.h"
#include "migration/vmstate.h"
#include "chardev/char-fe.h"
#include "hw/ppc/spapr.h"
diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c
index 2ad004430e4a..a36c96608f03 100644
--- a/hw/core/machine-qmp-cmds.c
+++ b/hw/core/machine-qmp-cmds.c
@@ -8,7 +8,6 @@
*/
#include "qemu/osdep.h"
-#include "cpu.h"
#include "hw/boards.h"
#include "qapi/error.h"
#include "qapi/qapi-builtin-visit.h"
diff --git a/hw/hppa/dino.c b/hw/hppa/dino.c
index 5b82c9440d1d..bd97e0c51ddf 100644
--- a/hw/hppa/dino.c
+++ b/hw/hppa/dino.c
@@ -14,7 +14,6 @@
#include "qemu/module.h"
#include "qemu/units.h"
#include "qapi/error.h"
-#include "cpu.h"
#include "hw/irq.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_bus.h"
diff --git a/hw/hppa/lasi.c b/hw/hppa/lasi.c
index a8f5defcd01e..408af9ccb72c 100644
--- a/hw/hppa/lasi.c
+++ b/hw/hppa/lasi.c
@@ -13,7 +13,6 @@
#include "qemu/units.h"
#include "qemu/log.h"
#include "qapi/error.h"
-#include "cpu.h"
#include "trace.h"
#include "hw/irq.h"
#include "sysemu/sysemu.h"
diff --git a/hw/i386/kvm/apic.c b/hw/i386/kvm/apic.c
index 3dbff2be2e2f..52ff49091000 100644
--- a/hw/i386/kvm/apic.c
+++ b/hw/i386/kvm/apic.c
@@ -12,7 +12,6 @@
#include "qemu/osdep.h"
#include "qemu/module.h"
-#include "cpu.h"
#include "hw/i386/apic_internal.h"
#include "hw/pci/msi.h"
#include "sysemu/hw_accel.h"
diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c
index 51872dd84c0b..efbc1e0d12c2 100644
--- a/hw/i386/kvm/clock.c
+++ b/hw/i386/kvm/clock.c
@@ -14,7 +14,6 @@
*/
#include "qemu/osdep.h"
-#include "cpu.h"
#include "qemu/host-utils.h"
#include "qemu/module.h"
#include "sysemu/kvm.h"
diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c
index 46315445d22b..43f8a8f679e3 100644
--- a/hw/i386/kvmvapic.c
+++ b/hw/i386/kvmvapic.c
@@ -11,7 +11,6 @@
#include "qemu/osdep.h"
#include "qemu/module.h"
-#include "cpu.h"
#include "sysemu/sysemu.h"
#include "sysemu/cpus.h"
#include "sysemu/hw_accel.h"
diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c
index edf2b0f0618c..aba0c832190f 100644
--- a/hw/i386/microvm.c
+++ b/hw/i386/microvm.c
@@ -49,7 +49,6 @@
#include "hw/pci-host/gpex.h"
#include "hw/usb/xhci.h"
-#include "cpu.h"
#include "elf.h"
#include "kvm/kvm_i386.h"
#include "hw/xen/start_info.h"
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index ac24f70a5dc7..9adf4110538a 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -49,7 +49,6 @@
#include "exec/memory.h"
#include "exec/address-spaces.h"
#include "hw/acpi/acpi.h"
-#include "cpu.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "sysemu/xen.h"
diff --git a/hw/i386/vmport.c b/hw/i386/vmport.c
index 490a57f52c81..7cc75dbc6da6 100644
--- a/hw/i386/vmport.c
+++ b/hw/i386/vmport.c
@@ -37,7 +37,6 @@
#include "sysemu/hw_accel.h"
#include "sysemu/qtest.h"
#include "qemu/log.h"
-#include "cpu.h"
#include "trace.h"
#include "qom/object.h"
diff --git a/hw/intc/apic.c b/hw/intc/apic.c
index f4f50f974e6c..3df11c34d681 100644
--- a/hw/intc/apic.c
+++ b/hw/intc/apic.c
@@ -17,7 +17,6 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>
*/
#include "qemu/osdep.h"
-#include "cpu.h"
#include "qemu/thread.h"
#include "hw/i386/apic_internal.h"
#include "hw/i386/apic.h"
diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c
index 97dd96dffaa1..2a20982066d2 100644
--- a/hw/intc/apic_common.c
+++ b/hw/intc/apic_common.c
@@ -22,7 +22,6 @@
#include "qemu/error-report.h"
#include "qemu/module.h"
#include "qapi/error.h"
-#include "cpu.h"
#include "qapi/visitor.h"
#include "hw/i386/apic.h"
#include "hw/i386/apic_internal.h"
diff --git a/hw/intc/arm_gic_kvm.c b/hw/intc/arm_gic_kvm.c
index 49f79a8674b0..7d2a13273a47 100644
--- a/hw/intc/arm_gic_kvm.c
+++ b/hw/intc/arm_gic_kvm.c
@@ -22,7 +22,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu/module.h"
-#include "cpu.h"
#include "migration/blocker.h"
#include "sysemu/kvm.h"
#include "kvm_arm.h"
diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c
index 0d8426dafc90..c4287d82d81b 100644
--- a/hw/intc/armv7m_nvic.c
+++ b/hw/intc/armv7m_nvic.c
@@ -12,7 +12,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "cpu.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
#include "qemu/timer.h"
diff --git a/hw/intc/grlib_irqmp.c b/hw/intc/grlib_irqmp.c
index 984334fa7bff..3bfe2544b7c5 100644
--- a/hw/intc/grlib_irqmp.c
+++ b/hw/intc/grlib_irqmp.c
@@ -27,7 +27,6 @@
#include "qemu/osdep.h"
#include "hw/irq.h"
#include "hw/sysbus.h"
-#include "cpu.h"
#include "hw/qdev-properties.h"
#include "hw/sparc/grlib.h"
diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c
index e1a39e33cb1e..16badace8b0d 100644
--- a/hw/intc/openpic_kvm.c
+++ b/hw/intc/openpic_kvm.c
@@ -24,7 +24,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "cpu.h"
#include <sys/ioctl.h>
#include "exec/address-spaces.h"
#include "hw/ppc/openpic.h"
diff --git a/hw/intc/s390_flic.c b/hw/intc/s390_flic.c
index aacdb1bbc26a..74e02858d43e 100644
--- a/hw/intc/s390_flic.c
+++ b/hw/intc/s390_flic.c
@@ -20,7 +20,6 @@
#include "hw/qdev-properties.h"
#include "hw/s390x/css.h"
#include "trace.h"
-#include "cpu.h"
#include "qapi/error.h"
#include "hw/s390x/s390-virtio-ccw.h"
diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c
index d1c8fb8016a0..929cfa3a686c 100644
--- a/hw/intc/s390_flic_kvm.c
+++ b/hw/intc/s390_flic_kvm.c
@@ -11,7 +11,6 @@
*/
#include "qemu/osdep.h"
-#include "cpu.h"
#include "kvm_s390x.h"
#include <sys/ioctl.h>
#include "qemu/error-report.h"
diff --git a/hw/intc/xics.c b/hw/intc/xics.c
index 68f9d44feb41..48a835eab7c5 100644
--- a/hw/intc/xics.c
+++ b/hw/intc/xics.c
@@ -27,7 +27,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "cpu.h"
#include "trace.h"
#include "qemu/timer.h"
#include "hw/ppc/xics.h"
diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c
index 570d635bcc08..f5bfc501bc15 100644
--- a/hw/intc/xics_kvm.c
+++ b/hw/intc/xics_kvm.c
@@ -28,7 +28,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu-common.h"
-#include "cpu.h"
#include "trace.h"
#include "sysemu/kvm.h"
#include "hw/ppc/spapr.h"
diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c
index 8ae4f41459c3..37b2d99977a7 100644
--- a/hw/intc/xics_spapr.c
+++ b/hw/intc/xics_spapr.c
@@ -26,7 +26,6 @@
*/
#include "qemu/osdep.h"
-#include "cpu.h"
#include "trace.h"
#include "qemu/timer.h"
#include "hw/ppc/spapr.h"
diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c
index 92b45d760f19..5bd4f2d83282 100644
--- a/hw/m68k/next-cube.c
+++ b/hw/m68k/next-cube.c
@@ -10,7 +10,6 @@
*/
#include "qemu/osdep.h"
-#include "cpu.h"
#include "exec/hwaddr.h"
#include "exec/address-spaces.h"
#include "sysemu/sysemu.h"
diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c
index 1d6573bc6335..16f7f84d3404 100644
--- a/hw/mips/loongson3_virt.c
+++ b/hw/mips/loongson3_virt.c
@@ -29,7 +29,6 @@
#include "qemu/cutils.h"
#include "qemu/datadir.h"
#include "qapi/error.h"
-#include "cpu.h"
#include "elf.h"
#include "kvm_mips.h"
#include "hw/char/serial.h"
diff --git a/hw/mips/malta.c b/hw/mips/malta.c
index 5adb67ad2a42..459791414ab8 100644
--- a/hw/mips/malta.c
+++ b/hw/mips/malta.c
@@ -27,7 +27,6 @@
#include "qemu/bitops.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
-#include "cpu.h"
#include "hw/clock.h"
#include "hw/southbridge/piix.h"
#include "hw/isa/superio.h"
diff --git a/hw/mips/mips_int.c b/hw/mips/mips_int.c
index 0f9c6f07c1c7..2db5e10fe0bd 100644
--- a/hw/mips/mips_int.c
+++ b/hw/mips/mips_int.c
@@ -24,7 +24,6 @@
#include "qemu/main-loop.h"
#include "hw/irq.h"
#include "hw/mips/cpudevs.h"
-#include "cpu.h"
#include "sysemu/kvm.h"
#include "kvm_mips.h"
diff --git a/hw/mips/mipssim.c b/hw/mips/mipssim.c
index f5d0da05aa11..2e0d4aceedc5 100644
--- a/hw/mips/mipssim.c
+++ b/hw/mips/mipssim.c
@@ -29,7 +29,6 @@
#include "qapi/error.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
-#include "cpu.h"
#include "hw/clock.h"
#include "hw/mips/mips.h"
#include "hw/mips/cpudevs.h"
diff --git a/hw/misc/mips_itu.c b/hw/misc/mips_itu.c
index 133399598fce..80683fed318b 100644
--- a/hw/misc/mips_itu.c
+++ b/hw/misc/mips_itu.c
@@ -22,7 +22,6 @@
#include "qemu/log.h"
#include "qemu/module.h"
#include "qapi/error.h"
-#include "cpu.h"
#include "exec/exec-all.h"
#include "hw/misc/mips_itu.h"
#include "hw/qdev-properties.h"
diff --git a/hw/net/spapr_llan.c b/hw/net/spapr_llan.c
index 10e85a455603..a6876a936db5 100644
--- a/hw/net/spapr_llan.c
+++ b/hw/net/spapr_llan.c
@@ -26,7 +26,6 @@
*/
#include "qemu/osdep.h"
-#include "cpu.h"
#include "qemu/log.h"
#include "qemu/module.h"
#include "net/net.h"
diff --git a/hw/nios2/10m50_devboard.c b/hw/nios2/10m50_devboard.c
index a14fc31e86b0..3d1205b8bd7a 100644
--- a/hw/nios2/10m50_devboard.c
+++ b/hw/nios2/10m50_devboard.c
@@ -24,7 +24,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "cpu.h"
#include "hw/sysbus.h"
#include "hw/char/serial.h"
diff --git a/hw/nios2/boot.c b/hw/nios2/boot.c
index 95bdc18052c8..5b3e4efed5be 100644
--- a/hw/nios2/boot.c
+++ b/hw/nios2/boot.c
@@ -32,7 +32,6 @@
#include "qemu/units.h"
#include "qemu-common.h"
#include "qemu/datadir.h"
-#include "cpu.h"
#include "qemu/option.h"
#include "qemu/config-file.h"
#include "qemu/error-report.h"
diff --git a/hw/nios2/generic_nommu.c b/hw/nios2/generic_nommu.c
index b70a42dc2fc2..fbc18dbd04c2 100644
--- a/hw/nios2/generic_nommu.c
+++ b/hw/nios2/generic_nommu.c
@@ -29,7 +29,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu-common.h"
-#include "cpu.h"
#include "hw/char/serial.h"
#include "hw/boards.h"
diff --git a/hw/nvram/spapr_nvram.c b/hw/nvram/spapr_nvram.c
index 3bb4654c5895..fbfdf47e2684 100644
--- a/hw/nvram/spapr_nvram.c
+++ b/hw/nvram/spapr_nvram.c
@@ -26,7 +26,6 @@
#include "qemu/module.h"
#include "qemu/units.h"
#include "qapi/error.h"
-#include "cpu.h"
#include <libfdt.h>
#include "sysemu/block-backend.h"
diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c
index bf28d6bfc8d1..7375bf4fa910 100644
--- a/hw/ppc/ppc.c
+++ b/hw/ppc/ppc.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "cpu.h"
#include "hw/irq.h"
#include "hw/ppc/ppc.h"
#include "hw/ppc/ppc_e500.h"
diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c
index f6f89058ab7c..96a1fe06c38e 100644
--- a/hw/ppc/ppc440_uc.c
+++ b/hw/ppc/ppc440_uc.c
@@ -14,7 +14,6 @@
#include "qapi/error.h"
#include "qemu/log.h"
#include "qemu/module.h"
-#include "cpu.h"
#include "hw/irq.h"
#include "exec/address-spaces.h"
#include "exec/memory.h"
diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index b41570c7472b..e8dc128308e3 100644
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "cpu.h"
#include "hw/rtc/m48t59.h"
#include "hw/char/serial.h"
#include "hw/block/fdc.h"
diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c
index 9e16505fa1b4..b8c2f3daf75e 100644
--- a/hw/ppc/spapr_drc.c
+++ b/hw/ppc/spapr_drc.c
@@ -13,7 +13,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qapi/qmp/qnull.h"
-#include "cpu.h"
#include "qemu/cutils.h"
#include "hw/ppc/spapr_drc.h"
#include "qom/object.h"
diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c
index d51daedfa6e0..0cfc19be196e 100644
--- a/hw/ppc/spapr_events.c
+++ b/hw/ppc/spapr_events.c
@@ -27,7 +27,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "cpu.h"
#include "sysemu/device_tree.h"
#include "sysemu/runstate.h"
diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
index 7b5cd3553c26..2a464a42e67b 100644
--- a/hw/ppc/spapr_hcall.c
+++ b/hw/ppc/spapr_hcall.c
@@ -7,7 +7,6 @@
#include "qemu/main-loop.h"
#include "qemu/module.h"
#include "qemu/error-report.h"
-#include "cpu.h"
#include "exec/exec-all.h"
#include "helper_regs.h"
#include "hw/ppc/spapr.h"
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index feba18cb126f..4effe23a1896 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -25,7 +25,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "cpu.h"
#include "hw/irq.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
diff --git a/hw/ppc/spapr_pci_vfio.c b/hw/ppc/spapr_pci_vfio.c
index e0547b174085..7817cf72ee8e 100644
--- a/hw/ppc/spapr_pci_vfio.c
+++ b/hw/ppc/spapr_pci_vfio.c
@@ -19,7 +19,6 @@
#include "qemu/osdep.h"
#include <linux/vfio.h>
-#include "cpu.h"
#include "hw/ppc/spapr.h"
#include "hw/pci-host/spapr.h"
#include "hw/pci/msix.h"
diff --git a/hw/ppc/spapr_rng.c b/hw/ppc/spapr_rng.c
index d14800e9def4..df5c4b968735 100644
--- a/hw/ppc/spapr_rng.c
+++ b/hw/ppc/spapr_rng.c
@@ -19,7 +19,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "cpu.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"
diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c
index fb64be1150db..59dbea4e22b2 100644
--- a/hw/ppc/spapr_rtas.c
+++ b/hw/ppc/spapr_rtas.c
@@ -26,7 +26,6 @@
*/
#include "qemu/osdep.h"
-#include "cpu.h"
#include "qemu/log.h"
#include "qemu/error-report.h"
#include "sysemu/sysemu.h"
diff --git a/hw/ppc/spapr_rtas_ddw.c b/hw/ppc/spapr_rtas_ddw.c
index 3501b0581991..3e826e1308c4 100644
--- a/hw/ppc/spapr_rtas_ddw.c
+++ b/hw/ppc/spapr_rtas_ddw.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "cpu.h"
#include "qemu/error-report.h"
#include "qemu/module.h"
#include "hw/ppc/spapr.h"
diff --git a/hw/ppc/spapr_rtc.c b/hw/ppc/spapr_rtc.c
index 68cfc578a3ab..fba4dfca3589 100644
--- a/hw/ppc/spapr_rtc.c
+++ b/hw/ppc/spapr_rtc.c
@@ -27,7 +27,6 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
-#include "cpu.h"
#include "qemu/timer.h"
#include "sysemu/sysemu.h"
#include "hw/ppc/spapr.h"
diff --git a/hw/ppc/spapr_tpm_proxy.c b/hw/ppc/spapr_tpm_proxy.c
index a01f81f9e041..2454086744b1 100644
--- a/hw/ppc/spapr_tpm_proxy.c
+++ b/hw/ppc/spapr_tpm_proxy.c
@@ -15,7 +15,6 @@
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "sysemu/reset.h"
-#include "cpu.h"
#include "hw/ppc/spapr.h"
#include "hw/qdev-properties.h"
#include "trace.h"
diff --git a/hw/remote/proxy-memory-listener.c b/hw/remote/proxy-memory-listener.c
index af1fa6f5aaaa..3649919f6649 100644
--- a/hw/remote/proxy-memory-listener.c
+++ b/hw/remote/proxy-memory-listener.c
@@ -14,7 +14,6 @@
#include "qemu/range.h"
#include "exec/memory.h"
#include "exec/cpu-common.h"
-#include "cpu.h"
#include "exec/ram_addr.h"
#include "exec/address-spaces.h"
#include "qapi/error.h"
diff --git a/hw/rx/rx-gdbsim.c b/hw/rx/rx-gdbsim.c
index 1f53fdb08289..b52d76b9b681 100644
--- a/hw/rx/rx-gdbsim.c
+++ b/hw/rx/rx-gdbsim.c
@@ -21,7 +21,6 @@
#include "qemu/error-report.h"
#include "qapi/error.h"
#include "qemu-common.h"
-#include "cpu.h"
#include "hw/loader.h"
#include "hw/rx/rx62n.h"
#include "sysemu/qtest.h"
diff --git a/hw/rx/rx62n.c b/hw/rx/rx62n.c
index 31ddccf2cdbb..fa5add9f9dbe 100644
--- a/hw/rx/rx62n.c
+++ b/hw/rx/rx62n.c
@@ -28,7 +28,6 @@
#include "hw/sysbus.h"
#include "hw/qdev-properties.h"
#include "sysemu/sysemu.h"
-#include "cpu.h"
#include "qom/object.h"
/*
diff --git a/hw/s390x/3270-ccw.c b/hw/s390x/3270-ccw.c
index f3e7342b1e8e..25e628f57573 100644
--- a/hw/s390x/3270-ccw.c
+++ b/hw/s390x/3270-ccw.c
@@ -13,7 +13,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu/module.h"
-#include "cpu.h"
#include "hw/s390x/css.h"
#include "hw/s390x/css-bridge.h"
#include "hw/qdev-properties.h"
diff --git a/hw/s390x/css-bridge.c b/hw/s390x/css-bridge.c
index 9d793d671e19..191b29f07716 100644
--- a/hw/s390x/css-bridge.c
+++ b/hw/s390x/css-bridge.c
@@ -20,7 +20,6 @@
#include "hw/s390x/css.h"
#include "ccw-device.h"
#include "hw/s390x/css-bridge.h"
-#include "cpu.h"
/*
* Invoke device-specific unplug handler, disable the subchannel
diff --git a/hw/s390x/css.c b/hw/s390x/css.c
index 4149b8e5a79c..bed46f5ec3a2 100644
--- a/hw/s390x/css.c
+++ b/hw/s390x/css.c
@@ -15,7 +15,6 @@
#include "qemu/bitops.h"
#include "qemu/error-report.h"
#include "exec/address-spaces.h"
-#include "cpu.h"
#include "hw/s390x/ioinst.h"
#include "hw/qdev-properties.h"
#include "hw/s390x/css.h"
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
index f12af5e35b88..8c863cf386af 100644
--- a/hw/s390x/ipl.c
+++ b/hw/s390x/ipl.c
@@ -19,7 +19,6 @@
#include "sysemu/reset.h"
#include "sysemu/runstate.h"
#include "sysemu/tcg.h"
-#include "cpu.h"
#include "elf.h"
#include "hw/loader.h"
#include "hw/qdev-properties.h"
diff --git a/hw/s390x/pv.c b/hw/s390x/pv.c
index 93eccfc05d5d..401b63d6cb65 100644
--- a/hw/s390x/pv.c
+++ b/hw/s390x/pv.c
@@ -13,7 +13,6 @@
#include <linux/kvm.h>
-#include "cpu.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "sysemu/kvm.h"
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
index dd138dae94a4..7db1c5943fd5 100644
--- a/hw/s390x/s390-pci-bus.c
+++ b/hw/s390x/s390-pci-bus.c
@@ -14,7 +14,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qapi/visitor.h"
-#include "cpu.h"
#include "hw/s390x/s390-pci-bus.h"
#include "hw/s390x/s390-pci-inst.h"
#include "hw/s390x/s390-pci-vfio.h"
diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c
index 4b8326afa4f2..9ec277d50e71 100644
--- a/hw/s390x/s390-pci-inst.c
+++ b/hw/s390x/s390-pci-inst.c
@@ -12,7 +12,6 @@
*/
#include "qemu/osdep.h"
-#include "cpu.h"
#include "exec/memop.h"
#include "exec/memory-internal.h"
#include "qemu/error-report.h"
diff --git a/hw/s390x/s390-stattrib-kvm.c b/hw/s390x/s390-stattrib-kvm.c
index f89d8d9d1698..f0b11a74e499 100644
--- a/hw/s390x/s390-stattrib-kvm.c
+++ b/hw/s390x/s390-stattrib-kvm.c
@@ -16,7 +16,6 @@
#include "qemu/error-report.h"
#include "sysemu/kvm.h"
#include "exec/ram_addr.h"
-#include "cpu.h"
#include "kvm_s390x.h"
Object *kvm_s390_stattrib_create(void)
diff --git a/hw/s390x/s390-stattrib.c b/hw/s390x/s390-stattrib.c
index 4441e1d331c3..9eda1c3b2a2e 100644
--- a/hw/s390x/s390-stattrib.c
+++ b/hw/s390x/s390-stattrib.c
@@ -11,7 +11,6 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
-#include "cpu.h"
#include "migration/qemu-file.h"
#include "migration/register.h"
#include "hw/s390x/storage-attributes.h"
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 0a97310d4239..f2f38c0c64f1 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -13,7 +13,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "cpu.h"
#include "exec/address-spaces.h"
#include "exec/ram_addr.h"
#include "hw/s390x/s390-virtio-hcall.h"
diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c
index f57340a7d789..edb6e3ea01b6 100644
--- a/hw/s390x/sclp.c
+++ b/hw/s390x/sclp.c
@@ -15,7 +15,6 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
#include "qapi/error.h"
-#include "cpu.h"
#include "hw/boards.h"
#include "hw/s390x/sclp.h"
#include "hw/s390x/event-facility.h"
diff --git a/hw/s390x/sclpcpu.c b/hw/s390x/sclpcpu.c
index 62806d327376..f2b1a4b0371c 100644
--- a/hw/s390x/sclpcpu.c
+++ b/hw/s390x/sclpcpu.c
@@ -17,7 +17,6 @@
#include "hw/s390x/sclp.h"
#include "qemu/module.h"
#include "hw/s390x/event-facility.h"
-#include "cpu.h"
#include "sysemu/cpus.h"
typedef struct ConfigMgtData {
diff --git a/hw/scsi/spapr_vscsi.c b/hw/scsi/spapr_vscsi.c
index ca5c13c4a8ea..c210262484af 100644
--- a/hw/scsi/spapr_vscsi.c
+++ b/hw/scsi/spapr_vscsi.c
@@ -34,7 +34,6 @@
#include "qemu/osdep.h"
#include "qemu/module.h"
-#include "cpu.h"
#include "hw/scsi/scsi.h"
#include "migration/vmstate.h"
#include "scsi/constants.h"
diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c
index f8ac3ec6e328..d53a436d8cf8 100644
--- a/hw/sh4/sh7750.c
+++ b/hw/sh4/sh7750.c
@@ -31,7 +31,6 @@
#include "sh7750_regnames.h"
#include "hw/sh4/sh_intc.h"
#include "hw/timer/tmu012.h"
-#include "cpu.h"
#include "exec/exec-all.h"
#define NB_DEVICES 4
diff --git a/hw/tricore/tc27x_soc.c b/hw/tricore/tc27x_soc.c
index dcccdba78623..d66d6980c372 100644
--- a/hw/tricore/tc27x_soc.c
+++ b/hw/tricore/tc27x_soc.c
@@ -25,7 +25,6 @@
#include "qemu/units.h"
#include "hw/misc/unimp.h"
#include "exec/address-spaces.h"
-#include "cpu.h"
#include "hw/tricore/tc27x_soc.h"
#include "hw/tricore/triboard.h"
diff --git a/hw/tricore/triboard.c b/hw/tricore/triboard.c
index f8d5f7a78761..943f706989e3 100644
--- a/hw/tricore/triboard.c
+++ b/hw/tricore/triboard.c
@@ -22,7 +22,6 @@
#include "qemu/units.h"
#include "qapi/error.h"
#include "hw/qdev-properties.h"
-#include "cpu.h"
#include "net/net.h"
#include "hw/loader.h"
#include "exec/address-spaces.h"
diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c
index f9dbec37da20..4b32aca1a05e 100644
--- a/hw/vfio/ap.c
+++ b/hw/vfio/ap.c
@@ -21,7 +21,6 @@
#include "qemu/module.h"
#include "qemu/option.h"
#include "qemu/config-file.h"
-#include "cpu.h"
#include "kvm_s390x.h"
#include "migration/vmstate.h"
#include "hw/qdev-properties.h"
diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c
index 384576cfc051..201642d75e6b 100644
--- a/hw/vfio/migration.c
+++ b/hw/vfio/migration.c
@@ -15,7 +15,6 @@
#include "sysemu/runstate.h"
#include "hw/vfio/vfio-common.h"
-#include "cpu.h"
#include "migration/migration.h"
#include "migration/vmstate.h"
#include "migration/qemu-file.h"
diff --git a/hw/vfio/spapr.c b/hw/vfio/spapr.c
index 2900bd19417a..ea3f70bd2fa1 100644
--- a/hw/vfio/spapr.c
+++ b/hw/vfio/spapr.c
@@ -9,7 +9,6 @@
*/
#include "qemu/osdep.h"
-#include "cpu.h"
#include <sys/ioctl.h>
#include <linux/vfio.h>
diff --git a/hw/xtensa/sim.c b/hw/xtensa/sim.c
index cbac50db2de3..c38e522b02e5 100644
--- a/hw/xtensa/sim.c
+++ b/hw/xtensa/sim.c
@@ -27,7 +27,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "cpu.h"
#include "sysemu/reset.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
diff --git a/hw/xtensa/virt.c b/hw/xtensa/virt.c
index bbf6200c4964..18d3c3cdb275 100644
--- a/hw/xtensa/virt.c
+++ b/hw/xtensa/virt.c
@@ -27,7 +27,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "cpu.h"
#include "sysemu/reset.h"
#include "hw/boards.h"
#include "hw/loader.h"
diff --git a/hw/xtensa/xtensa_memory.c b/hw/xtensa/xtensa_memory.c
index 1c5f62b01461..2c1095f01706 100644
--- a/hw/xtensa/xtensa_memory.c
+++ b/hw/xtensa/xtensa_memory.c
@@ -27,7 +27,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "cpu.h"
#include "exec/memory.h"
#include "qemu/error-report.h"
#include "xtensa_memory.h"
diff --git a/linux-user/main.c b/linux-user/main.c
index f956afccab62..57ba1b45ab6a 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -38,7 +38,6 @@
#include "qemu/help_option.h"
#include "qemu/module.h"
#include "qemu/plugin.h"
-#include "cpu.h"
#include "exec/exec-all.h"
#include "tcg/tcg.h"
#include "qemu/timer.h"
diff --git a/linux-user/semihost.c b/linux-user/semihost.c
index 82013b8b48bd..f53ab526fbab 100644
--- a/linux-user/semihost.c
+++ b/linux-user/semihost.c
@@ -11,7 +11,6 @@
*/
#include "qemu/osdep.h"
-#include "cpu.h"
#include "semihosting/console.h"
#include "qemu.h"
#include <termios.h>
diff --git a/migration/ram.c b/migration/ram.c
index 9e9b7380bf6c..ace8ad431cfe 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -27,7 +27,6 @@
*/
#include "qemu/osdep.h"
-#include "cpu.h"
#include "qemu/cutils.h"
#include "qemu/bitops.h"
#include "qemu/bitmap.h"
diff --git a/monitor/misc.c b/monitor/misc.c
index 55f374405367..f3a393ea590b 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -24,7 +24,6 @@
#include "qemu/osdep.h"
#include "monitor-internal.h"
-#include "cpu.h"
#include "monitor/qdev.h"
#include "hw/usb.h"
#include "hw/pci/pci.h"
diff --git a/plugins/api.c b/plugins/api.c
index 218e1342cda3..817c9b6b69c9 100644
--- a/plugins/api.c
+++ b/plugins/api.c
@@ -36,7 +36,6 @@
#include "qemu/osdep.h"
#include "qemu/plugin.h"
-#include "cpu.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 93b595a8d684..55d188af5139 100644
--- a/plugins/core.c
+++ b/plugins/core.c
@@ -23,7 +23,6 @@
#include "hw/core/cpu.h"
#include "exec/cpu-common.h"
-#include "cpu.h"
#include "exec/exec-all.h"
#include "exec/helper-proto.h"
#include "tcg/tcg.h"
diff --git a/plugins/loader.c b/plugins/loader.c
index 8550e61184c7..05df40398d62 100644
--- a/plugins/loader.c
+++ b/plugins/loader.c
@@ -27,7 +27,6 @@
#include "qemu/xxhash.h"
#include "qemu/plugin.h"
#include "hw/core/cpu.h"
-#include "cpu.h"
#include "exec/exec-all.h"
#ifndef CONFIG_USER_ONLY
#include "hw/boards.h"
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index f9c87245b82c..1c29146dcfa6 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -33,7 +33,6 @@
#include "qemu/osdep.h"
-#include "cpu.h"
#include "semihosting/semihost.h"
#include "semihosting/console.h"
#include "semihosting/common-semi.h"
diff --git a/semihosting/console.c b/semihosting/console.c
index a78af6938727..ef6958d8445a 100644
--- a/semihosting/console.c
+++ b/semihosting/console.c
@@ -16,7 +16,6 @@
*/
#include "qemu/osdep.h"
-#include "cpu.h"
#include "semihosting/semihost.h"
#include "semihosting/console.h"
#include "exec/gdbstub.h"
diff --git a/softmmu/arch_init.c b/softmmu/arch_init.c
index 8471711c54cc..f09bab830ced 100644
--- a/softmmu/arch_init.c
+++ b/softmmu/arch_init.c
@@ -22,7 +22,6 @@
* THE SOFTWARE.
*/
#include "qemu/osdep.h"
-#include "cpu.h"
#include "sysemu/arch_init.h"
#include "hw/pci/pci.h"
#include "hw/audio/soundhw.h"
diff --git a/softmmu/memory.c b/softmmu/memory.c
index d4493ef9e430..a62816647b97 100644
--- a/softmmu/memory.c
+++ b/softmmu/memory.c
@@ -16,7 +16,6 @@
#include "qemu/osdep.h"
#include "qemu/log.h"
#include "qapi/error.h"
-#include "cpu.h"
#include "exec/memory.h"
#include "exec/address-spaces.h"
#include "qapi/visitor.h"
diff --git a/softmmu/memory_mapping.c b/softmmu/memory_mapping.c
index 18d0b8067cb8..e7af27654660 100644
--- a/softmmu/memory_mapping.c
+++ b/softmmu/memory_mapping.c
@@ -14,7 +14,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "cpu.h"
#include "sysemu/memory_mapping.h"
#include "exec/memory.h"
#include "exec/address-spaces.h"
diff --git a/softmmu/physmem.c b/softmmu/physmem.c
index 7ed276b9b5f9..18218826146d 100644
--- a/softmmu/physmem.c
+++ b/softmmu/physmem.c
@@ -23,7 +23,6 @@
#include "qemu/cutils.h"
#include "qemu/cacheflush.h"
-#include "cpu.h"
#ifdef CONFIG_TCG
#include "hw/core/tcg-cpu-ops.h"
diff --git a/tcg/tcg-op-vec.c b/tcg/tcg-op-vec.c
index d19aa7373ea9..15e026ae49b9 100644
--- a/tcg/tcg-op-vec.c
+++ b/tcg/tcg-op-vec.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "cpu.h"
#include "tcg/tcg.h"
#include "tcg/tcg-op.h"
#include "tcg/tcg-mo.h"
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index 70475773f457..dcc2ed0bbc82 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "cpu.h"
#include "exec/exec-all.h"
#include "tcg/tcg.h"
#include "tcg/tcg-op.h"
diff --git a/tcg/tcg.c b/tcg/tcg.c
index cc947bf6f6a2..db806a6658e6 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -41,7 +41,6 @@
CPU definitions. Currently they are used for qemu_ld/st
instructions */
#define NO_CPU_IO_DEFS
-#include "cpu.h"
#include "exec/exec-all.h"
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PULL 18/23] Do not include exec/address-spaces.h if it's not really necessary
2021-05-03 8:36 [PULL 00/23] Trivial branch for 6.1 patches Laurent Vivier
` (16 preceding siblings ...)
2021-05-03 8:36 ` [PULL 17/23] Do not include cpu.h " Laurent Vivier
@ 2021-05-03 8:36 ` Laurent Vivier
2021-05-03 8:36 ` [PULL 19/23] mc146818rtc: put it into the 'misc' category Laurent Vivier
` (5 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Laurent Vivier @ 2021-05-03 8:36 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Thomas Huth, Michael Tokarev, Laurent Vivier
From: Thomas Huth <thuth@redhat.com>
Stop including exec/address-spaces.h in files that don't need it.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210416171314.2074665-5-thuth@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
accel/kvm/kvm-all.c | 1 -
accel/tcg/cputlb.c | 1 -
hw/acpi/generic_event_device.c | 1 -
hw/acpi/ich9.c | 1 -
hw/acpi/pcihp.c | 1 -
hw/acpi/piix4.c | 1 -
hw/alpha/typhoon.c | 1 -
hw/arm/allwinner-a10.c | 1 -
hw/arm/allwinner-h3.c | 1 -
hw/arm/armv7m.c | 1 -
hw/arm/aspeed.c | 1 -
hw/arm/aspeed_ast2600.c | 1 -
hw/arm/aspeed_soc.c | 1 -
hw/arm/boot.c | 1 -
hw/arm/cubieboard.c | 1 -
hw/arm/digic_boards.c | 1 -
hw/arm/fsl-imx25.c | 1 -
hw/arm/highbank.c | 1 -
hw/arm/imx25_pdk.c | 1 -
hw/arm/musicpal.c | 1 -
hw/arm/npcm7xx.c | 1 -
hw/arm/npcm7xx_boards.c | 1 -
hw/arm/nrf51_soc.c | 1 -
hw/arm/nseries.c | 1 -
hw/arm/palm.c | 1 -
hw/arm/realview.c | 1 -
hw/arm/sbsa-ref.c | 1 -
hw/arm/smmu-common.c | 1 -
hw/arm/smmuv3.c | 1 -
hw/arm/versatilepb.c | 1 -
hw/arm/vexpress.c | 1 -
hw/arm/virt.c | 1 -
hw/arm/xilinx_zynq.c | 1 -
hw/arm/xlnx-versal-virt.c | 1 -
hw/arm/xlnx-zynqmp.c | 1 -
hw/char/mchp_pfsoc_mmuart.c | 1 -
hw/core/loader.c | 1 -
hw/cris/axis_dev88.c | 1 -
hw/dma/pl080.c | 1 -
hw/hppa/dino.c | 1 -
hw/hppa/lasi.c | 1 -
hw/i386/intel_iommu.c | 1 -
hw/i386/pc.c | 1 -
hw/i386/pc_piix.c | 1 -
hw/i386/pc_q35.c | 1 -
hw/i386/xen/xen-hvm.c | 1 -
hw/i386/xen/xen_platform.c | 1 -
hw/intc/openpic_kvm.c | 1 -
hw/isa/lpc_ich9.c | 1 -
hw/isa/vt82c686.c | 1 -
hw/lm32/lm32_boards.c | 1 -
hw/lm32/milkymist.c | 1 -
hw/m68k/an5206.c | 1 -
hw/m68k/mcf5208.c | 1 -
hw/m68k/next-cube.c | 1 -
hw/m68k/next-kbd.c | 1 -
hw/m68k/q800.c | 1 -
hw/m68k/virt.c | 1 -
hw/mem/sparse-mem.c | 1 -
hw/mips/boston.c | 1 -
hw/mips/fuloong2e.c | 1 -
hw/mips/gt64xxx_pci.c | 1 -
hw/mips/jazz.c | 1 -
hw/mips/loongson3_virt.c | 1 -
hw/mips/malta.c | 1 -
hw/mips/mipssim.c | 1 -
hw/moxie/moxiesim.c | 1 -
hw/net/msf2-emac.c | 1 -
hw/nvram/nrf51_nvm.c | 1 -
hw/openrisc/openrisc_sim.c | 1 -
hw/pci-host/bonito.c | 1 -
hw/pci-host/ppce500.c | 1 -
hw/pci-host/prep.c | 1 -
hw/pci-host/sabre.c | 1 -
hw/pci-host/sh_pci.c | 1 -
hw/pci/pci.c | 1 -
hw/pci/pcie_host.c | 1 -
hw/ppc/e500.c | 1 -
hw/ppc/mac_newworld.c | 1 -
hw/ppc/mac_oldworld.c | 1 -
hw/ppc/pnv.c | 1 -
hw/ppc/pnv_psi.c | 1 -
hw/ppc/ppc405_boards.c | 1 -
hw/ppc/ppc440_bamboo.c | 1 -
hw/ppc/ppc440_pcix.c | 1 -
hw/ppc/ppc440_uc.c | 1 -
hw/ppc/ppc4xx_pci.c | 1 -
hw/ppc/prep.c | 1 -
hw/ppc/sam460ex.c | 1 -
hw/ppc/spapr.c | 1 -
hw/ppc/spapr_iommu.c | 1 -
hw/ppc/spapr_pci.c | 1 -
hw/ppc/virtex_ml507.c | 1 -
hw/remote/machine.c | 1 -
hw/remote/memory.c | 1 -
hw/remote/proxy-memory-listener.c | 1 -
hw/riscv/opentitan.c | 1 -
hw/riscv/sifive_e.c | 1 -
hw/rtc/m48t59.c | 1 -
hw/rtc/mc146818rtc.c | 1 -
hw/s390x/s390-virtio-ccw.c | 1 -
hw/sh4/r2d.c | 1 -
hw/sh4/shix.c | 1 -
hw/sparc/leon3.c | 1 -
hw/sparc64/niagara.c | 1 -
hw/ssi/aspeed_smc.c | 1 -
hw/tpm/tpm_crb.c | 1 -
hw/tricore/tc27x_soc.c | 1 -
hw/tricore/triboard.c | 1 -
hw/tricore/tricore_testboard.c | 1 -
hw/virtio/vhost.c | 1 -
hw/virtio/virtio.c | 1 -
hw/xen/xen_pt.c | 1 -
hw/xtensa/sim.c | 1 -
hw/xtensa/virt.c | 1 -
hw/xtensa/xtfpga.c | 1 -
softmmu/memory.c | 1 -
softmmu/physmem.c | 1 -
target/i386/hvf/hvf.c | 1 -
target/i386/hvf/x86_mmu.c | 1 -
target/i386/sev.c | 1 -
target/s390x/diag.c | 1 -
target/xtensa/op_helper.c | 1 -
tests/qtest/fuzz/generic_fuzz.c | 2 --
tests/qtest/fuzz/qos_fuzz.c | 1 -
125 files changed, 126 deletions(-)
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 50e56664cc6d..4e0168e88b9e 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -33,7 +33,6 @@
#include "qemu/bswap.h"
#include "exec/memory.h"
#include "exec/ram_addr.h"
-#include "exec/address-spaces.h"
#include "qemu/event_notifier.h"
#include "qemu/main-loop.h"
#include "trace.h"
diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index 502f803e5e73..84e7d91a5ca0 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -22,7 +22,6 @@
#include "hw/core/tcg-cpu-ops.h"
#include "exec/exec-all.h"
#include "exec/memory.h"
-#include "exec/address-spaces.h"
#include "exec/cpu_ldst.h"
#include "exec/cputlb.h"
#include "exec/tb-hash.h"
diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c
index 5454be67d5f0..39c825763ad8 100644
--- a/hw/acpi/generic_event_device.c
+++ b/hw/acpi/generic_event_device.c
@@ -11,7 +11,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "exec/address-spaces.h"
#include "hw/acpi/acpi.h"
#include "hw/acpi/generic_event_device.h"
#include "hw/irq.h"
diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
index 853447cf9d2a..4daa79ec8d60 100644
--- a/hw/acpi/ich9.c
+++ b/hw/acpi/ich9.c
@@ -35,7 +35,6 @@
#include "sysemu/runstate.h"
#include "hw/acpi/acpi.h"
#include "hw/acpi/tco.h"
-#include "exec/address-spaces.h"
#include "hw/i386/ich9.h"
#include "hw/mem/pc-dimm.h"
diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c
index f4cb3c979d06..4999277d57b8 100644
--- a/hw/acpi/pcihp.c
+++ b/hw/acpi/pcihp.c
@@ -31,7 +31,6 @@
#include "hw/pci/pci.h"
#include "hw/pci/pci_bridge.h"
#include "hw/acpi/acpi.h"
-#include "exec/address-spaces.h"
#include "hw/pci/pci_bus.h"
#include "migration/vmstate.h"
#include "qapi/error.h"
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index 8f8b0e95e520..0bd23d74e242 100644
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -33,7 +33,6 @@
#include "sysemu/xen.h"
#include "qapi/error.h"
#include "qemu/range.h"
-#include "exec/address-spaces.h"
#include "hw/acpi/pcihp.h"
#include "hw/acpi/cpu_hotplug.h"
#include "hw/acpi/cpu.h"
diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c
index 96c35c5fdbd8..87020cbe0d8b 100644
--- a/hw/alpha/typhoon.c
+++ b/hw/alpha/typhoon.c
@@ -13,7 +13,6 @@
#include "cpu.h"
#include "hw/irq.h"
#include "alpha_sys.h"
-#include "exec/address-spaces.h"
#include "qom/object.h"
diff --git a/hw/arm/allwinner-a10.c b/hw/arm/allwinner-a10.c
index 0844a656417d..05e84728cb34 100644
--- a/hw/arm/allwinner-a10.c
+++ b/hw/arm/allwinner-a10.c
@@ -16,7 +16,6 @@
*/
#include "qemu/osdep.h"
-#include "exec/address-spaces.h"
#include "qapi/error.h"
#include "qemu/module.h"
#include "hw/sysbus.h"
diff --git a/hw/arm/allwinner-h3.c b/hw/arm/allwinner-h3.c
index bbe65d1860c6..27f10701453e 100644
--- a/hw/arm/allwinner-h3.c
+++ b/hw/arm/allwinner-h3.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "exec/address-spaces.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "qemu/module.h"
diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
index caeed29670a9..af0d935bf78e 100644
--- a/hw/arm/armv7m.c
+++ b/hw/arm/armv7m.c
@@ -18,7 +18,6 @@
#include "sysemu/reset.h"
#include "qemu/error-report.h"
#include "qemu/module.h"
-#include "exec/address-spaces.h"
#include "target/arm/idau.h"
/* Bitbanded IO. Each word corresponds to a single bit. */
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index 7480533cb7cf..b623226cdf5d 100644
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -11,7 +11,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "exec/address-spaces.h"
#include "hw/arm/boot.h"
#include "hw/arm/aspeed.h"
#include "hw/arm/aspeed_soc.h"
diff --git a/hw/arm/aspeed_ast2600.c b/hw/arm/aspeed_ast2600.c
index 8e4ef07b148c..8202b4f17447 100644
--- a/hw/arm/aspeed_ast2600.c
+++ b/hw/arm/aspeed_ast2600.c
@@ -9,7 +9,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "exec/address-spaces.h"
#include "hw/misc/unimp.h"
#include "hw/arm/aspeed_soc.h"
#include "hw/char/serial.h"
diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c
index fc270daa579b..abc90ed8ec47 100644
--- a/hw/arm/aspeed_soc.c
+++ b/hw/arm/aspeed_soc.c
@@ -12,7 +12,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "exec/address-spaces.h"
#include "hw/misc/unimp.h"
#include "hw/arm/aspeed_soc.h"
#include "hw/char/serial.h"
diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index e56c42ac22cf..d7b059225e61 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -25,7 +25,6 @@
#include "sysemu/device_tree.h"
#include "qemu/config-file.h"
#include "qemu/option.h"
-#include "exec/address-spaces.h"
#include "qemu/units.h"
/* Kernel boot protocol is specified in the kernel docs
diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c
index d7184e5ec281..294ba5de6ec7 100644
--- a/hw/arm/cubieboard.c
+++ b/hw/arm/cubieboard.c
@@ -16,7 +16,6 @@
*/
#include "qemu/osdep.h"
-#include "exec/address-spaces.h"
#include "qapi/error.h"
#include "hw/boards.h"
#include "hw/qdev-properties.h"
diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c
index fdb678156767..b771a3d8b740 100644
--- a/hw/arm/digic_boards.c
+++ b/hw/arm/digic_boards.c
@@ -28,7 +28,6 @@
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "hw/boards.h"
-#include "exec/address-spaces.h"
#include "qemu/error-report.h"
#include "hw/arm/digic.h"
#include "hw/block/flash.h"
diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c
index dafc0bef470f..24c437459033 100644
--- a/hw/arm/fsl-imx25.c
+++ b/hw/arm/fsl-imx25.c
@@ -26,7 +26,6 @@
#include "qapi/error.h"
#include "hw/arm/fsl-imx25.h"
#include "sysemu/sysemu.h"
-#include "exec/address-spaces.h"
#include "hw/qdev-properties.h"
#include "chardev/char.h"
diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c
index 5afdd28b35c1..c3cb315dbc63 100644
--- a/hw/arm/highbank.c
+++ b/hw/arm/highbank.c
@@ -29,7 +29,6 @@
#include "sysemu/runstate.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
-#include "exec/address-spaces.h"
#include "qemu/error-report.h"
#include "hw/char/pl011.h"
#include "hw/ide/ahci.h"
diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c
index 9c58fbde57ae..11426e5ec0c3 100644
--- a/hw/arm/imx25_pdk.c
+++ b/hw/arm/imx25_pdk.c
@@ -29,7 +29,6 @@
#include "hw/arm/fsl-imx25.h"
#include "hw/boards.h"
#include "qemu/error-report.h"
-#include "exec/address-spaces.h"
#include "sysemu/qtest.h"
#include "hw/i2c/i2c.h"
#include "qemu/cutils.h"
diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
index 7d67dc72542e..2d612cc0c9be 100644
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@@ -31,7 +31,6 @@
#include "sysemu/block-backend.h"
#include "sysemu/runstate.h"
#include "sysemu/dma.h"
-#include "exec/address-spaces.h"
#include "ui/pixel_ops.h"
#include "qemu/cutils.h"
#include "qom/object.h"
diff --git a/hw/arm/npcm7xx.c b/hw/arm/npcm7xx.c
index 495b0f8e91d7..2ab0080e0b00 100644
--- a/hw/arm/npcm7xx.c
+++ b/hw/arm/npcm7xx.c
@@ -16,7 +16,6 @@
#include "qemu/osdep.h"
-#include "exec/address-spaces.h"
#include "hw/arm/boot.h"
#include "hw/arm/npcm7xx.h"
#include "hw/char/serial.h"
diff --git a/hw/arm/npcm7xx_boards.c b/hw/arm/npcm7xx_boards.c
index d91d6877001e..d4553e378650 100644
--- a/hw/arm/npcm7xx_boards.c
+++ b/hw/arm/npcm7xx_boards.c
@@ -16,7 +16,6 @@
#include "qemu/osdep.h"
-#include "exec/address-spaces.h"
#include "hw/arm/npcm7xx.h"
#include "hw/core/cpu.h"
#include "hw/i2c/smbus_eeprom.h"
diff --git a/hw/arm/nrf51_soc.c b/hw/arm/nrf51_soc.c
index 71bdcf06b49d..9407c2f268bd 100644
--- a/hw/arm/nrf51_soc.c
+++ b/hw/arm/nrf51_soc.c
@@ -13,7 +13,6 @@
#include "hw/arm/boot.h"
#include "hw/sysbus.h"
#include "hw/misc/unimp.h"
-#include "exec/address-spaces.h"
#include "qemu/log.h"
#include "hw/arm/nrf51.h"
diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c
index 387eea4d44c5..0aefa5d0f3ed 100644
--- a/hw/arm/nseries.c
+++ b/hw/arm/nseries.c
@@ -43,7 +43,6 @@
#include "hw/loader.h"
#include "hw/sysbus.h"
#include "qemu/log.h"
-#include "exec/address-spaces.h"
/* Nokia N8x0 support */
struct n800_s {
diff --git a/hw/arm/palm.c b/hw/arm/palm.c
index 4e3dc5fbbf2e..68e11dd1ecc1 100644
--- a/hw/arm/palm.c
+++ b/hw/arm/palm.c
@@ -29,7 +29,6 @@
#include "hw/input/tsc2xxx.h"
#include "hw/irq.h"
#include "hw/loader.h"
-#include "exec/address-spaces.h"
#include "cpu.h"
#include "qemu/cutils.h"
#include "qom/object.h"
diff --git a/hw/arm/realview.c b/hw/arm/realview.c
index 0831159d1587..1c54316ba38e 100644
--- a/hw/arm/realview.c
+++ b/hw/arm/realview.c
@@ -20,7 +20,6 @@
#include "sysemu/sysemu.h"
#include "hw/boards.h"
#include "hw/i2c/i2c.h"
-#include "exec/address-spaces.h"
#include "qemu/error-report.h"
#include "hw/char/pl011.h"
#include "hw/cpu/a9mpcore.h"
diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c
index 88dfb2284c1b..43c19b49234f 100644
--- a/hw/arm/sbsa-ref.c
+++ b/hw/arm/sbsa-ref.c
@@ -27,7 +27,6 @@
#include "sysemu/numa.h"
#include "sysemu/runstate.h"
#include "sysemu/sysemu.h"
-#include "exec/address-spaces.h"
#include "exec/hwaddr.h"
#include "kvm_arm.h"
#include "hw/arm/boot.h"
diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c
index 84d2c62c26f7..0459850a93d9 100644
--- a/hw/arm/smmu-common.c
+++ b/hw/arm/smmu-common.c
@@ -17,7 +17,6 @@
*/
#include "qemu/osdep.h"
-#include "exec/address-spaces.h"
#include "trace.h"
#include "exec/target_page.h"
#include "hw/core/cpu.h"
diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c
index 228dc54b0bc9..7bed2ac520bd 100644
--- a/hw/arm/smmuv3.c
+++ b/hw/arm/smmuv3.c
@@ -23,7 +23,6 @@
#include "migration/vmstate.h"
#include "hw/qdev-core.h"
#include "hw/pci/pci.h"
-#include "exec/address-spaces.h"
#include "cpu.h"
#include "trace.h"
#include "qemu/log.h"
diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c
index 1ea553462647..575399c4fc98 100644
--- a/hw/arm/versatilepb.c
+++ b/hw/arm/versatilepb.c
@@ -21,7 +21,6 @@
#include "hw/i2c/arm_sbcon_i2c.h"
#include "hw/irq.h"
#include "hw/boards.h"
-#include "exec/address-spaces.h"
#include "hw/block/flash.h"
#include "qemu/error-report.h"
#include "hw/char/pl011.h"
diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
index 326a1a6db52c..58481c07629a 100644
--- a/hw/arm/vexpress.c
+++ b/hw/arm/vexpress.c
@@ -35,7 +35,6 @@
#include "sysemu/sysemu.h"
#include "hw/boards.h"
#include "hw/loader.h"
-#include "exec/address-spaces.h"
#include "hw/block/flash.h"
#include "sysemu/device_tree.h"
#include "qemu/error-report.h"
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index d8cfdf23c622..0a78532018ae 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -50,7 +50,6 @@
#include "sysemu/tpm.h"
#include "sysemu/kvm.h"
#include "hw/loader.h"
-#include "exec/address-spaces.h"
#include "qemu/bitops.h"
#include "qemu/error-report.h"
#include "qemu/module.h"
diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c
index 8db6cfd47f57..85f25d15dbf7 100644
--- a/hw/arm/xilinx_zynq.c
+++ b/hw/arm/xilinx_zynq.c
@@ -22,7 +22,6 @@
#include "hw/sysbus.h"
#include "hw/arm/boot.h"
#include "net/net.h"
-#include "exec/address-spaces.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
#include "hw/block/flash.h"
diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c
index 73e8268b353b..5bca360dcec4 100644
--- a/hw/arm/xlnx-versal-virt.c
+++ b/hw/arm/xlnx-versal-virt.c
@@ -13,7 +13,6 @@
#include "qemu/error-report.h"
#include "qapi/error.h"
#include "sysemu/device_tree.h"
-#include "exec/address-spaces.h"
#include "hw/boards.h"
#include "hw/sysbus.h"
#include "hw/arm/sysbus-fdt.h"
diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c
index 6c93dcb8203b..3597e8db4ded 100644
--- a/hw/arm/xlnx-zynqmp.c
+++ b/hw/arm/xlnx-zynqmp.c
@@ -21,7 +21,6 @@
#include "hw/arm/xlnx-zynqmp.h"
#include "hw/intc/arm_gic_common.h"
#include "hw/boards.h"
-#include "exec/address-spaces.h"
#include "sysemu/kvm.h"
#include "sysemu/sysemu.h"
#include "kvm_arm.h"
diff --git a/hw/char/mchp_pfsoc_mmuart.c b/hw/char/mchp_pfsoc_mmuart.c
index 8a002b0a19f5..2facf85c2d82 100644
--- a/hw/char/mchp_pfsoc_mmuart.c
+++ b/hw/char/mchp_pfsoc_mmuart.c
@@ -23,7 +23,6 @@
#include "qemu/osdep.h"
#include "qemu/log.h"
#include "chardev/char.h"
-#include "exec/address-spaces.h"
#include "hw/char/mchp_pfsoc_mmuart.h"
static uint64_t mchp_pfsoc_mmuart_read(void *opaque, hwaddr addr, unsigned size)
diff --git a/hw/core/loader.c b/hw/core/loader.c
index d3e5f3b423f6..5b34869a5417 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -57,7 +57,6 @@
#include "hw/loader.h"
#include "hw/nvram/fw_cfg.h"
#include "exec/memory.h"
-#include "exec/address-spaces.h"
#include "hw/boards.h"
#include "qemu/cutils.h"
#include "sysemu/runstate.h"
diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c
index af5a0e351739..d82050d927d6 100644
--- a/hw/cris/axis_dev88.c
+++ b/hw/cris/axis_dev88.c
@@ -34,7 +34,6 @@
#include "hw/loader.h"
#include "elf.h"
#include "boot.h"
-#include "exec/address-spaces.h"
#include "sysemu/qtest.h"
#include "sysemu/sysemu.h"
diff --git a/hw/dma/pl080.c b/hw/dma/pl080.c
index f1a586b1d71f..2627307cc85a 100644
--- a/hw/dma/pl080.c
+++ b/hw/dma/pl080.c
@@ -10,7 +10,6 @@
#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
-#include "exec/address-spaces.h"
#include "qemu/log.h"
#include "qemu/module.h"
#include "hw/dma/pl080.h"
diff --git a/hw/hppa/dino.c b/hw/hppa/dino.c
index bd97e0c51ddf..eab96dd84ef0 100644
--- a/hw/hppa/dino.c
+++ b/hw/hppa/dino.c
@@ -19,7 +19,6 @@
#include "hw/pci/pci_bus.h"
#include "migration/vmstate.h"
#include "hppa_sys.h"
-#include "exec/address-spaces.h"
#include "trace.h"
#include "qom/object.h"
diff --git a/hw/hppa/lasi.c b/hw/hppa/lasi.c
index 408af9ccb72c..88c3791eb683 100644
--- a/hw/hppa/lasi.c
+++ b/hw/hppa/lasi.c
@@ -22,7 +22,6 @@
#include "hw/char/parallel.h"
#include "hw/char/serial.h"
#include "hw/input/lasips2.h"
-#include "exec/address-spaces.h"
#include "migration/vmstate.h"
#include "qom/object.h"
diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
index 1c106434325d..209b3f55530e 100644
--- a/hw/i386/intel_iommu.c
+++ b/hw/i386/intel_iommu.c
@@ -24,7 +24,6 @@
#include "qemu/main-loop.h"
#include "qapi/error.h"
#include "hw/sysbus.h"
-#include "exec/address-spaces.h"
#include "intel_iommu_internal.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_bus.h"
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 88ca37bb6591..8cfaf216e7be 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -65,7 +65,6 @@
#include "hw/xen/start_info.h"
#include "ui/qemu-spice.h"
#include "exec/memory.h"
-#include "exec/address-spaces.h"
#include "sysemu/arch_init.h"
#include "qemu/bitmap.h"
#include "qemu/config-file.h"
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 9adf4110538a..5ac2edbf1f80 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -47,7 +47,6 @@
#include "hw/i2c/smbus_eeprom.h"
#include "hw/xen/xen-x86.h"
#include "exec/memory.h"
-#include "exec/address-spaces.h"
#include "hw/acpi/acpi.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 458ed41c65de..46a0f196f413 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -38,7 +38,6 @@
#include "hw/kvm/clock.h"
#include "hw/pci-host/q35.h"
#include "hw/qdev-properties.h"
-#include "exec/address-spaces.h"
#include "hw/i386/x86.h"
#include "hw/i386/pc.h"
#include "hw/i386/ich9.h"
diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c
index 7ce672e5a5c3..c53fa17c502a 100644
--- a/hw/i386/xen/xen-hvm.c
+++ b/hw/i386/xen/xen-hvm.c
@@ -33,7 +33,6 @@
#include "sysemu/xen.h"
#include "sysemu/xen-mapcache.h"
#include "trace.h"
-#include "exec/address-spaces.h"
#include <xen/hvm/ioreq.h>
#include <xen/hvm/e820.h>
diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c
index bf4f20e92b6f..72028449bae0 100644
--- a/hw/i386/xen/xen_platform.c
+++ b/hw/i386/xen/xen_platform.c
@@ -31,7 +31,6 @@
#include "migration/vmstate.h"
#include "hw/xen/xen-legacy-backend.h"
#include "trace.h"
-#include "exec/address-spaces.h"
#include "sysemu/xen.h"
#include "sysemu/block-backend.h"
#include "qemu/error-report.h"
diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c
index 16badace8b0d..21da680389da 100644
--- a/hw/intc/openpic_kvm.c
+++ b/hw/intc/openpic_kvm.c
@@ -25,7 +25,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include <sys/ioctl.h>
-#include "exec/address-spaces.h"
#include "hw/ppc/openpic.h"
#include "hw/ppc/openpic_kvm.h"
#include "hw/pci/msi.h"
diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c
index 160bea447aab..5f9de0239cf9 100644
--- a/hw/isa/lpc_ich9.c
+++ b/hw/isa/lpc_ich9.c
@@ -44,7 +44,6 @@
#include "hw/acpi/ich9.h"
#include "hw/pci/pci_bus.h"
#include "hw/qdev-properties.h"
-#include "exec/address-spaces.h"
#include "sysemu/runstate.h"
#include "sysemu/sysemu.h"
#include "hw/core/cpu.h"
diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
index 98325bb32b38..31b1818b218f 100644
--- a/hw/isa/vt82c686.c
+++ b/hw/isa/vt82c686.c
@@ -30,7 +30,6 @@
#include "qemu/module.h"
#include "qemu/range.h"
#include "qemu/timer.h"
-#include "exec/address-spaces.h"
#include "trace.h"
#define TYPE_VIA_PM "via-pm"
diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c
index b5d97dd53edd..2961e4c2b463 100644
--- a/hw/lm32/lm32_boards.c
+++ b/hw/lm32/lm32_boards.c
@@ -30,7 +30,6 @@
#include "elf.h"
#include "lm32_hwsetup.h"
#include "lm32.h"
-#include "exec/address-spaces.h"
#include "sysemu/reset.h"
#include "sysemu/sysemu.h"
diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c
index 72d1326531a9..bef785532855 100644
--- a/hw/lm32/milkymist.c
+++ b/hw/lm32/milkymist.c
@@ -37,7 +37,6 @@
#include "hw/display/milkymist_tmu2.h"
#include "hw/sd/sd.h"
#include "lm32.h"
-#include "exec/address-spaces.h"
#include "qemu/cutils.h"
#define BIOS_FILENAME "mmone-bios.bin"
diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c
index 673898b0eac6..11ae4c9795b9 100644
--- a/hw/m68k/an5206.c
+++ b/hw/m68k/an5206.c
@@ -13,7 +13,6 @@
#include "hw/boards.h"
#include "hw/loader.h"
#include "elf.h"
-#include "exec/address-spaces.h"
#include "qemu/error-report.h"
#include "sysemu/qtest.h"
diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c
index 7a03c71059b7..93812ee206ea 100644
--- a/hw/m68k/mcf5208.c
+++ b/hw/m68k/mcf5208.c
@@ -26,7 +26,6 @@
#include "hw/loader.h"
#include "hw/sysbus.h"
#include "elf.h"
-#include "exec/address-spaces.h"
#define SYS_FREQ 166666666
diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c
index 5bd4f2d83282..de951ffe5d39 100644
--- a/hw/m68k/next-cube.c
+++ b/hw/m68k/next-cube.c
@@ -11,7 +11,6 @@
#include "qemu/osdep.h"
#include "exec/hwaddr.h"
-#include "exec/address-spaces.h"
#include "sysemu/sysemu.h"
#include "sysemu/qtest.h"
#include "hw/irq.h"
diff --git a/hw/m68k/next-kbd.c b/hw/m68k/next-kbd.c
index 30a8c9fbfabf..0544160e916d 100644
--- a/hw/m68k/next-kbd.c
+++ b/hw/m68k/next-kbd.c
@@ -29,7 +29,6 @@
#include "qemu/osdep.h"
#include "qemu/log.h"
-#include "exec/address-spaces.h"
#include "hw/sysbus.h"
#include "hw/m68k/next-cube.h"
#include "ui/console.h"
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index d1ab1ff77d5c..11376daa858a 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -31,7 +31,6 @@
#include "elf.h"
#include "hw/loader.h"
#include "ui/console.h"
-#include "exec/address-spaces.h"
#include "hw/char/escc.h"
#include "hw/sysbus.h"
#include "hw/scsi/esp.h"
diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c
index 9469f82800c9..4e8bce5aa6f7 100644
--- a/hw/m68k/virt.c
+++ b/hw/m68k/virt.c
@@ -17,7 +17,6 @@
#include "elf.h"
#include "hw/loader.h"
#include "ui/console.h"
-#include "exec/address-spaces.h"
#include "hw/sysbus.h"
#include "standard-headers/asm-m68k/bootinfo.h"
#include "standard-headers/asm-m68k/bootinfo-virt.h"
diff --git a/hw/mem/sparse-mem.c b/hw/mem/sparse-mem.c
index a13ac74dd9f2..e6640eb8e722 100644
--- a/hw/mem/sparse-mem.c
+++ b/hw/mem/sparse-mem.c
@@ -12,7 +12,6 @@
#include "qemu/osdep.h"
-#include "exec/address-spaces.h"
#include "hw/qdev-properties.h"
#include "hw/sysbus.h"
#include "qapi/error.h"
diff --git a/hw/mips/boston.c b/hw/mips/boston.c
index ac2e93a05aaa..20b06865b2b1 100644
--- a/hw/mips/boston.c
+++ b/hw/mips/boston.c
@@ -20,7 +20,6 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
-#include "exec/address-spaces.h"
#include "hw/boards.h"
#include "hw/char/serial.h"
#include "hw/ide/pci.h"
diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c
index 1851eb0944b1..c1b8066a13b0 100644
--- a/hw/mips/fuloong2e.c
+++ b/hw/mips/fuloong2e.c
@@ -38,7 +38,6 @@
#include "hw/qdev-properties.h"
#include "elf.h"
#include "hw/isa/vt82c686.h"
-#include "exec/address-spaces.h"
#include "sysemu/qtest.h"
#include "sysemu/reset.h"
#include "sysemu/sysemu.h"
diff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c
index 43349d6837d3..c7480bd0196c 100644
--- a/hw/mips/gt64xxx_pci.c
+++ b/hw/mips/gt64xxx_pci.c
@@ -33,7 +33,6 @@
#include "migration/vmstate.h"
#include "hw/intc/i8259.h"
#include "hw/irq.h"
-#include "exec/address-spaces.h"
#include "trace.h"
#include "qom/object.h"
diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c
index 1a0888a0fd50..dba2088ed1a1 100644
--- a/hw/mips/jazz.c
+++ b/hw/mips/jazz.c
@@ -47,7 +47,6 @@
#include "hw/audio/pcspk.h"
#include "hw/input/i8042.h"
#include "hw/sysbus.h"
-#include "exec/address-spaces.h"
#include "sysemu/qtest.h"
#include "sysemu/reset.h"
#include "qapi/error.h"
diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c
index 16f7f84d3404..ae192db0c8b9 100644
--- a/hw/mips/loongson3_virt.c
+++ b/hw/mips/loongson3_virt.c
@@ -47,7 +47,6 @@
#include "hw/pci-host/gpex.h"
#include "hw/usb.h"
#include "net/net.h"
-#include "exec/address-spaces.h"
#include "sysemu/kvm.h"
#include "sysemu/qtest.h"
#include "sysemu/reset.h"
diff --git a/hw/mips/malta.c b/hw/mips/malta.c
index 459791414ab8..7dcf175d726c 100644
--- a/hw/mips/malta.c
+++ b/hw/mips/malta.c
@@ -45,7 +45,6 @@
#include "hw/irq.h"
#include "hw/loader.h"
#include "elf.h"
-#include "exec/address-spaces.h"
#include "qom/object.h"
#include "hw/sysbus.h" /* SysBusDevice */
#include "qemu/host-utils.h"
diff --git a/hw/mips/mipssim.c b/hw/mips/mipssim.c
index 2e0d4aceedc5..2325e7e05acb 100644
--- a/hw/mips/mipssim.c
+++ b/hw/mips/mipssim.c
@@ -42,7 +42,6 @@
#include "elf.h"
#include "hw/sysbus.h"
#include "hw/qdev-properties.h"
-#include "exec/address-spaces.h"
#include "qemu/error-report.h"
#include "sysemu/qtest.h"
#include "sysemu/reset.h"
diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c
index 196b730589d4..3d255d4879c8 100644
--- a/hw/moxie/moxiesim.c
+++ b/hw/moxie/moxiesim.c
@@ -35,7 +35,6 @@
#include "hw/boards.h"
#include "hw/loader.h"
#include "hw/char/serial.h"
-#include "exec/address-spaces.h"
#include "elf.h"
#define PHYS_MEM_BASE 0x80000000
diff --git a/hw/net/msf2-emac.c b/hw/net/msf2-emac.c
index 3e6206044f8b..9278fdce0b3d 100644
--- a/hw/net/msf2-emac.c
+++ b/hw/net/msf2-emac.c
@@ -32,7 +32,6 @@
#include "qemu-common.h"
#include "qemu/log.h"
#include "qapi/error.h"
-#include "exec/address-spaces.h"
#include "hw/registerfields.h"
#include "hw/net/msf2-emac.h"
#include "hw/net/mii.h"
diff --git a/hw/nvram/nrf51_nvm.c b/hw/nvram/nrf51_nvm.c
index 7b3460d52da4..7f1db8c4239e 100644
--- a/hw/nvram/nrf51_nvm.c
+++ b/hw/nvram/nrf51_nvm.c
@@ -21,7 +21,6 @@
#include "qapi/error.h"
#include "qemu/log.h"
#include "qemu/module.h"
-#include "exec/address-spaces.h"
#include "hw/arm/nrf51.h"
#include "hw/nvram/nrf51_nvm.h"
#include "hw/qdev-properties.h"
diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c
index 39f1d344ae97..73fe383c2de8 100644
--- a/hw/openrisc/openrisc_sim.c
+++ b/hw/openrisc/openrisc_sim.c
@@ -29,7 +29,6 @@
#include "net/net.h"
#include "hw/loader.h"
#include "hw/qdev-properties.h"
-#include "exec/address-spaces.h"
#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
#include "sysemu/qtest.h"
diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c
index 2a2db7cea69f..afb3d1f81d5e 100644
--- a/hw/pci-host/bonito.c
+++ b/hw/pci-host/bonito.c
@@ -49,7 +49,6 @@
#include "migration/vmstate.h"
#include "sysemu/reset.h"
#include "sysemu/runstate.h"
-#include "exec/address-spaces.h"
#include "hw/misc/unimp.h"
#include "hw/registerfields.h"
#include "qom/object.h"
diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c
index 5ad1424b31a4..89c1b53dd72b 100644
--- a/hw/pci-host/ppce500.c
+++ b/hw/pci-host/ppce500.c
@@ -415,7 +415,6 @@ static const VMStateDescription vmstate_ppce500_pci = {
}
};
-#include "exec/address-spaces.h"
static void e500_pcihost_bridge_realize(PCIDevice *d, Error **errp)
{
diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c
index 0a9162fba979..9fef74fc56cd 100644
--- a/hw/pci-host/prep.c
+++ b/hw/pci-host/prep.c
@@ -38,7 +38,6 @@
#include "hw/irq.h"
#include "hw/loader.h"
#include "hw/or-irq.h"
-#include "exec/address-spaces.h"
#include "elf.h"
#include "qom/object.h"
diff --git a/hw/pci-host/sabre.c b/hw/pci-host/sabre.c
index f41a0cc30131..949ecc21f2b5 100644
--- a/hw/pci-host/sabre.c
+++ b/hw/pci-host/sabre.c
@@ -34,7 +34,6 @@
#include "hw/irq.h"
#include "hw/pci-bridge/simba.h"
#include "hw/pci-host/sabre.h"
-#include "exec/address-spaces.h"
#include "qapi/error.h"
#include "qemu/log.h"
#include "qemu/module.h"
diff --git a/hw/pci-host/sh_pci.c b/hw/pci-host/sh_pci.c
index 734892f47c7d..08c1562e2281 100644
--- a/hw/pci-host/sh_pci.c
+++ b/hw/pci-host/sh_pci.c
@@ -30,7 +30,6 @@
#include "hw/pci/pci_host.h"
#include "qemu/bswap.h"
#include "qemu/module.h"
-#include "exec/address-spaces.h"
#include "qom/object.h"
#define TYPE_SH_PCI_HOST_BRIDGE "sh_pci"
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 8f35e13a0cb5..377084f1a8d3 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -45,7 +45,6 @@
#include "trace.h"
#include "hw/pci/msi.h"
#include "hw/pci/msix.h"
-#include "exec/address-spaces.h"
#include "hw/hotplug.h"
#include "hw/boards.h"
#include "qapi/error.h"
diff --git a/hw/pci/pcie_host.c b/hw/pci/pcie_host.c
index 3534006f9937..5abbe8322025 100644
--- a/hw/pci/pcie_host.c
+++ b/hw/pci/pcie_host.c
@@ -23,7 +23,6 @@
#include "hw/pci/pci.h"
#include "hw/pci/pcie_host.h"
#include "qemu/module.h"
-#include "exec/address-spaces.h"
/* a helper function to get a PCIDevice for a given mmconfig address */
static inline PCIDevice *pcie_dev_find_by_mmcfg_addr(PCIBus *s,
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 03b3bd322fdf..95451414dd22 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -38,7 +38,6 @@
#include "hw/loader.h"
#include "elf.h"
#include "hw/sysbus.h"
-#include "exec/address-spaces.h"
#include "qemu/host-utils.h"
#include "qemu/option.h"
#include "hw/pci-host/ppce500.h"
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 9659857dba8c..f24abf71af2e 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -70,7 +70,6 @@
#include "sysemu/reset.h"
#include "kvm_ppc.h"
#include "hw/usb.h"
-#include "exec/address-spaces.h"
#include "hw/sysbus.h"
#include "trace.h"
diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index 95d3d9515854..de2be960e6c4 100644
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -48,7 +48,6 @@
#include "sysemu/kvm.h"
#include "sysemu/reset.h"
#include "kvm_ppc.h"
-#include "exec/address-spaces.h"
#define MAX_IDE_BUS 2
#define CFG_ADDR 0xf0000510
diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index 22b1c4f1f3c2..ffe01977cdd4 100644
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -38,7 +38,6 @@
#include "hw/ppc/pnv_core.h"
#include "hw/loader.h"
#include "hw/nmi.h"
-#include "exec/address-spaces.h"
#include "qapi/visitor.h"
#include "monitor/monitor.h"
#include "hw/intc/intc.h"
diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c
index 3e868c8c8dad..382ac20fa678 100644
--- a/hw/ppc/pnv_psi.c
+++ b/hw/ppc/pnv_psi.c
@@ -26,7 +26,6 @@
#include "qapi/error.h"
#include "monitor/monitor.h"
-#include "exec/address-spaces.h"
#include "hw/ppc/fdt.h"
#include "hw/ppc/pnv.h"
diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c
index 8da7bc7af971..972a7a4a3e5d 100644
--- a/hw/ppc/ppc405_boards.c
+++ b/hw/ppc/ppc405_boards.c
@@ -40,7 +40,6 @@
#include "hw/boards.h"
#include "qemu/error-report.h"
#include "hw/loader.h"
-#include "exec/address-spaces.h"
#include "qemu/cutils.h"
#define BIOS_FILENAME "ppc405_rom.bin"
diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
index b7539aa7210b..7fb620b9a056 100644
--- a/hw/ppc/ppc440_bamboo.c
+++ b/hw/ppc/ppc440_bamboo.c
@@ -25,7 +25,6 @@
#include "sysemu/device_tree.h"
#include "hw/loader.h"
#include "elf.h"
-#include "exec/address-spaces.h"
#include "hw/char/serial.h"
#include "hw/ppc/ppc.h"
#include "ppc405.h"
diff --git a/hw/ppc/ppc440_pcix.c b/hw/ppc/ppc440_pcix.c
index 91cbcd0504ab..788d25514a44 100644
--- a/hw/ppc/ppc440_pcix.c
+++ b/hw/ppc/ppc440_pcix.c
@@ -28,7 +28,6 @@
#include "hw/ppc/ppc4xx.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_host.h"
-#include "exec/address-spaces.h"
#include "trace.h"
#include "qom/object.h"
diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c
index 96a1fe06c38e..993e3ba955d7 100644
--- a/hw/ppc/ppc440_uc.c
+++ b/hw/ppc/ppc440_uc.c
@@ -15,7 +15,6 @@
#include "qemu/log.h"
#include "qemu/module.h"
#include "hw/irq.h"
-#include "exec/address-spaces.h"
#include "exec/memory.h"
#include "hw/ppc/ppc.h"
#include "hw/qdev-properties.h"
diff --git a/hw/ppc/ppc4xx_pci.c b/hw/ppc/ppc4xx_pci.c
index e8789f64e800..8147ba6f943a 100644
--- a/hw/ppc/ppc4xx_pci.c
+++ b/hw/ppc/ppc4xx_pci.c
@@ -28,7 +28,6 @@
#include "sysemu/reset.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_host.h"
-#include "exec/address-spaces.h"
#include "trace.h"
#include "qom/object.h"
diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index e8dc128308e3..acfc2a91d8e3 100644
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -43,7 +43,6 @@
#include "sysemu/arch_init.h"
#include "sysemu/kvm.h"
#include "sysemu/reset.h"
-#include "exec/address-spaces.h"
#include "trace.h"
#include "elf.h"
#include "qemu/units.h"
diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c
index 0c6baf77e8c3..0737234d66e5 100644
--- a/hw/ppc/sam460ex.c
+++ b/hw/ppc/sam460ex.c
@@ -24,7 +24,6 @@
#include "sysemu/block-backend.h"
#include "hw/loader.h"
#include "elf.h"
-#include "exec/address-spaces.h"
#include "exec/memory.h"
#include "ppc440.h"
#include "ppc405.h"
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 0ee61b312859..5951e805bddd 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -69,7 +69,6 @@
#include "hw/virtio/virtio-scsi.h"
#include "hw/virtio/vhost-scsi-common.h"
-#include "exec/address-spaces.h"
#include "exec/ram_addr.h"
#include "hw/usb.h"
#include "qemu/config-file.h"
diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c
index 24537ffcbd32..db010718589b 100644
--- a/hw/ppc/spapr_iommu.c
+++ b/hw/ppc/spapr_iommu.c
@@ -25,7 +25,6 @@
#include "kvm_ppc.h"
#include "migration/vmstate.h"
#include "sysemu/dma.h"
-#include "exec/address-spaces.h"
#include "trace.h"
#include "hw/ppc/spapr.h"
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index 4effe23a1896..7a725855f91f 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -34,7 +34,6 @@
#include "hw/pci/pci_host.h"
#include "hw/ppc/spapr.h"
#include "hw/pci-host/spapr.h"
-#include "exec/address-spaces.h"
#include "exec/ram_addr.h"
#include <libfdt.h>
#include "trace.h"
diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
index 3a57604ac03e..9c575403b85c 100644
--- a/hw/ppc/virtex_ml507.c
+++ b/hw/ppc/virtex_ml507.c
@@ -39,7 +39,6 @@
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "qemu/option.h"
-#include "exec/address-spaces.h"
#include "hw/intc/ppc-uic.h"
#include "hw/ppc/ppc.h"
diff --git a/hw/remote/machine.c b/hw/remote/machine.c
index c0ab4f528aa7..952105eab5a2 100644
--- a/hw/remote/machine.c
+++ b/hw/remote/machine.c
@@ -17,7 +17,6 @@
#include "qemu-common.h"
#include "hw/remote/machine.h"
-#include "exec/address-spaces.h"
#include "exec/memory.h"
#include "qapi/error.h"
#include "hw/pci/pci_host.h"
diff --git a/hw/remote/memory.c b/hw/remote/memory.c
index 32085b1e05ef..2d4174614af6 100644
--- a/hw/remote/memory.c
+++ b/hw/remote/memory.c
@@ -12,7 +12,6 @@
#include "qemu-common.h"
#include "hw/remote/memory.h"
-#include "exec/address-spaces.h"
#include "exec/ram_addr.h"
#include "qapi/error.h"
diff --git a/hw/remote/proxy-memory-listener.c b/hw/remote/proxy-memory-listener.c
index 3649919f6649..901dbf13573c 100644
--- a/hw/remote/proxy-memory-listener.c
+++ b/hw/remote/proxy-memory-listener.c
@@ -15,7 +15,6 @@
#include "exec/memory.h"
#include "exec/cpu-common.h"
#include "exec/ram_addr.h"
-#include "exec/address-spaces.h"
#include "qapi/error.h"
#include "hw/remote/mpqemu-link.h"
#include "hw/remote/proxy-memory-listener.h"
diff --git a/hw/riscv/opentitan.c b/hw/riscv/opentitan.c
index e168bffe6925..dc9dea117e8b 100644
--- a/hw/riscv/opentitan.c
+++ b/hw/riscv/opentitan.c
@@ -24,7 +24,6 @@
#include "hw/boards.h"
#include "hw/misc/unimp.h"
#include "hw/riscv/boot.h"
-#include "exec/address-spaces.h"
#include "qemu/units.h"
#include "sysemu/sysemu.h"
diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c
index 97e8b0b0a2c7..3e8b44b2c009 100644
--- a/hw/riscv/sifive_e.c
+++ b/hw/riscv/sifive_e.c
@@ -47,7 +47,6 @@
#include "chardev/char.h"
#include "sysemu/arch_init.h"
#include "sysemu/sysemu.h"
-#include "exec/address-spaces.h"
static MemMapEntry sifive_e_memmap[] = {
[SIFIVE_E_DEV_DEBUG] = { 0x0, 0x1000 },
diff --git a/hw/rtc/m48t59.c b/hw/rtc/m48t59.c
index d54929e86127..690f4e071a11 100644
--- a/hw/rtc/m48t59.c
+++ b/hw/rtc/m48t59.c
@@ -32,7 +32,6 @@
#include "sysemu/runstate.h"
#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
-#include "exec/address-spaces.h"
#include "qapi/error.h"
#include "qemu/bcd.h"
#include "qemu/module.h"
diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c
index 5d0fcacd0c01..36a2dbf62f9c 100644
--- a/hw/rtc/mc146818rtc.c
+++ b/hw/rtc/mc146818rtc.c
@@ -42,7 +42,6 @@
#include "qapi/error.h"
#include "qapi/qapi-events-misc-target.h"
#include "qapi/visitor.h"
-#include "exec/address-spaces.h"
#include "hw/rtc/mc146818rtc_regs.h"
#ifdef TARGET_I386
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index f2f38c0c64f1..7af27ca3057c 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -13,7 +13,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "exec/address-spaces.h"
#include "exec/ram_addr.h"
#include "hw/s390x/s390-virtio-hcall.h"
#include "hw/s390x/sclp.h"
diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index 443820901d4b..006010f30a32 100644
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -42,7 +42,6 @@
#include "hw/loader.h"
#include "hw/usb.h"
#include "hw/block/flash.h"
-#include "exec/address-spaces.h"
#define FLASH_BASE 0x00000000
#define FLASH_SIZE (16 * MiB)
diff --git a/hw/sh4/shix.c b/hw/sh4/shix.c
index 1a44378df421..b0579aa0f108 100644
--- a/hw/sh4/shix.c
+++ b/hw/sh4/shix.c
@@ -34,7 +34,6 @@
#include "sysemu/qtest.h"
#include "hw/boards.h"
#include "hw/loader.h"
-#include "exec/address-spaces.h"
#include "qemu/error-report.h"
#define BIOS_FILENAME "shix_bios.bin"
diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
index 7e16eea9e674..eb5d2a679272 100644
--- a/hw/sparc/leon3.c
+++ b/hw/sparc/leon3.c
@@ -40,7 +40,6 @@
#include "hw/loader.h"
#include "elf.h"
#include "trace.h"
-#include "exec/address-spaces.h"
#include "hw/sparc/grlib.h"
#include "hw/misc/grlib_ahb_apb_pnp.h"
diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c
index a87d55f6bb1a..f3e42d03266a 100644
--- a/hw/sparc64/niagara.c
+++ b/hw/sparc64/niagara.c
@@ -31,7 +31,6 @@
#include "hw/loader.h"
#include "hw/sparc/sparc64.h"
#include "hw/rtc/sun4v-rtc.h"
-#include "exec/address-spaces.h"
#include "sysemu/block-backend.h"
#include "qemu/error-report.h"
#include "sysemu/qtest.h"
diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c
index 16addee4dc8d..72cb2175c52e 100644
--- a/hw/ssi/aspeed_smc.c
+++ b/hw/ssi/aspeed_smc.c
@@ -29,7 +29,6 @@
#include "qemu/module.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
-#include "exec/address-spaces.h"
#include "qemu/units.h"
#include "trace.h"
diff --git a/hw/tpm/tpm_crb.c b/hw/tpm/tpm_crb.c
index aa9c00aad3a3..58ebd1469c35 100644
--- a/hw/tpm/tpm_crb.c
+++ b/hw/tpm/tpm_crb.c
@@ -18,7 +18,6 @@
#include "qemu/module.h"
#include "qapi/error.h"
-#include "exec/address-spaces.h"
#include "hw/qdev-properties.h"
#include "hw/pci/pci_ids.h"
#include "hw/acpi/tpm.h"
diff --git a/hw/tricore/tc27x_soc.c b/hw/tricore/tc27x_soc.c
index d66d6980c372..ecd92717b50f 100644
--- a/hw/tricore/tc27x_soc.c
+++ b/hw/tricore/tc27x_soc.c
@@ -24,7 +24,6 @@
#include "hw/loader.h"
#include "qemu/units.h"
#include "hw/misc/unimp.h"
-#include "exec/address-spaces.h"
#include "hw/tricore/tc27x_soc.h"
#include "hw/tricore/triboard.h"
diff --git a/hw/tricore/triboard.c b/hw/tricore/triboard.c
index 943f706989e3..4dba0259cd33 100644
--- a/hw/tricore/triboard.c
+++ b/hw/tricore/triboard.c
@@ -24,7 +24,6 @@
#include "hw/qdev-properties.h"
#include "net/net.h"
#include "hw/loader.h"
-#include "exec/address-spaces.h"
#include "elf.h"
#include "hw/tricore/tricore.h"
#include "qemu/error-report.h"
diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.c
index 12ea1490fde2..51658d9e37ca 100644
--- a/hw/tricore/tricore_testboard.c
+++ b/hw/tricore/tricore_testboard.c
@@ -25,7 +25,6 @@
#include "net/net.h"
#include "hw/boards.h"
#include "hw/loader.h"
-#include "exec/address-spaces.h"
#include "elf.h"
#include "hw/tricore/tricore.h"
#include "qemu/error-report.h"
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index e2163a0d63ed..7b7bde7657c9 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -21,7 +21,6 @@
#include "qemu/error-report.h"
#include "qemu/memfd.h"
#include "standard-headers/linux/vhost_types.h"
-#include "exec/address-spaces.h"
#include "hw/virtio/virtio-bus.h"
#include "hw/virtio/virtio-access.h"
#include "migration/blocker.h"
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index 07f4e60b3099..9e13cb9e3adf 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -15,7 +15,6 @@
#include "qapi/error.h"
#include "cpu.h"
#include "trace.h"
-#include "exec/address-spaces.h"
#include "qemu/error-report.h"
#include "qemu/log.h"
#include "qemu/main-loop.h"
diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c
index a513fdd62d19..232482d65f14 100644
--- a/hw/xen/xen_pt.c
+++ b/hw/xen/xen_pt.c
@@ -64,7 +64,6 @@
#include "hw/xen/xen-legacy-backend.h"
#include "xen_pt.h"
#include "qemu/range.h"
-#include "exec/address-spaces.h"
static bool has_igd_gfx_passthru;
diff --git a/hw/xtensa/sim.c b/hw/xtensa/sim.c
index c38e522b02e5..2028fe793d9b 100644
--- a/hw/xtensa/sim.c
+++ b/hw/xtensa/sim.c
@@ -33,7 +33,6 @@
#include "hw/loader.h"
#include "elf.h"
#include "exec/memory.h"
-#include "exec/address-spaces.h"
#include "qemu/error-report.h"
#include "xtensa_memory.h"
#include "xtensa_sim.h"
diff --git a/hw/xtensa/virt.c b/hw/xtensa/virt.c
index 18d3c3cdb275..a18e3fc910ec 100644
--- a/hw/xtensa/virt.c
+++ b/hw/xtensa/virt.c
@@ -34,7 +34,6 @@
#include "net/net.h"
#include "elf.h"
#include "exec/memory.h"
-#include "exec/address-spaces.h"
#include "qemu/error-report.h"
#include "xtensa_memory.h"
#include "xtensa_sim.h"
diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c
index 7be53f1895b2..17f087b39516 100644
--- a/hw/xtensa/xtfpga.c
+++ b/hw/xtensa/xtfpga.c
@@ -35,7 +35,6 @@
#include "hw/qdev-properties.h"
#include "elf.h"
#include "exec/memory.h"
-#include "exec/address-spaces.h"
#include "hw/char/serial.h"
#include "net/net.h"
#include "hw/sysbus.h"
diff --git a/softmmu/memory.c b/softmmu/memory.c
index a62816647b97..3bb533c0bced 100644
--- a/softmmu/memory.c
+++ b/softmmu/memory.c
@@ -17,7 +17,6 @@
#include "qemu/log.h"
#include "qapi/error.h"
#include "exec/memory.h"
-#include "exec/address-spaces.h"
#include "qapi/visitor.h"
#include "qemu/bitops.h"
#include "qemu/error-report.h"
diff --git a/softmmu/physmem.c b/softmmu/physmem.c
index 18218826146d..523269657183 100644
--- a/softmmu/physmem.c
+++ b/softmmu/physmem.c
@@ -46,7 +46,6 @@
#include "sysemu/dma.h"
#include "sysemu/hostmem.h"
#include "sysemu/hw_accel.h"
-#include "exec/address-spaces.h"
#include "sysemu/xen-mapcache.h"
#include "trace/trace-root.h"
diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c
index 15f14ac69e7f..f044181d061c 100644
--- a/target/i386/hvf/hvf.c
+++ b/target/i386/hvf/hvf.c
@@ -67,7 +67,6 @@
#include <Hypervisor/hv_vmx.h>
#include <sys/sysctl.h>
-#include "exec/address-spaces.h"
#include "hw/i386/apic_internal.h"
#include "qemu/main-loop.h"
#include "qemu/accel.h"
diff --git a/target/i386/hvf/x86_mmu.c b/target/i386/hvf/x86_mmu.c
index 882a6237eea3..78fff0468455 100644
--- a/target/i386/hvf/x86_mmu.c
+++ b/target/i386/hvf/x86_mmu.c
@@ -24,7 +24,6 @@
#include "x86_mmu.h"
#include "vmcs.h"
#include "vmx.h"
-#include "exec/address-spaces.h"
#define pte_present(pte) (pte & PT_PRESENT)
#define pte_write_access(pte) (pte & PT_WRITE)
diff --git a/target/i386/sev.c b/target/i386/sev.c
index 72b9e2ab4010..9a43be11cb39 100644
--- a/target/i386/sev.c
+++ b/target/i386/sev.c
@@ -30,7 +30,6 @@
#include "trace.h"
#include "migration/blocker.h"
#include "qom/object.h"
-#include "exec/address-spaces.h"
#include "monitor/monitor.h"
#include "exec/confidential-guest-support.h"
#include "hw/i386/pc.h"
diff --git a/target/s390x/diag.c b/target/s390x/diag.c
index 1a4842956402..d620cd4bd438 100644
--- a/target/s390x/diag.c
+++ b/target/s390x/diag.c
@@ -15,7 +15,6 @@
#include "qemu/osdep.h"
#include "cpu.h"
#include "internal.h"
-#include "exec/address-spaces.h"
#include "hw/watchdog/wdt_diag288.h"
#include "sysemu/cpus.h"
#include "hw/s390x/ipl.h"
diff --git a/target/xtensa/op_helper.c b/target/xtensa/op_helper.c
index 143476849fb7..d85d3516d6a5 100644
--- a/target/xtensa/op_helper.c
+++ b/target/xtensa/op_helper.c
@@ -32,7 +32,6 @@
#include "qemu/host-utils.h"
#include "exec/exec-all.h"
#include "exec/cpu_ldst.h"
-#include "exec/address-spaces.h"
#include "qemu/timer.h"
#ifndef CONFIG_USER_ONLY
diff --git a/tests/qtest/fuzz/generic_fuzz.c b/tests/qtest/fuzz/generic_fuzz.c
index ae219540b422..cea7d4058e8a 100644
--- a/tests/qtest/fuzz/generic_fuzz.c
+++ b/tests/qtest/fuzz/generic_fuzz.c
@@ -19,11 +19,9 @@
#include "tests/qtest/libqos/pci-pc.h"
#include "fuzz.h"
#include "fork_fuzz.h"
-#include "exec/address-spaces.h"
#include "string.h"
#include "exec/memory.h"
#include "exec/ramblock.h"
-#include "exec/address-spaces.h"
#include "hw/qdev-core.h"
#include "hw/pci/pci.h"
#include "hw/boards.h"
diff --git a/tests/qtest/fuzz/qos_fuzz.c b/tests/qtest/fuzz/qos_fuzz.c
index 2bc474645c56..7a244c951e5e 100644
--- a/tests/qtest/fuzz/qos_fuzz.c
+++ b/tests/qtest/fuzz/qos_fuzz.c
@@ -21,7 +21,6 @@
#include "qapi/error.h"
#include "qemu-common.h"
#include "exec/memory.h"
-#include "exec/address-spaces.h"
#include "qemu/main-loop.h"
#include "tests/qtest/libqos/libqtest.h"
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PULL 19/23] mc146818rtc: put it into the 'misc' category
2021-05-03 8:36 [PULL 00/23] Trivial branch for 6.1 patches Laurent Vivier
` (17 preceding siblings ...)
2021-05-03 8:36 ` [PULL 18/23] Do not include exec/address-spaces.h " Laurent Vivier
@ 2021-05-03 8:36 ` Laurent Vivier
2021-05-03 8:36 ` [PULL 20/23] docs/system: Document the removal of "compat" property for POWER CPUs Laurent Vivier
` (4 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Laurent Vivier @ 2021-05-03 8:36 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Thomas Huth, Michael Tokarev, Laurent Vivier, Gan Qixin
From: Gan Qixin <ganqixin@huawei.com>
The category of the mc146818rtc device is not set, put it into the 'misc'
category.
Signed-off-by: Gan Qixin <ganqixin@huawei.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20201130083630.2520597-6-ganqixin@huawei.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/rtc/mc146818rtc.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c
index 36a2dbf62f9c..3d2d3854e716 100644
--- a/hw/rtc/mc146818rtc.c
+++ b/hw/rtc/mc146818rtc.c
@@ -1039,6 +1039,7 @@ static void rtc_class_initfn(ObjectClass *klass, void *data)
dc->vmsd = &vmstate_rtc;
isa->build_aml = rtc_build_aml;
device_class_set_props(dc, mc146818rtc_properties);
+ set_bit(DEVICE_CATEGORY_MISC, dc->categories);
}
static const TypeInfo mc146818rtc_info = {
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PULL 20/23] docs/system: Document the removal of "compat" property for POWER CPUs
2021-05-03 8:36 [PULL 00/23] Trivial branch for 6.1 patches Laurent Vivier
` (18 preceding siblings ...)
2021-05-03 8:36 ` [PULL 19/23] mc146818rtc: put it into the 'misc' category Laurent Vivier
@ 2021-05-03 8:36 ` Laurent Vivier
2021-05-03 8:36 ` [PULL 21/23] scripts: fix generation update-binfmts templates Laurent Vivier
` (3 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Laurent Vivier @ 2021-05-03 8:36 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Michael Tokarev, Laurent Vivier, Greg Kurz
From: Greg Kurz <groug@kaod.org>
This is just an oversight.
Fixes: f518be3aa35b ("target/ppc: Remove "compat" property of server class POWER CPUs")
Cc: groug@kaod.org
Signed-off-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <161399328834.51902.14269239378658110394.stgit@bahia.lan>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
docs/system/removed-features.rst | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/docs/system/removed-features.rst b/docs/system/removed-features.rst
index 29e90601a51a..c21e6fa5ee3c 100644
--- a/docs/system/removed-features.rst
+++ b/docs/system/removed-features.rst
@@ -285,6 +285,12 @@ The RISC-V no MMU cpus have been removed. The two CPUs: ``rv32imacu-nommu`` and
``rv64imacu-nommu`` can no longer be used. Instead the MMU status can be specified
via the CPU ``mmu`` option when using the ``rv32`` or ``rv64`` CPUs.
+``compat`` property of server class POWER CPUs (removed in 6.0)
+'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+
+The ``max-cpu-compat`` property of the ``pseries`` machine type should be used
+instead.
+
System emulator machines
------------------------
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PULL 21/23] scripts: fix generation update-binfmts templates
2021-05-03 8:36 [PULL 00/23] Trivial branch for 6.1 patches Laurent Vivier
` (19 preceding siblings ...)
2021-05-03 8:36 ` [PULL 20/23] docs/system: Document the removal of "compat" property for POWER CPUs Laurent Vivier
@ 2021-05-03 8:36 ` Laurent Vivier
2021-05-03 8:36 ` [PULL 22/23] docs: More precisely describe memory-backend-*::id's user Laurent Vivier
` (2 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Laurent Vivier @ 2021-05-03 8:36 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Michael Tokarev, Laurent Vivier, Silvano Cirujano Cuesta
From: Silvano Cirujano Cuesta <silvano.cirujano-cuesta@siemens.com>
This patch fixes the update-binfmts templates being used in the script
scripts/qemu-binfmt-conf.sh when the option --debian is used.
Fixed issues are:
- Typo in flag 'credentials' (previously 'credential').
- Missing flags 'preserve' and 'fix_binary'.
Reference: https://manpages.debian.org/buster/binfmt-support/update-binfmts.8.en.html#FORMAT_FILES
Signed-off-by: Silvano Cirujano Cuesta <silvano.cirujano-cuesta@siemens.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20210323123457.23747-1-silvano.cirujano-cuesta@siemens.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
scripts/qemu-binfmt-conf.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
index 573b5dc6acd7..7de996d536ea 100755
--- a/scripts/qemu-binfmt-conf.sh
+++ b/scripts/qemu-binfmt-conf.sh
@@ -294,7 +294,9 @@ package qemu-$cpu
interpreter $qemu
magic $magic
mask $mask
-credential $CREDENTIAL
+credentials $CREDENTIAL
+preserve $PRESERVE_ARG0
+fix_binary $PERSISTENT
EOF
}
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PULL 22/23] docs: More precisely describe memory-backend-*::id's user
2021-05-03 8:36 [PULL 00/23] Trivial branch for 6.1 patches Laurent Vivier
` (20 preceding siblings ...)
2021-05-03 8:36 ` [PULL 21/23] scripts: fix generation update-binfmts templates Laurent Vivier
@ 2021-05-03 8:36 ` Laurent Vivier
2021-05-03 8:36 ` [PULL 23/23] hw/rx/rx-gdbsim: Do not accept invalid memory size Laurent Vivier
2021-05-05 17:37 ` [PULL 00/23] Trivial branch for 6.1 patches Peter Maydell
23 siblings, 0 replies; 25+ messages in thread
From: Laurent Vivier @ 2021-05-03 8:36 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Markus Armbruster, Michael Tokarev, Laurent Vivier,
Robert Hoo
From: Robert Hoo <robert.hu@linux.intel.com>
'id' of memory-backend-{file,ram} is not only for '-numa''s reference, but
also other parameters like '-device nvdimm'.
More clearly call out this to avoid misinterpretation.
Signed-off-by: Robert Hoo <robert.hu@linux.intel.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1619080922-83527-1-git-send-email-robert.hu@linux.intel.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
qemu-options.hx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/qemu-options.hx b/qemu-options.hx
index fd21002bd61d..635dc8a6243a 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -4508,11 +4508,11 @@ SRST
the guest RAM with huge pages.
The ``id`` parameter is a unique ID that will be used to
- reference this memory region when configuring the ``-numa``
- argument.
+ reference this memory region in other parameters, e.g. ``-numa``,
+ ``-device nvdimm``, etc.
The ``size`` option provides the size of the memory region, and
- accepts common suffixes, eg ``500M``.
+ accepts common suffixes, e.g. ``500M``.
The ``mem-path`` provides the path to either a shared memory or
huge page filesystem mount.
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PULL 23/23] hw/rx/rx-gdbsim: Do not accept invalid memory size
2021-05-03 8:36 [PULL 00/23] Trivial branch for 6.1 patches Laurent Vivier
` (21 preceding siblings ...)
2021-05-03 8:36 ` [PULL 22/23] docs: More precisely describe memory-backend-*::id's user Laurent Vivier
@ 2021-05-03 8:36 ` Laurent Vivier
2021-05-05 17:37 ` [PULL 00/23] Trivial branch for 6.1 patches Peter Maydell
23 siblings, 0 replies; 25+ messages in thread
From: Laurent Vivier @ 2021-05-03 8:36 UTC (permalink / raw)
To: qemu-devel
Cc: Yoshinori Sato, qemu-trivial, Michael Tokarev, Richard Henderson,
Laurent Vivier, Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
We check the amount of RAM is enough, warn when it is
not, but if so we neglect to bail out. Fix that by
adding the missing exit() call.
Fixes: bda19d7bb56 ("hw/rx: Add RX GDB simulator")
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Yoshinori Sato <ysato@users.sourceforge.jp>
Message-Id: <20210407223056.1870497-1-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/rx/rx-gdbsim.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/rx/rx-gdbsim.c b/hw/rx/rx-gdbsim.c
index b52d76b9b681..75d1fec6ca46 100644
--- a/hw/rx/rx-gdbsim.c
+++ b/hw/rx/rx-gdbsim.c
@@ -89,6 +89,7 @@ static void rx_gdbsim_init(MachineState *machine)
char *sz = size_to_str(mc->default_ram_size);
error_report("Invalid RAM size, should be more than %s", sz);
g_free(sz);
+ exit(1);
}
/* Allocate memory space */
--
2.31.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* Re: [PULL 00/23] Trivial branch for 6.1 patches
2021-05-03 8:36 [PULL 00/23] Trivial branch for 6.1 patches Laurent Vivier
` (22 preceding siblings ...)
2021-05-03 8:36 ` [PULL 23/23] hw/rx/rx-gdbsim: Do not accept invalid memory size Laurent Vivier
@ 2021-05-05 17:37 ` Peter Maydell
23 siblings, 0 replies; 25+ messages in thread
From: Peter Maydell @ 2021-05-05 17:37 UTC (permalink / raw)
To: Laurent Vivier; +Cc: QEMU Trivial, Michael Tokarev, QEMU Developers
On Mon, 3 May 2021 at 09:41, Laurent Vivier <laurent@vivier.eu> wrote:
>
> The following changes since commit 53c5433e84e8935abed8e91d4a2eb813168a0ecf:
>
> Merge remote-tracking branch 'remotes/rth-gitlab/tags/pull-tcg-20210501' into staging (2021-05-02 12:02:46 +0100)
>
> are available in the Git repository at:
>
> git://github.com/vivier/qemu.git tags/trivial-branch-for-6.1-pull-request
>
> for you to fetch changes up to 9197b5d4b5f163455c891baec531ae73f5d3a73a:
>
> hw/rx/rx-gdbsim: Do not accept invalid memory size (2021-05-03 10:07:41 +0200)
>
> ----------------------------------------------------------------
> Trivial patches pull request 20210503
>
> ----------------------------------------------------------------
>
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/6.1
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 25+ messages in thread
end of thread, other threads:[~2021-05-05 17:42 UTC | newest]
Thread overview: 25+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-03 8:36 [PULL 00/23] Trivial branch for 6.1 patches Laurent Vivier
2021-05-03 8:36 ` [PULL 01/23] accel: kvm: clarify that extra exit data is hexadecimal Laurent Vivier
2021-05-03 8:36 ` [PULL 02/23] hw/arm/pxa2xx: Declare PCMCIA bus with Kconfig Laurent Vivier
2021-05-03 8:36 ` [PULL 03/23] hw/ide: Add Kconfig dependency MICRODRIVE -> PCMCIA Laurent Vivier
2021-05-03 8:36 ` [PULL 04/23] hw/pcmcia: Do not register PCMCIA type if not required Laurent Vivier
2021-05-03 8:36 ` [PULL 05/23] Fix typo in CFI build documentation Laurent Vivier
2021-05-03 8:36 ` [PULL 06/23] vmstate: Constify some VMStateDescriptions Laurent Vivier
2021-05-03 8:36 ` [PULL 07/23] hw/arm: Constify VMStateDescription Laurent Vivier
2021-05-03 8:36 ` [PULL 08/23] hw/display/qxl: " Laurent Vivier
2021-05-03 8:36 ` [PULL 09/23] hw/usb: " Laurent Vivier
2021-05-03 8:36 ` [PULL 10/23] ui: Fix memory leak in qemu_xkeymap_mapping_table() Laurent Vivier
2021-05-03 8:36 ` [PULL 11/23] hw: Remove superfluous includes of hw/hw.h Laurent Vivier
2021-05-03 8:36 ` [PULL 12/23] hw: Do not include hw/sysbus.h if it is not necessary Laurent Vivier
2021-05-03 8:36 ` [PULL 13/23] hw: Do not include hw/irq.h " Laurent Vivier
2021-05-03 8:36 ` [PULL 14/23] hw: Do not include qemu/log.h " Laurent Vivier
2021-05-03 8:36 ` [PULL 15/23] Do not include sysemu/sysemu.h if it's not really necessary Laurent Vivier
2021-05-03 8:36 ` [PULL 16/23] Do not include hw/boards.h " Laurent Vivier
2021-05-03 8:36 ` [PULL 17/23] Do not include cpu.h " Laurent Vivier
2021-05-03 8:36 ` [PULL 18/23] Do not include exec/address-spaces.h " Laurent Vivier
2021-05-03 8:36 ` [PULL 19/23] mc146818rtc: put it into the 'misc' category Laurent Vivier
2021-05-03 8:36 ` [PULL 20/23] docs/system: Document the removal of "compat" property for POWER CPUs Laurent Vivier
2021-05-03 8:36 ` [PULL 21/23] scripts: fix generation update-binfmts templates Laurent Vivier
2021-05-03 8:36 ` [PULL 22/23] docs: More precisely describe memory-backend-*::id's user Laurent Vivier
2021-05-03 8:36 ` [PULL 23/23] hw/rx/rx-gdbsim: Do not accept invalid memory size Laurent Vivier
2021-05-05 17:37 ` [PULL 00/23] Trivial branch for 6.1 patches Peter Maydell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).