include: move hw/boards.h to hw/core/

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 71286729341d95f84e3895d8aaedf18abd95ed34..9e9cb839899db0bba5497cb79677aa5276b3e8be 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1994,7 +1994,7 @@ F: hw/core/numa.c
 F: hw/cpu/cluster.c
 F: qapi/machine.json
 F: qapi/machine-common.json
-F: include/hw/boards.h
+F: include/hw/core/boards.h
 F: include/hw/core/cpu.h
 F: include/hw/cpu/cluster.h
 F: include/system/numa.h

diff --git a/accel/accel-system.c b/accel/accel-system.c
index 1e97c64fdca53ab861ab4dae60d6c24779190392..150af05bf5bf2f0b82e69192bf4614023a21cd9e 100644 (file)
--- a/accel/accel-system.c
+++ b/accel/accel-system.c
@@ -27,7 +27,7 @@
 #include "qemu/accel.h"
 #include "qapi/qapi-commands-accelerator.h"
 #include "monitor/monitor.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/core/cpu.h"
 #include "accel/accel-ops.h"
 #include "accel/accel-cpu-ops.h"

diff --git a/accel/hvf/hvf-all.c b/accel/hvf/hvf-all.c
index 0a4b498e8369cc9c769493e56ad3de743f9d7f7d..77f4e4e4f305dd4d2ab9e76d7c6575b33406cde3 100644 (file)
--- a/accel/hvf/hvf-all.c
+++ b/accel/hvf/hvf-all.c
@@ -16,7 +16,7 @@
 #include "system/hvf.h"
 #include "system/hvf_int.h"
 #include "hw/core/cpu.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "trace.h"
 
 bool hvf_allowed;

diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 28006d73c51e1ed6cb707f9c225291a48f8a2e11..02b78717b1fafe2b7d22c7607a349eabe88f443c 100644 (file)
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -53,7 +53,7 @@
 #include "system/dirtylimit.h"
 #include "qemu/range.h"
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/stats.h"
 
 /* This check must be after config-host.h is included */

diff --git a/accel/mshv/mshv-all.c b/accel/mshv/mshv-all.c
index 80428d130d5202391a50f7dc55560aa2018ad086..47c67ef8cc9494e32c9d716743794aa4d864e1c0 100644 (file)
--- a/accel/mshv/mshv-all.c
+++ b/accel/mshv/mshv-all.c
@@ -19,7 +19,7 @@
 #include "qemu/event_notifier.h"
 #include "qemu/module.h"
 #include "qemu/main-loop.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 
 #include "hw/hyperv/hvhdk.h"
 #include "hw/hyperv/hvhdk_mini.h"

diff --git a/accel/tcg/tcg-accel-ops-mttcg.c b/accel/tcg/tcg-accel-ops-mttcg.c
index cf1ee7ac2587c703c93541c830ab1d4bd4944090..89299829c3a66cc4900323a6a7282e6086428376 100644 (file)
--- a/accel/tcg/tcg-accel-ops-mttcg.c
+++ b/accel/tcg/tcg-accel-ops-mttcg.c
@@ -30,7 +30,7 @@
 #include "qemu/main-loop.h"
 #include "qemu/notify.h"
 #include "qemu/guest-random.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "tcg/startup.h"
 #include "tcg-accel-ops.h"
 #include "tcg-accel-ops-mttcg.h"

diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c
index 18ea0c58b0b749f090a46e08ade55e821cf06a59..8eb4a6b89e8f2d4dd7cc5b7650378972c9af1cf7 100644 (file)
--- a/accel/tcg/tcg-all.c
+++ b/accel/tcg/tcg-all.c
@@ -37,7 +37,7 @@
 #include "qemu/units.h"
 #include "qemu/target-info.h"
 #ifndef CONFIG_USER_ONLY
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "exec/tb-flush.h"
 #include "system/runstate.h"
 #endif

diff --git a/accel/xen/xen-all.c b/accel/xen/xen-all.c
index 97377d67d1c1dcd100e0e75fdec51b5e64fea208..bb2d02cb22106d9cf99a4de470447e7b7744befd 100644 (file)
--- a/accel/xen/xen-all.c
+++ b/accel/xen/xen-all.c
@@ -26,7 +26,7 @@
 #include "system/runstate.h"
 #include "migration/misc.h"
 #include "migration/global_state.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 
 bool xen_allowed;
 

diff --git a/backends/hostmem.c b/backends/hostmem.c
index 35734d6f4d129b4ad24d75d8a722030e261c65ae..d583491664850b361296de8545c8872352a21844 100644 (file)
--- a/backends/hostmem.c
+++ b/backends/hostmem.c
@@ -12,7 +12,7 @@
 
 #include "qemu/osdep.h"
 #include "system/hostmem.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qapi/error.h"
 #include "qapi/qapi-builtin-visit.h"
 #include "qapi/visitor.h"

diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c
index 3640d1f3dce7578d5bfffa6379f979873573d449..3391cee4d214d8b968926b850ed9572702be21e8 100644 (file)
--- a/block/monitor/block-hmp-cmds.c
+++ b/block/monitor/block-hmp-cmds.c
@@ -36,7 +36,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/block-backend.h"
 #include "system/blockdev.h"
 #include "qapi/qapi-commands-block.h"

diff --git a/docs/conf.py b/docs/conf.py
index 0c9ec74097fab7453379c25fc09eeb99bc4d760c..bc4e9622dc839ab5d48db95c90b710b3cc237afb 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -136,7 +136,7 @@ if micro >= 50:
 
 # These thresholds must match the constants
 # MACHINE_VER_DELETION_MAJOR  & MACHINE_VER_DEPRECATION_MAJOR
-# defined in include/hw/boards.h and the introductory text in
+# defined in include/hw/core/boards.h and the introductory text in
 # docs/about/deprecated.rst
 ver_machine_deprecation_version = "%d.%d.0" % (major - 3, minor)
 ver_machine_deletion_version = "%d.%d.0" % (major - 6, minor)

diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c
index 5b2fc06e58dffeabc9ef3b949d95b583c197e5fd..1f8cd118924cdd119561444695c0b3102e04a366 100644 (file)
--- a/gdbstub/gdbstub.c
+++ b/gdbstub/gdbstub.c
@@ -38,7 +38,7 @@
 #include "gdbstub/user.h"
 #else
 #include "hw/cpu/cluster.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #endif
 #include "hw/core/cpu.h"
 

diff --git a/gdbstub/system.c b/gdbstub/system.c
index e2220c1ae4860960ef557e49c795145c61a0b2b0..79f80256e3afa656be8511ddd52130e9cd4353f0 100644 (file)
--- a/gdbstub/system.c
+++ b/gdbstub/system.c
@@ -25,7 +25,7 @@
 #include "system/replay.h"
 #include "hw/core/cpu.h"
 #include "hw/cpu/cluster.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "chardev/char.h"
 #include "chardev/char-fe.h"
 #include "monitor/monitor.h"

diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
index 2d5826a8f134a2cb5afebbed6b5df5dda166301f..dad4cfcc7d80eb0717a89c05ecfce7bdd2986b6e 100644 (file)
--- a/hw/acpi/aml-build.c
+++ b/hw/acpi/aml-build.c
@@ -25,7 +25,7 @@
 #include "qemu/bswap.h"
 #include "qemu/bitops.h"
 #include "system/numa.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/acpi/tpm.h"
 #include "hw/pci/pci_host.h"
 #include "hw/pci/pci_bus.h"

diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c
index 9b974b7274a20a15e8816b972a888976bb58cb59..2f17d45907d450a779a0587429ba6c3ee7705cad 100644 (file)
--- a/hw/acpi/memory_hotplug.c
+++ b/hw/acpi/memory_hotplug.c
@@ -1,7 +1,7 @@
 #include "qemu/osdep.h"
 #include "hw/acpi/memory_hotplug.h"
 #include "hw/mem/pc-dimm.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-core.h"
 #include "migration/vmstate.h"
 #include "trace.h"

diff --git a/hw/acpi/pci.c b/hw/acpi/pci.c
index 2228f1245e274dd59d0bea1b9e8c936a74ee7251..8c7ed104796d1e7d3c3fb7b9546053d0be9315e4 100644 (file)
--- a/hw/acpi/pci.c
+++ b/hw/acpi/pci.c
@@ -27,7 +27,7 @@
 #include "qemu/error-report.h"
 #include "qom/object_interfaces.h"
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/acpi/aml-build.h"
 #include "hw/acpi/pci.h"
 #include "hw/pci/pci_bridge.h"

diff --git a/hw/alpha/alpha_sys.h b/hw/alpha/alpha_sys.h
index a303c584383107b7d609c5ec61d26a21ac0a0146..6e6691d116a6e47d46c4a6124060ab9a57f7c537 100644 (file)
--- a/hw/alpha/alpha_sys.h
+++ b/hw/alpha/alpha_sys.h
@@ -5,7 +5,7 @@
 
 #include "target/alpha/cpu-qom.h"
 #include "hw/pci/pci.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/intc/i8259.h"
 
 

diff --git a/hw/arm/allwinner-a10.c b/hw/arm/allwinner-a10.c
index dc910d4177b050ee21f22a7c70d8646ecc736e45..1886df03839a9d88259180750ba3e1c30595f742 100644 (file)
--- a/hw/arm/allwinner-a10.c
+++ b/hw/arm/allwinner-a10.c
@@ -24,7 +24,7 @@
 #include "hw/arm/allwinner-a10.h"
 #include "hw/misc/unimp.h"
 #include "system/system.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/usb/hcd-ohci.h"
 #include "hw/loader.h"
 #include "target/arm/cpu-qom.h"

diff --git a/hw/arm/allwinner-r40.c b/hw/arm/allwinner-r40.c
index c8eda39957c406d3186bb05d664c4a804c36953f..313bd21fad8dea338834c04a58749e0fd902612e 100644 (file)
--- a/hw/arm/allwinner-r40.c
+++ b/hw/arm/allwinner-r40.c
@@ -22,7 +22,7 @@
 #include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "qemu/units.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-core.h"
 #include "hw/sysbus.h"
 #include "hw/char/serial-mm.h"

diff --git a/hw/arm/aspeed_ast27x0-fc.c b/hw/arm/aspeed_ast27x0-fc.c
index b96ef3f97ab06306f8a0fa1cb997b822be6b89af..a0cbe50d78d57195b229292cec11939b17a5d4da 100644 (file)
--- a/hw/arm/aspeed_ast27x0-fc.c
+++ b/hw/arm/aspeed_ast27x0-fc.c
@@ -15,7 +15,7 @@
 #include "system/block-backend.h"
 #include "system/system.h"
 #include "hw/arm/aspeed.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-clock.h"
 #include "hw/arm/aspeed_soc.h"
 #include "hw/loader.h"

diff --git a/hw/arm/b-l475e-iot01a.c b/hw/arm/b-l475e-iot01a.c
index f1fbc774e529d6c336f2d3670fc001371701421c..a724b5fdb2072c3d9d0af124f15aed39e530ad1b 100644 (file)
--- a/hw/arm/b-l475e-iot01a.c
+++ b/hw/arm/b-l475e-iot01a.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "qemu/error-report.h"
 #include "hw/arm/boot.h"

diff --git a/hw/arm/bananapi_m2u.c b/hw/arm/bananapi_m2u.c
index 0f6d98684b9c0dffca804aa3dc72e31cdca8cd43..fd347e18d269478d61f6c8881ffdb6b036dffcc1 100644 (file)
--- a/hw/arm/bananapi_m2u.c
+++ b/hw/arm/bananapi_m2u.c
@@ -22,7 +22,7 @@
 #include "system/address-spaces.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/i2c/i2c.h"
 #include "hw/qdev-properties.h"
 #include "hw/arm/allwinner-r40.h"

diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index b91660208f56208cd444f19d9e433c9a877459e7..9b6eaf642e99f61be655cabf7306f856eaa91f17 100644 (file)
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -22,7 +22,7 @@
 #include "system/system.h"
 #include "system/memory.h"
 #include "system/numa.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/reset.h"
 #include "hw/loader.h"
 #include "hw/mem/memory-device.h"

diff --git a/hw/arm/collie.c b/hw/arm/collie.c
index 5a80b7a2238418b50d40a6b43ae9f46e127b2582..73c40bc57da325dc533cc77ddf1bf45f311e27ca 100644 (file)
--- a/hw/arm/collie.c
+++ b/hw/arm/collie.c
@@ -12,7 +12,7 @@
 #include "qemu/units.h"
 #include "qemu/cutils.h"
 #include "hw/sysbus.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "strongarm.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/machines-qom.h"

diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c
index aa51c0a70340d5ce3fcbe06d63ce2ff4f5f4478a..9fe282342abdfff10c8d795ec5fc3611c49be662 100644 (file)
--- a/hw/arm/cubieboard.c
+++ b/hw/arm/cubieboard.c
@@ -18,7 +18,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "hw/arm/allwinner-a10.h"
 #include "hw/arm/boot.h"

diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c
index 23b596d0c816413218f04085a506c8f0108c70e5..d986e8f7a24725009f4647b7ea184100d6cda801 100644 (file)
--- a/hw/arm/digic_boards.c
+++ b/hw/arm/digic_boards.c
@@ -26,7 +26,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/datadir.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qemu/error-report.h"
 #include "hw/arm/digic.h"
 #include "hw/arm/machines-qom.h"

diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c
index 89f0e9446323d4d9a30e561656192d9b46f071b1..66af0e2376d2cb7d6caf944757a88cf442243b41 100644 (file)
--- a/hw/arm/exynos4_boards.c
+++ b/hw/arm/exynos4_boards.c
@@ -33,7 +33,7 @@
 #include "hw/arm/exynos4210.h"
 #include "hw/net/lan9118.h"
 #include "hw/qdev-properties.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/irq.h"
 #include "target/arm/cpu-qom.h"
 

diff --git a/hw/arm/fby35.c b/hw/arm/fby35.c
index e61a6438fefaf3c0a0633e68aa96dde0115d54bd..3e036cfd2bafda2b8cc3b6a2c1cff7890d1e89d4 100644 (file)
--- a/hw/arm/fby35.c
+++ b/hw/arm/fby35.c
@@ -10,7 +10,7 @@
 #include "qapi/error.h"
 #include "system/system.h"
 #include "system/block-backend.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-clock.h"
 #include "hw/arm/aspeed_soc.h"
 #include "hw/arm/boot.h"

diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c
index f3a60022d84a684c34e2d6e3c741ef9e646de049..50b34139fa2ccd491a6e4c7cde1e68aa0e31e450 100644 (file)
--- a/hw/arm/fsl-imx6.c
+++ b/hw/arm/fsl-imx6.c
@@ -24,7 +24,7 @@
 #include "hw/arm/fsl-imx6.h"
 #include "hw/misc/unimp.h"
 #include "hw/usb/imx-usb-phy.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "system/system.h"
 #include "chardev/char.h"

diff --git a/hw/arm/fsl-imx6ul.c b/hw/arm/fsl-imx6ul.c
index 883c7fc534fb3a23d62399cc74972f3dbc7e141a..225e1791263b349ef990e7db7d975cbc9589bda0 100644 (file)
--- a/hw/arm/fsl-imx6ul.c
+++ b/hw/arm/fsl-imx6ul.c
@@ -21,7 +21,7 @@
 #include "hw/arm/fsl-imx6ul.h"
 #include "hw/misc/unimp.h"
 #include "hw/usb/imx-usb-phy.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/system.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"

diff --git a/hw/arm/fsl-imx7.c b/hw/arm/fsl-imx7.c
index 02f7602077f72d16d234ec08cca81c7acaab409f..9a230d222fda0c7194c9363eab0efee6014143ed 100644 (file)
--- a/hw/arm/fsl-imx7.c
+++ b/hw/arm/fsl-imx7.c
@@ -22,7 +22,7 @@
 #include "qapi/error.h"
 #include "hw/arm/fsl-imx7.h"
 #include "hw/misc/unimp.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/system.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"

diff --git a/hw/arm/fsl-imx8mp.c b/hw/arm/fsl-imx8mp.c
index ee6f3e42d23121ee3063fca9b8f5546b36152f63..79f91427772e9b96d60333c48ac57587a7709095 100644 (file)
--- a/hw/arm/fsl-imx8mp.c
+++ b/hw/arm/fsl-imx8mp.c
@@ -13,7 +13,7 @@
 #include "hw/arm/bsa.h"
 #include "hw/arm/fsl-imx8mp.h"
 #include "hw/misc/unimp.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/kvm.h"
 #include "system/system.h"
 #include "target/arm/cpu.h"

diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c
index bd60ab26898213c6f6c7f18fe1b6b9e8c890e2c9..82fa964711933c9feec8246f50862ed507eca5a3 100644 (file)
--- a/hw/arm/highbank.c
+++ b/hw/arm/highbank.c
@@ -28,7 +28,7 @@
 #include "net/net.h"
 #include "system/runstate.h"
 #include "system/system.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qemu/error-report.h"
 #include "hw/char/pl011.h"
 #include "hw/ide/ahci-sysbus.h"

diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c
index 71a460620324f6d53ec6868640d79d4a0cc8e5d4..21860ed14d371a87e2d7a3c80e92b745d48803ea 100644 (file)
--- a/hw/arm/imx25_pdk.c
+++ b/hw/arm/imx25_pdk.c
@@ -29,7 +29,7 @@
 #include "hw/arm/fsl-imx25.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/machines-qom.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qemu/error-report.h"
 #include "system/qtest.h"
 #include "hw/i2c/i2c.h"

diff --git a/hw/arm/imx8mp-evk.c b/hw/arm/imx8mp-evk.c
index 44e060196700a2c624764627f21d3f294c7a1d6c..ed8c52e1bd218b7a541d9d7b0f75e88621f799e2 100644 (file)
--- a/hw/arm/imx8mp-evk.c
+++ b/hw/arm/imx8mp-evk.c
@@ -11,7 +11,7 @@
 #include "hw/arm/boot.h"
 #include "hw/arm/fsl-imx8mp.h"
 #include "hw/arm/machines-qom.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "system/kvm.h"
 #include "system/qtest.h"

diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c
index b030710b29d7b782df7fa56e1edb807c973b1f4e..436fcdd510112ae3ecbde42a9f5d72bf3b2e89b1 100644 (file)
--- a/hw/arm/integratorcp.c
+++ b/hw/arm/integratorcp.c
@@ -11,7 +11,7 @@
 #include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/machines-qom.h"
 #include "hw/misc/arm_integrator_debug.h"

diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c
index b446dc1547092568e83bd0a50c97235e29ac824a..168ecf35d093db0eb8055db36c95dfda8679e3f4 100644 (file)
--- a/hw/arm/kzm.c
+++ b/hw/arm/kzm.c
@@ -18,7 +18,7 @@
 #include "hw/arm/fsl-imx31.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/machines-qom.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qemu/error-report.h"
 #include "system/address-spaces.h"
 #include "net/net.h"

diff --git a/hw/arm/max78000fthr.c b/hw/arm/max78000fthr.c
index c4f6b5b1b04606df7732cfebc762a14adeb454ea..e4ceb7efcd5d62f77b7c01351b763ba8bf502844 100644 (file)
--- a/hw/arm/max78000fthr.c
+++ b/hw/arm/max78000fthr.c
@@ -8,7 +8,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-clock.h"
 #include "qemu/error-report.h"

diff --git a/hw/arm/mcimx6ul-evk.c b/hw/arm/mcimx6ul-evk.c
index f47a265650eb57af6e50e23fdf6b5b6dae3b4606..5fe6526ba0a20aacf1ae88dd7c5f8b95ea62e8e0 100644 (file)
--- a/hw/arm/mcimx6ul-evk.c
+++ b/hw/arm/mcimx6ul-evk.c
@@ -15,7 +15,7 @@
 #include "hw/arm/fsl-imx6ul.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/machines-qom.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "qemu/error-report.h"
 #include "system/qtest.h"

diff --git a/hw/arm/mcimx7d-sabre.c b/hw/arm/mcimx7d-sabre.c
index fc8f35c58105b5524b46c895a3b7536346d5e035..b1b56b920d484852b1f8a6ae4c5396e9d9f5e04e 100644 (file)
--- a/hw/arm/mcimx7d-sabre.c
+++ b/hw/arm/mcimx7d-sabre.c
@@ -17,7 +17,7 @@
 #include "hw/arm/fsl-imx7.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/machines-qom.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "qemu/error-report.h"
 #include "system/qtest.h"

diff --git a/hw/arm/microbit.c b/hw/arm/microbit.c
index 0f3161fd931d87968f5f8e45f7dc67d0902c0738..cd035fffc765adbee56d8161218d310cb213bffc 100644 (file)
--- a/hw/arm/microbit.c
+++ b/hw/arm/microbit.c
@@ -10,7 +10,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/machines-qom.h"
 #include "system/system.h"

diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c
index 55dd68c57e1b05374ea76a442c2fb393ff592464..3188caf222814be13bf3688f7d6e26692d948ea4 100644 (file)
--- a/hw/arm/mps2-tz.c
+++ b/hw/arm/mps2-tz.c
@@ -54,7 +54,7 @@
 #include "hw/arm/armv7m.h"
 #include "hw/arm/machines-qom.h"
 #include "hw/or-irq.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/address-spaces.h"
 #include "system/system.h"
 #include "system/reset.h"

diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c
index fa4b200577f0a38943559ba4425526d240bc8228..bf5e07019ff395843d2dadb19a1d8903514c3386 100644 (file)
--- a/hw/arm/mps2.c
+++ b/hw/arm/mps2.c
@@ -33,7 +33,7 @@
 #include "hw/arm/armv7m.h"
 #include "hw/arm/machines-qom.h"
 #include "hw/or-irq.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/address-spaces.h"
 #include "system/system.h"
 #include "hw/qdev-properties.h"

diff --git a/hw/arm/mps3r.c b/hw/arm/mps3r.c
index fcb8777cafd0798b353b7002d0d8eb5761a0537f..b63002f48355a30020aa0e27e22c9a0a1c6163ad 100644 (file)
--- a/hw/arm/mps3r.c
+++ b/hw/arm/mps3r.c
@@ -31,7 +31,7 @@
 #include "system/address-spaces.h"
 #include "cpu.h"
 #include "system/system.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/or-irq.h"
 #include "hw/qdev-clock.h"
 #include "hw/qdev-properties.h"

diff --git a/hw/arm/msf2-som.c b/hw/arm/msf2-som.c
index c26feccb15b20ad96ae61b49437bbdf861defe35..78d98c4a4078334ff9dadcaf3abcbbc1da73f7bd 100644 (file)
--- a/hw/arm/msf2-som.c
+++ b/hw/arm/msf2-som.c
@@ -29,7 +29,7 @@
 #include "qemu/units.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/machines-qom.h"

diff --git a/hw/arm/musca.c b/hw/arm/musca.c
index a3494c96bf4c10c838547fdfaca10ff533f58db2..7b30d9bd44698fc305477f422b13bfa488d824fc 100644 (file)
--- a/hw/arm/musca.c
+++ b/hw/arm/musca.c
@@ -27,7 +27,7 @@
 #include "hw/arm/boot.h"
 #include "hw/arm/armsse.h"
 #include "hw/arm/machines-qom.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/char/pl011.h"
 #include "hw/core/split-irq.h"
 #include "hw/misc/tz-mpc.h"

diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
index 675707691c0064267bf1943fbcbaa22ec2b42bba..3e62454096044e78c8d9bd723594764a8d31974d 100644 (file)
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@@ -18,7 +18,7 @@
 #include "hw/arm/machines-qom.h"
 #include "net/net.h"
 #include "system/system.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/char/serial-mm.h"
 #include "qemu/timer.h"
 #include "hw/ptimer.h"

diff --git a/hw/arm/netduino2.c b/hw/arm/netduino2.c
index bce0d6f87a9a38049f76f84eedc002e790a12bf4..1657612fe770a1032857a4febb46117586e0d355 100644 (file)
--- a/hw/arm/netduino2.c
+++ b/hw/arm/netduino2.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-clock.h"
 #include "qemu/error-report.h"

diff --git a/hw/arm/netduinoplus2.c b/hw/arm/netduinoplus2.c
index 8594081fe47af844d5caccada320ec6fd3bb7f67..746a3deef8ecaf954dad702e60a54ea84f301a8f 100644 (file)
--- a/hw/arm/netduinoplus2.c
+++ b/hw/arm/netduinoplus2.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-clock.h"
 #include "qemu/error-report.h"

diff --git a/hw/arm/npcm8xx.c b/hw/arm/npcm8xx.c
index a276fea6985715cf82ea0ac7bb5aae78d2003ccf..3ad7643b4bd851eb04c1a90c3a206f53156e0a35 100644 (file)
--- a/hw/arm/npcm8xx.c
+++ b/hw/arm/npcm8xx.c
@@ -16,7 +16,7 @@
 
 #include "qemu/osdep.h"
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/bsa.h"
 #include "hw/arm/npcm8xx.h"

diff --git a/hw/arm/npcm8xx_boards.c b/hw/arm/npcm8xx_boards.c
index b179eadef5316a88d556dc5b1c3124747a8870df..f775b324027f1984c86b08b88859a53253f732ff 100644 (file)
--- a/hw/arm/npcm8xx_boards.c
+++ b/hw/arm/npcm8xx_boards.c
@@ -17,7 +17,7 @@
 #include "qemu/osdep.h"
 
 #include "chardev/char.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/arm/npcm8xx.h"
 #include "hw/arm/machines-qom.h"
 #include "hw/core/cpu.h"

diff --git a/hw/arm/olimex-stm32-h405.c b/hw/arm/olimex-stm32-h405.c
index c5f60383335cf955cdc68a65c0e0ca1ef06f9ee0..d15545ff07a7f44d4759e487569d4f49045f93b4 100644 (file)
--- a/hw/arm/olimex-stm32-h405.c
+++ b/hw/arm/olimex-stm32-h405.c
@@ -25,7 +25,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-clock.h"
 #include "qemu/error-report.h"

diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c
index 730525be2dc2b4eeecb48e99a207d26d81694c4f..d858dab325348694449badf38b7b5eda4780b4ef 100644 (file)
--- a/hw/arm/omap_sx1.c
+++ b/hw/arm/omap_sx1.c
@@ -30,7 +30,7 @@
 #include "qapi/error.h"
 #include "ui/console.h"
 #include "hw/arm/omap.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/machines-qom.h"
 #include "hw/block/flash.h"

diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c
index 3e237e78fa16a92201ba359ae0aca54b31422cfd..c0dd32f13cef4d09c3ea551381879d18226fa555 100644 (file)
--- a/hw/arm/orangepi.c
+++ b/hw/arm/orangepi.c
@@ -22,7 +22,7 @@
 #include "system/address-spaces.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "hw/arm/allwinner-h3.h"
 #include "hw/arm/boot.h"

diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c
index 81d2fa1b67d8c06f278d53e89ddeac5028e359ae..910c18213a53cbe9578eb1820355b94095c17b4e 100644 (file)
--- a/hw/arm/raspi.c
+++ b/hw/arm/raspi.c
@@ -22,7 +22,7 @@
 #include "hw/arm/raspi_platform.h"
 #include "hw/registerfields.h"
 #include "qemu/error-report.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/machines-qom.h"

diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c
index 0422ae0f00bbc766382f5183a87b3b4b14279ee1..058df2c4c96c3ed651ac9268feb45f36b9edc814 100644 (file)
--- a/hw/arm/raspi4b.c
+++ b/hw/arm/raspi4b.c
@@ -17,7 +17,7 @@
 #include "hw/registerfields.h"
 #include "qemu/error-report.h"
 #include "system/device_tree.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "hw/arm/boot.h"
 #include "qom/object.h"

diff --git a/hw/arm/realview.c b/hw/arm/realview.c
index d8327a50d23fa4d4963ac57b1da3d53c0a1caf20..97008490f6a7e850e2867e7d3b69924f7d3c1a48 100644 (file)
--- a/hw/arm/realview.c
+++ b/hw/arm/realview.c
@@ -21,7 +21,7 @@
 #include "hw/qdev-core.h"
 #include "net/net.h"
 #include "system/system.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/i2c/i2c.h"
 #include "qemu/error-report.h"
 #include "hw/char/pl011.h"

diff --git a/hw/arm/sabrelite.c b/hw/arm/sabrelite.c
index 5b4ab7d77a50d5e12ad0e6e94e781724070733f9..99cbd5e2fea5a0de89b9bc25d8b4f770677c2fd3 100644 (file)
--- a/hw/arm/sabrelite.c
+++ b/hw/arm/sabrelite.c
@@ -15,7 +15,7 @@
 #include "hw/arm/fsl-imx6.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/machines-qom.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "qemu/error-report.h"
 #include "system/qtest.h"

diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c
index 3ba69d37d79d3dfa4c849a3740a9ec5a357d06d6..32d4c52bf5024a96f11dfacabb771a545a342470 100644 (file)
--- a/hw/arm/sbsa-ref.c
+++ b/hw/arm/sbsa-ref.c
@@ -37,7 +37,7 @@
 #include "hw/arm/smmuv3.h"
 #include "hw/arm/machines-qom.h"
 #include "hw/block/flash.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/ide/ide-bus.h"
 #include "hw/ide/ahci-sysbus.h"
 #include "hw/intc/arm_gicv3_common.h"

diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
index 8113bbd5d8bfcd5fb01efbbc1b073c4d0de855cd..d1cbf43777e5deae3fac24e7090720b8d5a65983 100644 (file)
--- a/hw/arm/stellaris.c
+++ b/hw/arm/stellaris.c
@@ -19,7 +19,7 @@
 #include "qemu/timer.h"
 #include "hw/i2c/i2c.h"
 #include "net/net.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qemu/log.h"
 #include "system/address-spaces.h"
 #include "system/system.h"

diff --git a/hw/arm/stm32vldiscovery.c b/hw/arm/stm32vldiscovery.c
index c11029f8bd487f9d7fe21a3ef3136922d35474fc..4843c5565b65496efdf26ac5debb15b8c4a8d265 100644 (file)
--- a/hw/arm/stm32vldiscovery.c
+++ b/hw/arm/stm32vldiscovery.c
@@ -25,7 +25,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-clock.h"
 #include "qemu/error-report.h"

diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c
index c3c99a2da689e7d47c6fa06f91fce7d0ffcfe19b..dd1047f6c62e1cc14b0368f3ef6098bf6a89d6e5 100644 (file)
--- a/hw/arm/versatilepb.c
+++ b/hw/arm/versatilepb.c
@@ -20,7 +20,7 @@
 #include "hw/i2c/i2c.h"
 #include "hw/i2c/arm_sbcon_i2c.h"
 #include "hw/irq.h"
-#include "hw/boards.h"
+#include "hw/core/boards.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 3492e03a656f7976343a475cb200e7af030f1916..2f61ad0dd62b0f3ba74b6b4b34c3464eca2176ab 100644 (file)
--- a/hw/arm/vexpress.c
+++ b/hw/arm/vexpress.c
@@ -32,7 +32,7 @@
 #include "hw/i2c/i2c.h"
 #include "net/net.h"
 #include "system/system.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "hw/block/flash.h"
 #include "system/device_tree.h"

diff --git a/hw/arm/xen-pvh.c b/hw/arm/xen-pvh.c
index 86a0296616101617caee16eedd3b4ebbac7390b8..10cac28a910951384205f16437a7d94e383fd3ca 100644 (file)
--- a/hw/arm/xen-pvh.c
+++ b/hw/arm/xen-pvh.c
@@ -7,7 +7,7 @@
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
 #include "qapi/qapi-commands-migration.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/system.h"
 #include "hw/xen/xen-pvh-common.h"
 #include "hw/arm/machines-qom.h"

diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c
index c82edd3bed10d32f169aa293098be5de1d6b1198..a6dc644d0bdd9ebaa550d334ff243bb9c5a35009 100644 (file)
--- a/hw/arm/xilinx_zynq.c
+++ b/hw/arm/xilinx_zynq.c
@@ -23,7 +23,7 @@
 #include "hw/arm/machines-qom.h"
 #include "net/net.h"
 #include "system/system.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/block/flash.h"
 #include "hw/loader.h"
 #include "hw/adc/zynq-xadc.h"

diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c
index 5e05521a57258b701a89afad5135481c7865ff4d..e82ac8e3538429528c71f6cfd69650f89d5d85c0 100644 (file)
--- a/hw/arm/xlnx-versal-virt.c
+++ b/hw/arm/xlnx-versal-virt.c
@@ -16,7 +16,7 @@
 #include "system/device_tree.h"
 #include "system/address-spaces.h"
 #include "hw/block/flash.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/sysbus.h"
 #include "hw/arm/fdt.h"
 #include "hw/arm/xlnx-versal.h"

diff --git a/hw/arm/xlnx-zcu102.c b/hw/arm/xlnx-zcu102.c
index 06a3d7dfe7f6c5a2150d032bb1c31fcf535f0065..3ba2736bab3560969f8c54ce264e9b3fdc4dc872 100644 (file)
--- a/hw/arm/xlnx-zcu102.c
+++ b/hw/arm/xlnx-zcu102.c
@@ -20,7 +20,7 @@
 #include "hw/arm/xlnx-zynqmp.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/machines-qom.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qemu/error-report.h"
 #include "qemu/log.h"
 #include "system/device_tree.h"

diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c
index ffed6e5126ed066968eebacb34862a26b0c480ff..5f0e34ccecf21b305c586e755f25408a260e9c38 100644 (file)
--- a/hw/arm/xlnx-zynqmp.c
+++ b/hw/arm/xlnx-zynqmp.c
@@ -21,7 +21,7 @@
 #include "hw/arm/xlnx-zynqmp.h"
 #include "hw/intc/arm_gic_common.h"
 #include "hw/misc/unimp.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/system.h"
 #include "target/arm/cpu-qom.h"
 #include "target/arm/gtimer.h"

diff --git a/hw/avr/boot.h b/hw/avr/boot.h
index 684d553322bfb8b58bd2a9982eacc181517f865c..9eed20555913a1ab6cbba705913fab7131ede8f9 100644 (file)
--- a/hw/avr/boot.h
+++ b/hw/avr/boot.h
@@ -11,7 +11,7 @@
 #ifndef HW_AVR_BOOT_H
 #define HW_AVR_BOOT_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "cpu.h"
 
 /**

diff --git a/hw/core/cpu-common.c b/hw/core/cpu-common.c
index 8c306c89e45302aa01cb31e2c48f02a8408d37c0..fb8421184d5dddf0bd04de8bb5891bf45704c78e 100644 (file)
--- a/hw/core/cpu-common.c
+++ b/hw/core/cpu-common.c
@@ -31,7 +31,7 @@
 #include "exec/log.h"
 #include "exec/gdbstub.h"
 #include "system/tcg.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "trace.h"
 #ifdef CONFIG_PLUGIN

diff --git a/hw/core/generic-loader.c b/hw/core/generic-loader.c
index 433efb7387252d72246fbc946e7479d9685909d1..be4fe867e4deef522cc1963fb0ca593b67687e9a 100644 (file)
--- a/hw/core/generic-loader.c
+++ b/hw/core/generic-loader.c
@@ -33,7 +33,7 @@
 #include "qemu/osdep.h"
 #include "system/dma.h"
 #include "system/reset.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "hw/qdev-properties.h"
 #include "qapi/error.h"

diff --git a/hw/core/guest-loader.c b/hw/core/guest-loader.c
index 618455e5566f4d12f35e536b1fc7a611f0b54d57..07c36464047108f32acfa793d5ac567d598ce982 100644 (file)
--- a/hw/core/guest-loader.c
+++ b/hw/core/guest-loader.c
@@ -33,7 +33,7 @@
 #include "qemu/module.h"
 #include "guest-loader.h"
 #include "system/device_tree.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 
 /*
  * Insert some FDT nodes for the loaded blob.

diff --git a/hw/core/loader.c b/hw/core/loader.c
index 590c5b02aa1d832534d7a957a6cd0928a8e528bf..385730e8ef5b2458bb9bd488b0cfc7864fc0b15e 100644 (file)
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -61,7 +61,7 @@
 #include "hw/loader.h"
 #include "hw/nvram/fw_cfg.h"
 #include "system/memory.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qemu/cutils.h"
 #include "system/runstate.h"
 #include "tcg/debuginfo.h"

diff --git a/hw/core/machine-hmp-cmds.c b/hw/core/machine-hmp-cmds.c
index 74a56600be835b522a3af5d885612b6842eb13da..46846f741a2fdbc0fbf8232a9442faf8698c4a62 100644 (file)
--- a/hw/core/machine-hmp-cmds.c
+++ b/hw/core/machine-hmp-cmds.c
@@ -24,7 +24,7 @@
 #include "qapi/string-output-visitor.h"
 #include "qemu/error-report.h"
 #include "system/numa.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 
 void hmp_info_cpus(Monitor *mon, const QDict *qdict)
 {

diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c
index 28dfd3e15bd0a48d6fc803aa4aa71e6dff9a1963..d23466177d846d0ddddbb7cb9b185d31f107a518 100644 (file)
--- a/hw/core/machine-qmp-cmds.c
+++ b/hw/core/machine-qmp-cmds.c
@@ -9,7 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/acpi/vmgenid.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/intc/intc.h"
 #include "hw/mem/memory-device.h"
 #include "qapi/error.h"

diff --git a/hw/core/machine-smp.c b/hw/core/machine-smp.c
index 0be0ac044c22856cf94b52481b232d58df0f5ac3..189c70015fdd6bfbd17158ab80ce5491721fbfa6 100644 (file)
--- a/hw/core/machine-smp.c
+++ b/hw/core/machine-smp.c
@@ -18,7 +18,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 

diff --git a/hw/core/machine.c b/hw/core/machine.c
index 27372bb01ef4b71cd59cdf1e0f2d88c73952359a..1106f86bf5b36e6b114cba8a7b1cf5e62e614752 100644 (file)
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -14,7 +14,7 @@
 #include "qemu/units.h"
 #include "qemu/accel.h"
 #include "system/replay.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"

diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c
index 67b769bd3e0039209493f93d11868ac99d496539..c52b022d3aadbd0ab95d1544b91eb23aa1d806de 100644 (file)
--- a/hw/core/null-machine.c
+++ b/hw/core/null-machine.c
@@ -13,7 +13,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/address-spaces.h"
 #include "hw/core/cpu.h"
 #include "hw/arm/machines-qom.h"

diff --git a/hw/core/numa.c b/hw/core/numa.c
index 218576f745562c34faa1c058655566b3a4a8b634..fa78dacb6beec4fab4d81dc68412cb8daaf4fc0b 100644 (file)
--- a/hw/core/numa.c
+++ b/hw/core/numa.c
@@ -35,7 +35,7 @@
 #include "system/qtest.h"
 #include "hw/core/cpu.h"
 #include "hw/mem/pc-dimm.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/mem/memory-device.h"
 #include "qemu/option.h"
 #include "qemu/config-file.h"

diff --git a/hw/core/qdev-hotplug.c b/hw/core/qdev-hotplug.c
index ff176dc1bb37d29e7379bf495d7ec563de2882ff..d2c39806c532ea12a36ad78745c76ecb1f405d80 100644 (file)
--- a/hw/core/qdev-hotplug.c
+++ b/hw/core/qdev-hotplug.c
@@ -11,7 +11,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/qdev-core.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qapi/error.h"
 
 HotplugHandler *qdev_get_machine_hotplug_handler(DeviceState *dev)

diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index fab42a727059b6971246d2cb285ef39d8b6e7054..423a3a1d66099df5dd09760327c8d02d3d2bf8ec 100644 (file)
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -34,7 +34,7 @@
 #include "qemu/option.h"
 #include "hw/irq.h"
 #include "hw/qdev-properties.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/sysbus.h"
 #include "hw/qdev-clock.h"
 #include "migration/vmstate.h"

diff --git a/hw/cpu/core.c b/hw/cpu/core.c
index 5cb2e9a7f540f726cbb9d7829844d39176ec87aa..26e488f3d8e33d2a26b12861a878a1da96f04d29 100644 (file)
--- a/hw/cpu/core.c
+++ b/hw/cpu/core.c
@@ -9,7 +9,7 @@
 
 #include "qemu/osdep.h"
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/cpu/core.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"

diff --git a/hw/cxl/cxl-host.c b/hw/cxl/cxl-host.c
index 0d891c651dfe882f1537df679f482b6080769466..f3479b19914f2eb0c6e9986b3378f62d4241018f 100644 (file)
--- a/hw/cxl/cxl-host.c
+++ b/hw/cxl/cxl-host.c
@@ -11,7 +11,7 @@
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "system/qtest.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 
 #include "qapi/qapi-visit-machine.h"
 #include "hw/cxl/cxl.h"

diff --git a/hw/hyperv/hv-balloon.c b/hw/hyperv/hv-balloon.c
index 2d6d7db4ee0e544bc00d88d42881bd87f2ecf1f0..ac024accfcd27305c0a125ce55cd5c91b9ee1108 100644 (file)
--- a/hw/hyperv/hv-balloon.c
+++ b/hw/hyperv/hv-balloon.c
@@ -13,7 +13,7 @@
 #include "system/address-spaces.h"
 #include "exec/cpu-common.h"
 #include "system/ramblock.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/hyperv/dynmem-proto.h"
 #include "hw/hyperv/hv-balloon.h"
 #include "hw/hyperv/vmbus.h"

diff --git a/hw/i2c/pm_smbus.c b/hw/i2c/pm_smbus.c
index 4e685fd26e7dd41674873bbcb0a675bd001b429f..ead53d2724dbf3acdb43b793b16d8acbae62d31a 100644 (file)
--- a/hw/i2c/pm_smbus.c
+++ b/hw/i2c/pm_smbus.c
@@ -19,7 +19,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/i2c/pm_smbus.h"
 #include "hw/i2c/smbus_master.h"
 #include "migration/vmstate.h"

diff --git a/hw/i2c/smbus_eeprom.c b/hw/i2c/smbus_eeprom.c
index 26e211b31ad585002742e47609d208dcc3dc15c3..ce3723e14838afa2d1f01db205da5ab7ea302278 100644 (file)
--- a/hw/i2c/smbus_eeprom.c
+++ b/hw/i2c/smbus_eeprom.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/i2c/i2c.h"
 #include "hw/i2c/smbus_slave.h"
 #include "hw/qdev-properties.h"

diff --git a/hw/i386/acpi-common.h b/hw/i386/acpi-common.h
index e305aaac15864fd9917313869f96a18bee79eddd..57ef024cd3727dc7d823d8286f704f2afd6360b2 100644 (file)
--- a/hw/i386/acpi-common.h
+++ b/hw/i386/acpi-common.h
@@ -1,7 +1,7 @@
 #ifndef HW_I386_ACPI_COMMON_H
 #define HW_I386_ACPI_COMMON_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/acpi/bios-linker-loader.h"
 #include "hw/i386/x86.h"
 

diff --git a/hw/i386/fw_cfg.h b/hw/i386/fw_cfg.h
index e560fd7be82be847a827f28534a8c59e8ce9d05d..e7e70ff23731b76800583f146890e48887fecd36 100644 (file)
--- a/hw/i386/fw_cfg.h
+++ b/hw/i386/fw_cfg.h
@@ -9,7 +9,7 @@
 #ifndef HW_I386_FW_CFG_H
 #define HW_I386_FW_CFG_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/i386/pc.h"
 #include "hw/nvram/fw_cfg.h"
 

diff --git a/hw/i386/vapic.c b/hw/i386/vapic.c
index f1089f0a7c82646e2bee885fc6eae23c685e4a2d..3a4254638b2c5a7a4456cbce2d909a58a71318dc 100644 (file)
--- a/hw/i386/vapic.c
+++ b/hw/i386/vapic.c
@@ -20,7 +20,7 @@
 #include "system/address-spaces.h"
 #include "hw/i386/apic_internal.h"
 #include "hw/sysbus.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "migration/vmstate.h"
 #include "qom/object.h"
 

diff --git a/hw/i386/vmport.c b/hw/i386/vmport.c
index 6d93457c526316bdec3676a12fbdc88600f7e6e4..32e02e1eeb00da2fb63390135ec438be714f1872 100644 (file)
--- a/hw/i386/vmport.c
+++ b/hw/i386/vmport.c
@@ -32,7 +32,7 @@
 #include "hw/isa/isa.h"
 #include "hw/i386/vmport.h"
 #include "hw/qdev-properties.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/system.h"
 #include "system/hw_accel.h"
 #include "system/qtest.h"

diff --git a/hw/i386/xen/xen-pvh.c b/hw/i386/xen/xen-pvh.c
index 067f73e97738e1ed7e9ab7256ab75546ea27358e..ab90c83a8309eed0bdb47df707a1a3689c87f6ab 100644 (file)
--- a/hw/i386/xen/xen-pvh.c
+++ b/hw/i386/xen/xen-pvh.c
@@ -9,7 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/system.h"
 #include "hw/xen/arch_hvm.h"
 #include <xen/hvm/hvm_info_table.h>

diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c
index ec9e978b0b40f7cf4a82f494fb64aaefcbb82e9d..83e1bc2d75903ca97838b56541010662040ef9d6 100644 (file)
--- a/hw/intc/apic_common.c
+++ b/hw/intc/apic_common.c
@@ -27,7 +27,7 @@
 #include "hw/i386/apic_internal.h"
 #include "hw/intc/kvm_irqcount.h"
 #include "trace.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/kvm.h"
 #include "hw/qdev-properties.h"
 #include "hw/sysbus.h"

diff --git a/hw/intc/loongarch_ipi.c b/hw/intc/loongarch_ipi.c
index fc8005c9444076fb9805108db32e1382ea9405e1..2a4557a8baa02cab0e6450bd7dbf04923e15eb4b 100644 (file)
--- a/hw/intc/loongarch_ipi.c
+++ b/hw/intc/loongarch_ipi.c
@@ -7,7 +7,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qapi/error.h"
 #include "hw/intc/loongarch_ipi.h"
 #include "hw/qdev-properties.h"

diff --git a/hw/intc/loongarch_pic_kvm.c b/hw/intc/loongarch_pic_kvm.c
index 6cfddf45206a3237e53a16846458d5367c91b2e1..7a8b4e7b66664476e14f2fbbd1e70a2b1c213367 100644 (file)
--- a/hw/intc/loongarch_pic_kvm.c
+++ b/hw/intc/loongarch_pic_kvm.c
@@ -7,7 +7,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/intc/loongarch_pch_pic.h"
 #include "hw/loongarch/virt.h"
 #include "system/kvm.h"

diff --git a/hw/intc/riscv_aplic.c b/hw/intc/riscv_aplic.c
index a2041e702245211ba3bcf4334301d7c86272e36f..a559664c40ba473afb38d916b9f2064e2b8d5ce2 100644 (file)
--- a/hw/intc/riscv_aplic.c
+++ b/hw/intc/riscv_aplic.c
@@ -25,7 +25,7 @@
 #include "system/address-spaces.h"
 #include "hw/sysbus.h"
 #include "hw/pci/msi.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "hw/intc/riscv_aplic.h"
 #include "hw/irq.h"

diff --git a/hw/intc/riscv_imsic.c b/hw/intc/riscv_imsic.c
index 6174e1a05d45f435c865bd43ed447c13ff5c945f..513e38d9c1207e97a04066ab2036ecaf2dbcc8c9 100644 (file)
--- a/hw/intc/riscv_imsic.c
+++ b/hw/intc/riscv_imsic.c
@@ -25,7 +25,7 @@
 #include "system/address-spaces.h"
 #include "hw/sysbus.h"
 #include "hw/pci/msi.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "hw/intc/riscv_imsic.h"
 #include "hw/irq.h"

diff --git a/hw/loongarch/fw_cfg.h b/hw/loongarch/fw_cfg.h
index 27ee68286ed115f5e3f99b27c8d3ad2ec1d1550f..809b06c545e8553b45d3888e317fae07e56dcdc9 100644 (file)
--- a/hw/loongarch/fw_cfg.h
+++ b/hw/loongarch/fw_cfg.h
@@ -8,7 +8,7 @@
 #ifndef HW_LOONGARCH_FW_CFG_H
 #define HW_LOONGARCH_FW_CFG_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/nvram/fw_cfg.h"
 
 FWCfgState *virt_fw_cfg_init(ram_addr_t ram_size, MachineState *ms);

diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index 49434ad1828b0c706fb80f67d4ff12e6830144ca..a78a9bc03d8684d924e6a03056ad5479fbd67813 100644 (file)
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -9,7 +9,7 @@
 #include "qemu/datadir.h"
 #include "qapi/error.h"
 #include "exec/target_page.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/char/serial-mm.h"
 #include "system/kvm.h"
 #include "system/tcg.h"

diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c
index ff21d7779e194ec28dc654c199677ab43ee1fad1..f67611ba0b28c441a50cbd9b17c9919fcbfa1565 100644 (file)
--- a/hw/m68k/an5206.c
+++ b/hw/m68k/an5206.c
@@ -10,7 +10,7 @@
 #include "qapi/error.h"
 #include "cpu.h"
 #include "hw/m68k/mcf.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "elf.h"
 #include "qemu/error-report.h"

diff --git a/hw/m68k/mcf5206.c b/hw/m68k/mcf5206.c
index a25e782403f35d331313ea5fa35e03fe16178e0a..6359aa81d0e207a188cbe7efd9d7b36d450224ae 100644 (file)
--- a/hw/m68k/mcf5206.c
+++ b/hw/m68k/mcf5206.c
@@ -11,7 +11,7 @@
 #include "qemu/log.h"
 #include "cpu.h"
 #include "hw/qdev-properties.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/irq.h"
 #include "hw/m68k/mcf.h"
 #include "qemu/timer.h"

diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c
index 4a585b231db5f6515e59ef64806a1bb6e2bf5b7d..c1067435bf8a1fbf6f21ee30c7d1eec92bc87413 100644 (file)
--- a/hw/m68k/mcf5208.c
+++ b/hw/m68k/mcf5208.c
@@ -29,7 +29,7 @@
 #include "system/system.h"
 #include "system/qtest.h"
 #include "net/net.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "hw/sysbus.h"
 #include "elf.h"

diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c
index cfb2b319e5e870b3b605d53835b4be3ebbf41ef7..d7c460bcd4b6e57d5ed9d0ba2fa0945d84a4a2a0 100644 (file)
--- a/hw/m68k/next-cube.c
+++ b/hw/m68k/next-cube.c
@@ -17,7 +17,7 @@
 #include "system/qtest.h"
 #include "hw/irq.h"
 #include "hw/m68k/next-cube.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "hw/scsi/esp.h"
 #include "hw/sysbus.h"

diff --git a/hw/m68k/q800-glue.c b/hw/m68k/q800-glue.c
index 36de67c328e7e83d3309be6e425d659b720526f8..d663d124fce863d11145c891c237077a36be7731 100644 (file)
--- a/hw/m68k/q800-glue.c
+++ b/hw/m68k/q800-glue.c
@@ -23,7 +23,7 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "hw/m68k/q800-glue.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/irq.h"
 #include "hw/nmi.h"
 #include "hw/qdev-properties.h"

diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index b8676feb418b84f4e3399813a6d11b86783cfe79..1aaaada34657b11ad6dba3037656e6ae5e9a324e 100644 (file)
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -27,7 +27,7 @@
 #include "exec/target_page.h"
 #include "system/system.h"
 #include "cpu.h"
-#include "hw/boards.h"
+#include "hw/core/boards.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 3f65d9155617f68ebeca8dfa4ad3213331e1f6c9..6f2b7bb5a081989a47832d4b23e9a46c02bccf5c 100644 (file)
--- a/hw/m68k/virt.c
+++ b/hw/m68k/virt.c
@@ -13,7 +13,7 @@
 #include "exec/target_page.h"
 #include "system/system.h"
 #include "cpu.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "elf.h"
 #include "hw/loader.h"

diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c
index 1a432e9bd224890e6b3b92548a000a61b8da40a3..9cf82b84cf44e5b5ade785235b9799787b200021 100644 (file)
--- a/hw/mem/memory-device.c
+++ b/hw/mem/memory-device.c
@@ -13,7 +13,7 @@
 #include "qemu/error-report.h"
 #include "hw/mem/memory-device.h"
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qemu/range.h"
 #include "hw/virtio/vhost.h"
 #include "system/kvm.h"

diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
index f701d5b5f9b3623abb1c7a66ad9b8b16f6369697..33e5a376ffa979c585e97d28b694a9720d789b18 100644 (file)
--- a/hw/mem/pc-dimm.c
+++ b/hw/mem/pc-dimm.c
@@ -19,7 +19,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/mem/pc-dimm.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"

diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c
index ec38107f50333746e2d86f9cccd849db54768b2a..39eb2386e8f4ab82ea5b45a0c68573ce1d321615 100644 (file)
--- a/hw/microblaze/boot.c
+++ b/hw/microblaze/boot.c
@@ -33,7 +33,7 @@
 #include "qemu/guest-random.h"
 #include "system/device_tree.h"
 #include "system/reset.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "elf.h"
 #include "qemu/cutils.h"

diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c
index 6e923c49cfc7de94c0683a90551c8fe670fac2ad..f5b9b2e8904bd172a62412de9ca0de58bcda4198 100644 (file)
--- a/hw/microblaze/petalogix_ml605_mmu.c
+++ b/hw/microblaze/petalogix_ml605_mmu.c
@@ -33,7 +33,7 @@
 #include "net/net.h"
 #include "hw/block/flash.h"
 #include "system/system.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/char/serial-mm.h"
 #include "hw/qdev-properties.h"
 #include "system/address-spaces.h"

diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c
index e8d0ddfdf86fef3d9dba14075595c560194a430f..266ecf9e8ab8e5f5bad73d6e7e1ec3524d455bd8 100644 (file)
--- a/hw/microblaze/petalogix_s3adsp1800_mmu.c
+++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c
@@ -31,7 +31,7 @@
 #include "net/net.h"
 #include "hw/block/flash.h"
 #include "system/system.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/misc/unimp.h"
 #include "system/address-spaces.h"
 #include "hw/char/xilinx_uartlite.h"

diff --git a/hw/microblaze/xlnx-zynqmp-pmu.c b/hw/microblaze/xlnx-zynqmp-pmu.c
index e909802bb7464e30798c5b15d499b62815f4705a..f4c55589b7fcb1ba6ba5e5285c1b1f3ee97bae3d 100644 (file)
--- a/hw/microblaze/xlnx-zynqmp-pmu.c
+++ b/hw/microblaze/xlnx-zynqmp-pmu.c
@@ -18,7 +18,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "system/address-spaces.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "cpu.h"
 #include "boot.h"
 

diff --git a/hw/mips/boston.c b/hw/mips/boston.c
index 6a4fcdd9ca79bbadf14a6cb1f709a63883704179..dc9da0b04013e4b7546dce4794b56361e70c776a 100644 (file)
--- a/hw/mips/boston.c
+++ b/hw/mips/boston.c
@@ -21,7 +21,7 @@
 #include "qemu/units.h"
 
 #include "elf.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/char/serial-mm.h"
 #include "hw/ide/pci.h"
 #include "hw/ide/ahci-pci.h"

diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c
index 5fe40eee65a8d6b2cbcbaae9583ee05abbac9ad2..e777863703d30cab770e5b5c0bfa2302cdf8c156 100644 (file)
--- a/hw/mips/fuloong2e.c
+++ b/hw/mips/fuloong2e.c
@@ -25,7 +25,7 @@
 #include "cpu.h"
 #include "hw/clock.h"
 #include "net/net.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/i2c/smbus_eeprom.h"
 #include "hw/block/flash.h"
 #include "hw/mips/mips.h"

diff --git a/hw/mips/fw_cfg.h b/hw/mips/fw_cfg.h
index e317d5b9a3e89dfcf574e31a7ec060d589f84eae..8a42d98cdf51415607a3b76721d7117b361223ec 100644 (file)
--- a/hw/mips/fw_cfg.h
+++ b/hw/mips/fw_cfg.h
@@ -9,7 +9,7 @@
 #ifndef HW_MIPS_FW_CFG_H
 #define HW_MIPS_FW_CFG_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/nvram/fw_cfg.h"
 
 /* Data for BIOS to identify machine */

diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c
index 1d6bdc00917e4460697f4f7a28a6ad8552977a57..1708cec3f8ca6d67542ef66f37941cc5e344df75 100644 (file)
--- a/hw/mips/jazz.c
+++ b/hw/mips/jazz.c
@@ -33,7 +33,7 @@
 #include "hw/isa/isa.h"
 #include "hw/block/fdc.h"
 #include "system/system.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "net/net.h"
 #include "hw/scsi/esp.h"
 #include "hw/loader.h"

diff --git a/hw/mips/malta.c b/hw/mips/malta.c
index a4e2ea98ade962b7d968483ceb768fd16a4a1ae7..f39e56d279850c2252eafdc379667c58b8f5e17e 100644 (file)
--- a/hw/mips/malta.c
+++ b/hw/mips/malta.c
@@ -34,7 +34,7 @@
 #include "hw/isa/superio.h"
 #include "hw/char/serial-mm.h"
 #include "net/net.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/i2c/smbus_eeprom.h"
 #include "hw/block/flash.h"
 #include "hw/mips/mips.h"

diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index aa240504935be53a8e1847d30084667cf5bd54dc..b696bf39e12d7d13700f907d9b185ad474611589 100644 (file)
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -28,7 +28,7 @@
 #include "system/dma.h"
 #include "system/reset.h"
 #include "system/address-spaces.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/nvram/fw_cfg.h"
 #include "hw/qdev-properties.h"
 #include "hw/sysbus.h"

diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c
index b7d9cdd900731679a2ad6ec9727dbd6c5b19b390..769107e835e994022bf779025aa3e23cfe3fed60 100644 (file)
--- a/hw/openrisc/openrisc_sim.c
+++ b/hw/openrisc/openrisc_sim.c
@@ -23,7 +23,7 @@
 #include "qapi/error.h"
 #include "cpu.h"
 #include "hw/irq.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/char/serial-mm.h"
 #include "net/net.h"
 #include "hw/openrisc/boot.h"

diff --git a/hw/openrisc/virt.c b/hw/openrisc/virt.c
index a98071c93658fa2c43998ddae8e67109fbaf26c6..3cfd1c0b5ce2266a76fb688fbc3d8264cc9cfdc4 100644 (file)
--- a/hw/openrisc/virt.c
+++ b/hw/openrisc/virt.c
@@ -13,7 +13,7 @@
 #include "cpu.h"
 #include "system/address-spaces.h"
 #include "hw/irq.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/char/serial-mm.h"
 #include "hw/core/split-irq.h"
 #include "hw/openrisc/boot.h"

diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expander_bridge.c
index 1bcceddbc4d7db2315b1681a18a9e36e5c6af73a..b3a5f16e22ae0fe30ea9f186574582d1d04ca9cd 100644 (file)
--- a/hw/pci-bridge/pci_expander_bridge.c
+++ b/hw/pci-bridge/pci_expander_bridge.c
@@ -24,7 +24,7 @@
 #include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "system/numa.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qom/object.h"
 
 enum BusType { PCI, PCIE, CXL };

diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index b1eba348e06ec345a7d4fed3dad24a21372e68a0..e03953813c200a6cbb3b9e813d903cb21d4fc338 100644 (file)
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -46,7 +46,7 @@
 #include "hw/pci/msi.h"
 #include "hw/pci/msix.h"
 #include "hw/hotplug.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/nvram/fw_cfg.h"
 #include "qapi/error.h"
 #include "qemu/cutils.h"

diff --git a/hw/ppc/amigaone.c b/hw/ppc/amigaone.c
index 74a1fa3b635b99bbcf4c99d495c3584c54eaacbb..3df4724a72b030f8286708a01a20016e2e8b7da6 100644 (file)
--- a/hw/ppc/amigaone.c
+++ b/hw/ppc/amigaone.c
@@ -14,7 +14,7 @@
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "hw/ppc/ppc.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "hw/pci-host/articia.h"
 #include "hw/isa/vt82c686.h"

diff --git a/hw/ppc/e500.h b/hw/ppc/e500.h
index 00f490519c298bf97b45a889743fcf9ed87ee13c..cda539bda180aaa9d23c8989e4c1ff07ace10001 100644 (file)
--- a/hw/ppc/e500.h
+++ b/hw/ppc/e500.h
@@ -1,7 +1,7 @@
 #ifndef PPCE500_H
 #define PPCE500_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/platform-bus.h"
 #include "qom/object.h"
 

diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 739f1af3e18d24c5078c2ce6898dd602f04dceb7..bdc6c7ed7fe59db26931b37ef95d392499e4fee2 100644 (file)
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -54,7 +54,7 @@
 #include "hw/ppc/ppc.h"
 #include "hw/qdev-properties.h"
 #include "hw/nvram/mac_nvram.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/pci-host/uninorth.h"
 #include "hw/input/adb.h"
 #include "hw/ppc/mac_dbdma.h"

diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index cd2bb46442fd60508a4c990338c5ed9c3dee7368..8d35080b9d1e32d5ffc69899b19d12635eaf6896 100644 (file)
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -31,7 +31,7 @@
 #include "exec/target_page.h"
 #include "hw/ppc/ppc.h"
 #include "hw/qdev-properties.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/input/adb.h"
 #include "system/system.h"
 #include "net/net.h"

diff --git a/hw/ppc/pegasos.c b/hw/ppc/pegasos.c
index 8ce185de3eac35b78454218768a1f12a2950236a..3b48a54e7a03bd41836ca432fdcc3b1bf1f781e0 100644 (file)
--- a/hw/ppc/pegasos.c
+++ b/hw/ppc/pegasos.c
@@ -24,7 +24,7 @@
 #include "system/reset.h"
 #include "system/runstate.h"
 #include "system/qtest.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "hw/fw-path-provider.h"
 #include "elf.h"

diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
index 7e739a21147f52325f1f433ac5b8b85c963908db..824dd91ed5e4126f2d8fd7b753ce591268009734 100644 (file)
--- a/hw/ppc/ppc440_bamboo.c
+++ b/hw/ppc/ppc440_bamboo.c
@@ -18,7 +18,7 @@
 #include "exec/page-protection.h"
 #include "net/net.h"
 #include "hw/pci/pci.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/kvm.h"
 #include "system/device_tree.h"
 #include "hw/loader.h"

diff --git a/hw/ppc/ppe42_machine.c b/hw/ppc/ppe42_machine.c
index f14a91b4e4dbd4ad3776bfd7f011adeb09a4d740..6c9bc89e2d68c26f34bf219eb216e87f8f05cea9 100644 (file)
--- a/hw/ppc/ppe42_machine.c
+++ b/hw/ppc/ppe42_machine.c
@@ -10,7 +10,7 @@
 #include "qemu/units.h"
 #include "qemu/error-report.h"
 #include "system/address-spaces.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/ppc/ppc.h"
 #include "system/system.h"
 #include "system/reset.h"

diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index 5654a60c59588cb87c44af03c965aa1fb0d50c30..0d5e1f604e6d79906cb35c4d7238a66c883f2ce9 100644 (file)
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -31,7 +31,7 @@
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_host.h"
 #include "hw/ppc/ppc.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qemu/log.h"

diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c
index 038b98d0b81572c3e4311bcb6934945f46f7f867..992bfe39a36bbb549bcbc4606a3cf8000ed92ee3 100644 (file)
--- a/hw/ppc/sam460ex.c
+++ b/hw/ppc/sam460ex.c
@@ -16,7 +16,7 @@
 #include "qemu/datadir.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/kvm.h"
 #include "kvm_ppc.h"
 #include "system/device_tree.h"

diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
index 43a6d505a849787c4a6b5c76c2e301f391a2ab87..8221a01639df128d1727ef0abd8d6dbe20183201 100644 (file)
--- a/hw/ppc/virtex_ml507.c
+++ b/hw/ppc/virtex_ml507.c
@@ -32,7 +32,7 @@
 #include "hw/block/flash.h"
 #include "system/system.h"
 #include "system/reset.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/device_tree.h"
 #include "hw/loader.h"
 #include "elf.h"

diff --git a/hw/remote/vfio-user-obj.c b/hw/remote/vfio-user-obj.c
index 216b4876e245f88eac243fc02b2d7065f3527640..13cda2f4813845b6c00ccd7e976cc3acf662b5f9 100644 (file)
--- a/hw/remote/vfio-user-obj.c
+++ b/hw/remote/vfio-user-obj.c
@@ -44,7 +44,7 @@
 #include "qemu/error-report.h"
 #include "trace.h"
 #include "system/runstate.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/remote/machine.h"
 #include "qapi/error.h"
 #include "qapi/qapi-visit-sockets.h"

diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c
index 75f34287ff1b61d729a678481d95a99089d269f5..4f207dee287ee740d02f17a14198a775f4cde22c 100644 (file)
--- a/hw/riscv/boot.c
+++ b/hw/riscv/boot.c
@@ -22,7 +22,7 @@
 #include "qemu/units.h"
 #include "qemu/error-report.h"
 #include "exec/cpu-defs.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "hw/riscv/boot.h"
 #include "hw/riscv/boot_opensbi.h"

diff --git a/hw/riscv/microblaze-v-generic.c b/hw/riscv/microblaze-v-generic.c
index e863c50cbc9b1fb929a08b2be9b1d7a03ab3f1fd..8a461a0dd566914e2d5f78904313fe0d70308ef4 100644 (file)
--- a/hw/riscv/microblaze-v-generic.c
+++ b/hw/riscv/microblaze-v-generic.c
@@ -20,7 +20,7 @@
 #include "hw/sysbus.h"
 #include "system/system.h"
 #include "net/net.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/char/serial-mm.h"
 #include "system/address-spaces.h"
 #include "hw/char/xilinx_uartlite.h"

diff --git a/hw/riscv/microchip_pfsoc.c b/hw/riscv/microchip_pfsoc.c
index a17f62cd082ddeb9a20d1b20aca282d76f1eb248..4398f7b18259e7616a39d66670f268b7bf3c37ec 100644 (file)
--- a/hw/riscv/microchip_pfsoc.c
+++ b/hw/riscv/microchip_pfsoc.c
@@ -40,7 +40,7 @@
 #include "qemu/cutils.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "hw/sysbus.h"
 #include "chardev/char.h"

diff --git a/hw/riscv/numa.c b/hw/riscv/numa.c
index 7a7b0120077e0d321e97d94588582c88f3bd9977..726df2daf1f0345fa06a05ef1b5d48fde640bfd1 100644 (file)
--- a/hw/riscv/numa.c
+++ b/hw/riscv/numa.c
@@ -20,7 +20,7 @@
 #include "qemu/units.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "hw/riscv/numa.h"
 #include "system/device_tree.h"

diff --git a/hw/riscv/opentitan.c b/hw/riscv/opentitan.c
index d369a8a7dcd187577d3d09b16aae3458cc749675..309125e854bc7dd098ee535b9e136f92e67c75fb 100644 (file)
--- a/hw/riscv/opentitan.c
+++ b/hw/riscv/opentitan.c
@@ -23,7 +23,7 @@
 #include "hw/riscv/opentitan.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/misc/unimp.h"
 #include "hw/riscv/boot.h"
 #include "qemu/units.h"

diff --git a/hw/riscv/shakti_c.c b/hw/riscv/shakti_c.c
index 3e7f4411727d6189ff2686d4d5ca3c119a1fe6c6..d309ea2e39e4a3058134cebe3366c13d420434bb 100644 (file)
--- a/hw/riscv/shakti_c.c
+++ b/hw/riscv/shakti_c.c
@@ -17,7 +17,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/riscv/shakti_c.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"

diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c
index 7baed1958e05d947f2297fb7f9f1d53a7e6bd8b0..abe411e305e22575d587e4e59875ecfe8e3d3dff 100644 (file)
--- a/hw/riscv/sifive_e.c
+++ b/hw/riscv/sifive_e.c
@@ -32,7 +32,7 @@
 #include "qemu/cutils.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "hw/sysbus.h"
 #include "hw/misc/unimp.h"

diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c
index a7492aa27a46c5cdf890110bada8085dcfa16014..6839a2635e829270e1d9671ad60aba2e9aebfd2c 100644 (file)
--- a/hw/riscv/sifive_u.c
+++ b/hw/riscv/sifive_u.c
@@ -39,7 +39,7 @@
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/irq.h"
 #include "hw/loader.h"
 #include "hw/sysbus.h"

diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c
index b0bab3fe008197c14ce2699f84ffa6753511e53c..6aa688acf3029602623a9ed40343a166565b3f67 100644 (file)
--- a/hw/riscv/spike.c
+++ b/hw/riscv/spike.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "hw/sysbus.h"
 #include "target/riscv/cpu.h"

diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
index 17909206c7ef8379fb4c4c01b35e4795a052ef48..45a845318e79a5bb6bb96a24c0c34166844d7879 100644 (file)
--- a/hw/riscv/virt.c
+++ b/hw/riscv/virt.c
@@ -23,7 +23,7 @@
 #include "qemu/error-report.h"
 #include "qemu/guest-random.h"
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "hw/sysbus.h"
 #include "hw/qdev-properties.h"

diff --git a/hw/riscv/xiangshan_kmh.c b/hw/riscv/xiangshan_kmh.c
index a95fd6174fdc643421a6abb73a7b040c83fdf14c..e831954cb36f535b3de6fdb4d96e8435682e064c 100644 (file)
--- a/hw/riscv/xiangshan_kmh.c
+++ b/hw/riscv/xiangshan_kmh.c
@@ -32,7 +32,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "system/address-spaces.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/char/serial-mm.h"
 #include "hw/intc/riscv_aclint.h"
 #include "hw/intc/riscv_aplic.h"

diff --git a/hw/rx/rx-gdbsim.c b/hw/rx/rx-gdbsim.c
index ed91c631788ab1b8a73fe1f5a6efcdaced1e42f3..1a33082857c341bde92387ff0de906ec927f6732 100644 (file)
--- a/hw/rx/rx-gdbsim.c
+++ b/hw/rx/rx-gdbsim.c
@@ -27,7 +27,7 @@
 #include "system/qtest.h"
 #include "system/device_tree.h"
 #include "system/reset.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qom/object.h"
 
 /* Same address of GDB integrated simulator */

diff --git a/hw/s390x/cpu-topology.c b/hw/s390x/cpu-topology.c
index b513f8936e473135a25aca65a52e9568e085bf55..9182ddb628dbbdde91d309524233ba25180b3ff7 100644 (file)
--- a/hw/s390x/cpu-topology.c
+++ b/hw/s390x/cpu-topology.c
@@ -19,7 +19,7 @@
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "hw/qdev-properties.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "target/s390x/cpu.h"
 #include "hw/s390x/s390-virtio-ccw.h"
 #include "hw/s390x/cpu-topology.h"

diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
index 3843d2a8505b230ff06c2b7db0aa80aa97d16cae..f1c2af15f755ded7bda7eaf14e1e81055e5c5110 100644 (file)
--- a/hw/s390x/ipl.c
+++ b/hw/s390x/ipl.c
@@ -21,7 +21,7 @@
 #include "elf.h"
 #include "hw/loader.h"
 #include "hw/qdev-properties.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/s390x/virtio-ccw.h"
 #include "hw/s390x/vfio-ccw.h"
 #include "hw/s390x/css.h"

diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
index 52820894fa1680ff8ce1e2a93903366a25090f68..3eea2f0c9d9fc88bdc4b71590f79778c08f1a13a 100644 (file)
--- a/hw/s390x/s390-pci-bus.c
+++ b/hw/s390x/s390-pci-bus.c
@@ -20,7 +20,7 @@
 #include "hw/s390x/s390-pci-kvm.h"
 #include "hw/s390x/s390-pci-vfio.h"
 #include "hw/s390x/s390-virtio-ccw.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/pci/pci_bus.h"
 #include "hw/qdev-properties.h"
 #include "hw/pci/pci_bridge.h"

diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c
index 5841dfc4fec39e57459b1676268185a941649e50..6b67c3c109f6376a08d6b8a8d8aefe2dac38862a 100644 (file)
--- a/hw/s390x/s390-pci-inst.c
+++ b/hw/s390x/s390-pci-inst.c
@@ -18,7 +18,7 @@
 #include "qemu/error-report.h"
 #include "qemu/bswap.h"
 #include "system/hw_accel.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/pci/pci_device.h"
 #include "hw/s390x/s390-pci-inst.h"
 #include "hw/s390x/s390-pci-bus.h"

diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 64b81345f1e20bfe7b6df3dd4e0982c676a861ae..29d95be2c6491f0f0376e7b6f652eb2b08e2938e 100644 (file)
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -14,7 +14,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "system/confidential-guest-support.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/s390x/sclp.h"
 #include "hw/s390x/s390_flic.h"
 #include "virtio-ccw.h"

diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c
index c9a9c4bb375a7aa8d184164d47e56f91a57ae45b..b9c3983df195c4130ad91e06d05c43afc6f5d9d2 100644 (file)
--- a/hw/s390x/sclp.c
+++ b/hw/s390x/sclp.c
@@ -15,7 +15,7 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/memory.h"
 #include "hw/s390x/sclp.h"
 #include "hw/s390x/event-facility.h"

diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index c29ee690690e526c53282a73ed27777df6bf20f7..bccd40f5712de045b30494b1837b80a2797cde2a 100644 (file)
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -33,7 +33,7 @@
 #include "system/reset.h"
 #include "system/runstate.h"
 #include "system/system.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/pci/pci.h"
 #include "hw/qdev-properties.h"
 #include "net/net.h"

diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
index 7558b2ad839316596b6245c0819a88078b99ec1c..071c3b5e629aea9463be07383741c278703afdf9 100644 (file)
--- a/hw/smbios/smbios.c
+++ b/hw/smbios/smbios.c
@@ -26,7 +26,7 @@
 #include "qemu/uuid.h"
 #include "hw/firmware/smbios.h"
 #include "hw/loader.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/pci/pci_bus.h"
 #include "hw/pci/pci_device.h"
 #include "smbios_build.h"

diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
index 631c6113b5cc3accc92ab7276192a14567aba9aa..367beecf192c1f80a1cf3e6693668138d7ae8147 100644 (file)
--- a/hw/sparc/leon3.c
+++ b/hw/sparc/leon3.c
@@ -37,7 +37,7 @@
 #include "system/system.h"
 #include "system/qtest.h"
 #include "system/reset.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "elf.h"
 #include "trace.h"

diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index 53d7ae08ae91998ddd8083d62605c37527243e8d..b0d2d6f8bc8cf7c1932a8dba27c3c64b5def8f9e 100644 (file)
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -40,7 +40,7 @@
 #include "system/runstate.h"
 #include "system/system.h"
 #include "net/net.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/scsi/esp.h"
 #include "hw/nvram/sun_nvram.h"
 #include "hw/qdev-properties.h"

diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c
index 1ffe92060addfbed27fb44221e0c9539399c7ac3..334bec14ba3c82cfb692f8fa090a767a5327c3ec 100644 (file)
--- a/hw/sparc64/niagara.c
+++ b/hw/sparc64/niagara.c
@@ -26,7 +26,7 @@
 #include "block/block_int-common.h"
 #include "qemu/units.h"
 #include "cpu.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/char/serial-mm.h"
 #include "hw/misc/unimp.h"
 #include "hw/loader.h"

diff --git a/hw/sparc64/sparc64.c b/hw/sparc64/sparc64.c
index 9cffc92aa3b01310ea3f1c7c80e18787958d2d15..ce7eded143b7912d9d00d96958eb81def407907d 100644 (file)
--- a/hw/sparc64/sparc64.c
+++ b/hw/sparc64/sparc64.c
@@ -26,7 +26,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "cpu.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/sparc/sparc64.h"
 #include "qemu/timer.h"
 #include "system/reset.h"

diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index 82c3e7c855b52d9f593f6332d469edddd0c73fc6..961d599f48dd71eb81ea1458006215afc0a7701d 100644 (file)
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -46,7 +46,7 @@
 #include "qemu/timer.h"
 #include "system/runstate.h"
 #include "system/system.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/nvram/sun_nvram.h"
 #include "hw/nvram/chrp_nvram.h"
 #include "hw/sparc/sparc64.h"

diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.c
index 3facfdfd611aa3a2ce84b343b729c4ce39ac1827..21b119712c515cb2357395e8bf1d7026f23e012f 100644 (file)
--- a/hw/tricore/tricore_testboard.c
+++ b/hw/tricore/tricore_testboard.c
@@ -23,7 +23,7 @@
 #include "qapi/error.h"
 #include "cpu.h"
 #include "net/net.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "elf.h"
 #include "hw/tricore/tricore.h"

diff --git a/hw/uefi/ovmf-log.c b/hw/uefi/ovmf-log.c
index 850ef21f88599f0544f897e13ebc9d851e904ae8..3a24afd9417dff33593ab8efa8aca6a1abc72870 100644 (file)
--- a/hw/uefi/ovmf-log.c
+++ b/hw/uefi/ovmf-log.c
@@ -9,7 +9,7 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "qemu/target-info-qapi.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/i386/x86.h"
 #include "hw/arm/virt.h"
 #include "system/dma.h"

diff --git a/hw/vfio/igd.c b/hw/vfio/igd.c
index 4bfa2e0fcd22a811c9dcf2b1c2357ad34c9e4a68..cff413c16f546ac937d40612aa661def7cc10a85 100644 (file)
--- a/hw/vfio/igd.c
+++ b/hw/vfio/igd.c
@@ -15,7 +15,7 @@
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/hw.h"
 #include "hw/nvram/fw_cfg.h"
 #include "pci.h"

diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
index 02cdd807d77e2000bbfa39dfd05a8ba7c664da99..bcf6ab64432077096ce502d1b663ce04ebb160c4 100644 (file)
--- a/hw/virtio/virtio-balloon.c
+++ b/hw/virtio/virtio-balloon.c
@@ -21,7 +21,7 @@
 #include "hw/virtio/virtio.h"
 #include "hw/mem/pc-dimm.h"
 #include "hw/qdev-properties.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/balloon.h"
 #include "system/ramblock.h"
 #include "hw/virtio/virtio-balloon.h"

diff --git a/hw/virtio/virtio-iommu-pci.c b/hw/virtio/virtio-iommu-pci.c
index 8123c6f83a3a6738490123d21d78122031ca5349..dd4100033f1cf35475b3d65413c27763a55c1286 100644 (file)
--- a/hw/virtio/virtio-iommu-pci.c
+++ b/hw/virtio/virtio-iommu-pci.c
@@ -16,7 +16,7 @@
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/pci/pci_bus.h"
 #include "qom/object.h"
 

diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
index ae7c13e33cf3966b9e59b55b8554e440c839b95b..5d1d90edc52e89f9e30e172fce8df2b2212d9d7a 100644 (file)
--- a/hw/virtio/virtio-mem.c
+++ b/hw/virtio/virtio-mem.c
@@ -27,7 +27,7 @@
 #include "qapi/error.h"
 #include "qapi/visitor.h"
 #include "migration/misc.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "hw/acpi/acpi.h"
 #include "trace.h"

diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 99cb30fe595a7ec566341b5ce31e0d3f07d80713..263e112a5cbd371189d071f71919bcc38e7e325c 100644 (file)
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -20,7 +20,7 @@
 #include "exec/memop.h"
 #include "standard-headers/linux/virtio_pci.h"
 #include "standard-headers/linux/virtio_ids.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/virtio/virtio.h"
 #include "migration/qemu-file-types.h"
 #include "hw/pci/pci.h"

diff --git a/hw/vmapple/vmapple.c b/hw/vmapple/vmapple.c
index 62d33525babeaef939f0e37aeadcec3f9cf3a7ce..5da28cf72b28103bd0e41dc9f98d856f8c2119c3 100644 (file)
--- a/hw/vmapple/vmapple.c
+++ b/hw/vmapple/vmapple.c
@@ -25,7 +25,7 @@
 #include "qemu/option.h"
 #include "qemu/units.h"
 #include "monitor/qdev.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/irq.h"
 #include "hw/loader.h"
 #include "hw/qdev-properties.h"

diff --git a/hw/xen/xen-hvm-common.c b/hw/xen/xen-hvm-common.c
index b40ae0b3af027d1410e1c7d87738a9789d17547f..5d11b50db9c14a299fcc5eb8966ad2c062576c73 100644 (file)
--- a/hw/xen/xen-hvm-common.c
+++ b/hw/xen/xen-hvm-common.c
@@ -11,7 +11,7 @@
 #include "hw/pci/pci_host.h"
 #include "hw/xen/xen-hvm-common.h"
 #include "hw/xen/xen-bus.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/xen/arch_hvm.h"
 #include "system/memory.h"
 #include "system/runstate.h"

diff --git a/hw/xen/xen-legacy-backend.c b/hw/xen/xen-legacy-backend.c
index 5ed53f8943e5d3af05bdcdb3094f1fdb44a69b0b..da9a8e5213a045b0ad11a5a588852479fcebfa08 100644 (file)
--- a/hw/xen/xen-legacy-backend.c
+++ b/hw/xen/xen-legacy-backend.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 
 #include "hw/sysbus.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "qemu/main-loop.h"
 #include "qapi/error.h"

diff --git a/hw/xen/xen-pvh-common.c b/hw/xen/xen-pvh-common.c
index b93ff80c8594452c721dea2237c80e31447a2c78..c3fc501fe6e3b82257b50406aabe6d700e010dbb 100644 (file)
--- a/hw/xen/xen-pvh-common.c
+++ b/hw/xen/xen-pvh-common.c
@@ -10,7 +10,7 @@
 #include "qemu/error-report.h"
 #include "qemu/units.h"
 #include "qapi/visitor.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/irq.h"
 #include "system/tpm.h"
 #include "system/tpm_backend.h"

diff --git a/hw/xenpv/xen_machine_pv.c b/hw/xenpv/xen_machine_pv.c
index 99c02492ef910c3abeeacb1567b2c1e55082fd6a..c406821c34ca984848600cf5cca4e6b2631ccc77 100644 (file)
--- a/hw/xenpv/xen_machine_pv.c
+++ b/hw/xenpv/xen_machine_pv.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/xen/xen-legacy-backend.h"
 #include "hw/xen/xen-bus.h"
 #include "system/block-backend.h"

diff --git a/hw/xtensa/sim.c b/hw/xtensa/sim.c
index 49d17e7bb29c2fa3046513c439aec30f2a32c31e..37acc562d21a9d07896e57d651f96496dd62ebfe 100644 (file)
--- a/hw/xtensa/sim.c
+++ b/hw/xtensa/sim.c
@@ -29,7 +29,7 @@
 #include "qapi/error.h"
 #include "system/reset.h"
 #include "system/system.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "elf.h"
 #include "system/memory.h"

diff --git a/hw/xtensa/virt.c b/hw/xtensa/virt.c
index b10866ccd85afbcea5dc9d99f7f13b9baf4779ea..b9e324c2850a03f9335bec4f24f4e2ce331686c6 100644 (file)
--- a/hw/xtensa/virt.c
+++ b/hw/xtensa/virt.c
@@ -28,7 +28,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "system/reset.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "hw/pci-host/gpex.h"
 #include "net/net.h"

diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c
index db3b015549573d6d6ec1389daa6eff7bd67d656a..694456aa0a17642ec4393f9210e716b15cb33f43 100644 (file)
--- a/hw/xtensa/xtfpga.c
+++ b/hw/xtensa/xtfpga.c
@@ -30,7 +30,7 @@
 #include "qapi/error.h"
 #include "cpu.h"
 #include "system/system.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/loader.h"
 #include "hw/qdev-properties.h"
 #include "elf.h"

diff --git a/include/hw/acpi/cpu.h b/include/hw/acpi/cpu.h
index 32654dc274fd93c0dee5f9fe3e733c1ee53e4312..95dc58b5adb53ea098049715f46819e174947dc4 100644 (file)
--- a/include/hw/acpi/cpu.h
+++ b/include/hw/acpi/cpu.h
@@ -16,7 +16,7 @@
 #include "hw/qdev-core.h"
 #include "hw/acpi/acpi.h"
 #include "hw/acpi/aml-build.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/hotplug.h"
 
 #define ACPI_CPU_HOTPLUG_REG_LEN 12

diff --git a/include/hw/arm/aspeed.h b/include/hw/arm/aspeed.h
index 714bbd326c487596f4f764db5062d32d3ad9a8df..a00238ed74aa39fb98b2877f30be9fda71722021 100644 (file)
--- a/include/hw/arm/aspeed.h
+++ b/include/hw/arm/aspeed.h
@@ -9,7 +9,7 @@
 #ifndef ARM_ASPEED_H
 #define ARM_ASPEED_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qom/object.h"
 #include "hw/arm/aspeed_soc.h"
 

diff --git a/include/hw/arm/machines-qom.h b/include/hw/arm/machines-qom.h
index 3f64d5eb0246d614d679f0aec14b7858d916ba75..3ed39384e5974cb342927f7555eecb6ce09eff57 100644 (file)
--- a/include/hw/arm/machines-qom.h
+++ b/include/hw/arm/machines-qom.h
@@ -9,7 +9,7 @@
 #ifndef HW_ARM_MACHINES_QOM_H
 #define HW_ARM_MACHINES_QOM_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 
 #define TYPE_TARGET_ARM_MACHINE \
         "target-info-arm-machine"

diff --git a/include/hw/arm/npcm7xx.h b/include/hw/arm/npcm7xx.h
index 56536565b748c5fb2f415d85df36bc01cb64dc54..eef7cc5332b73bf8ab0b12f5818a507f52dff310 100644 (file)
--- a/include/hw/arm/npcm7xx.h
+++ b/include/hw/arm/npcm7xx.h
@@ -16,7 +16,7 @@
 #ifndef NPCM7XX_H
 #define NPCM7XX_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/adc/npcm7xx_adc.h"
 #include "hw/core/split-irq.h"
 #include "hw/cpu/a9mpcore.h"

diff --git a/include/hw/arm/raspi_platform.h b/include/hw/arm/raspi_platform.h
index 7bc4807fa513123712c74cb92b1b633e7e9c2acb..c52b9e298d53ac805189453be4088ed5a27f8b85 100644 (file)
--- a/include/hw/arm/raspi_platform.h
+++ b/include/hw/arm/raspi_platform.h
@@ -28,7 +28,7 @@
 #ifndef HW_ARM_RASPI_PLATFORM_H
 #define HW_ARM_RASPI_PLATFORM_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/arm/boot.h"
 
 /* Registered machine type (matches RPi Foundation bootloader and U-Boot) */

diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
index c77a33f6df238f8db6b38e9c0098da94f5f7d31a..8694aaa4e2a6da306fbc7894dafef8bcaf121b84 100644 (file)
--- a/include/hw/arm/virt.h
+++ b/include/hw/arm/virt.h
@@ -32,7 +32,7 @@
 
 #include "exec/hwaddr.h"
 #include "qemu/notify.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/acpi/ghes.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/bsa.h"

diff --git a/include/hw/boards.h b/include/hw/core/boards.h
similarity index 100%
rename from include/hw/boards.h
rename to include/hw/core/boards.h

diff --git a/include/hw/cxl/cxl_host.h b/include/hw/cxl/cxl_host.h
index cd3c368c86a838847b240dc64755dc093636a285..21619bb748ab10f1bdf1ac23b0acfc59746a66bb 100644 (file)
--- a/include/hw/cxl/cxl_host.h
+++ b/include/hw/cxl/cxl_host.h
@@ -8,7 +8,7 @@
  */
 
 #include "hw/cxl/cxl.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 
 #ifndef CXL_HOST_H
 #define CXL_HOST_H

diff --git a/include/hw/i386/microvm.h b/include/hw/i386/microvm.h
index e73d1e65de8ce03133c2796aac72a254e74d9d2c..6b9a506527273d848e0065c790dc993ac5f7d4cb 100644 (file)
--- a/include/hw/i386/microvm.h
+++ b/include/hw/i386/microvm.h
@@ -21,7 +21,7 @@
 #include "exec/hwaddr.h"
 #include "qemu/notify.h"
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/i386/x86.h"
 #include "hw/acpi/acpi_dev_interface.h"
 #include "hw/pci-host/gpex.h"

diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index e83157ab358f09bc26f14dce152f76cceed65903..ade2da92bad21e7a9c9c3db3ab998bd4398b96c9 100644 (file)
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -4,7 +4,7 @@
 #include "qemu/notify.h"
 #include "qapi/qapi-types-common.h"
 #include "qemu/uuid.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/block/fdc.h"
 #include "hw/block/flash.h"
 #include "hw/i386/x86.h"

diff --git a/include/hw/i386/x86.h b/include/hw/i386/x86.h
index 8755cad50a366073c41b485d03d8cd6c6f2d6ae5..0dffba95f9a4e344ee6dae517716dda723070cba 100644 (file)
--- a/include/hw/i386/x86.h
+++ b/include/hw/i386/x86.h
@@ -20,7 +20,7 @@
 #include "exec/hwaddr.h"
 #include "system/memory.h"
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/i386/topology.h"
 #include "hw/intc/ioapic.h"
 #include "hw/isa/isa.h"

diff --git a/include/hw/loongarch/virt.h b/include/hw/loongarch/virt.h
index 27b1755802092a994170d6b20b5590f60356892a..8a04dd83146ad78e48782534158ef470141647df 100644 (file)
--- a/include/hw/loongarch/virt.h
+++ b/include/hw/loongarch/virt.h
@@ -8,7 +8,7 @@
 #ifndef HW_LOONGARCH_H
 #define HW_LOONGARCH_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qemu/queue.h"
 #include "hw/block/flash.h"
 #include "hw/loongarch/boot.h"

diff --git a/include/hw/m68k/q800.h b/include/hw/m68k/q800.h
index 9caaed9692b57283709072cb745ccaf194b902d7..c92da2e2ac74f935520915a502a82c9f35615054 100644 (file)
--- a/include/hw/m68k/q800.h
+++ b/include/hw/m68k/q800.h
@@ -23,7 +23,7 @@
 #ifndef HW_Q800_H
 #define HW_Q800_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qom/object.h"
 #include "target/m68k/cpu-qom.h"
 #include "system/memory.h"

diff --git a/include/hw/misc/lasi.h b/include/hw/misc/lasi.h
index 0e95be1c32a41f6311d92dfbf8dd0d0ba216804c..5e40c6aebdf4d0fe5b821f49eca8cf1816ee4628 100644 (file)
--- a/include/hw/misc/lasi.h
+++ b/include/hw/misc/lasi.h
@@ -13,7 +13,7 @@
 #define LASI_H
 
 #include "system/address-spaces.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/sysbus.h"
 
 #define TYPE_LASI_CHIP "lasi-chip"

diff --git a/include/hw/openrisc/boot.h b/include/hw/openrisc/boot.h
index 9b4d88072c411661892b17346c125fa1bb7d29f4..3c481bdea68ab3a53446a885f6f49e0e124eff66 100644 (file)
--- a/include/hw/openrisc/boot.h
+++ b/include/hw/openrisc/boot.h
@@ -20,7 +20,7 @@
 #define OPENRISC_BOOT_H
 
 #include "exec/cpu-defs.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 
 hwaddr openrisc_load_kernel(ram_addr_t ram_size,
                             const char *kernel_filename,

diff --git a/include/hw/ppc/pnv.h b/include/hw/ppc/pnv.h
index cbdddfc73cd429431e0c04d63835f34af5bc8d96..a8c1968f2818d00f4370fe00b4655f83f97ca632 100644 (file)
--- a/include/hw/ppc/pnv.h
+++ b/include/hw/ppc/pnv.h
@@ -21,7 +21,7 @@
 #define PPC_PNV_H
 
 #include "cpu.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/sysbus.h"
 #include "hw/ipmi/ipmi.h"
 #include "hw/ppc/pnv_pnor.h"

diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
index 28cf2723d847a10d0dd0865c3d104a6d34db35cf..5476ac7ce7bff65ac9b496a9b90498bf8440d686 100644 (file)
--- a/include/hw/ppc/spapr.h
+++ b/include/hw/ppc/spapr.h
@@ -3,7 +3,7 @@
 
 #include "qemu/units.h"
 #include "system/dma.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/ppc/spapr_drc.h"
 #include "hw/mem/pc-dimm.h"
 #include "hw/ppc/spapr_ovec.h"

diff --git a/include/hw/ppc/spapr_numa.h b/include/hw/ppc/spapr_numa.h
index 7cb336740063deaf48049fa4ea240667f5428c14..e07edf2ee670c0ca1ddc14ba64c72d241d605d2e 100644 (file)
--- a/include/hw/ppc/spapr_numa.h
+++ b/include/hw/ppc/spapr_numa.h
@@ -13,7 +13,7 @@
 #ifndef HW_SPAPR_NUMA_H
 #define HW_SPAPR_NUMA_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/ppc/spapr.h"
 
 /*

diff --git a/include/hw/remote/machine.h b/include/hw/remote/machine.h
index ac32fda3875e58258de66d890a2fab59d4eea416..748b69c6fc72a8312f8507a8dc89e492c25a14c4 100644 (file)
--- a/include/hw/remote/machine.h
+++ b/include/hw/remote/machine.h
@@ -12,7 +12,7 @@
 #define REMOTE_MACHINE_H
 
 #include "qom/object.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/pci-host/remote.h"
 #include "io/channel.h"
 #include "hw/remote/iohub.h"

diff --git a/include/hw/riscv/microchip_pfsoc.h b/include/hw/riscv/microchip_pfsoc.h
index 7ca9b976c10e2e20edb31838b0a0b80edac4835a..a30b944afa9ce45d15812023a76478adbc0dd355 100644 (file)
--- a/include/hw/riscv/microchip_pfsoc.h
+++ b/include/hw/riscv/microchip_pfsoc.h
@@ -22,7 +22,7 @@
 #ifndef HW_MICROCHIP_PFSOC_H
 #define HW_MICROCHIP_PFSOC_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/char/mchp_pfsoc_mmuart.h"
 #include "hw/cpu/cluster.h"
 #include "hw/dma/sifive_pdma.h"

diff --git a/include/hw/riscv/numa.h b/include/hw/riscv/numa.h
index 147f01619b9b715448b7e67693562c276269e1d0..2d9c41ba818f5933ff680fc1c6d4ec77bdd67589 100644 (file)
--- a/include/hw/riscv/numa.h
+++ b/include/hw/riscv/numa.h
@@ -19,7 +19,7 @@
 #ifndef RISCV_NUMA_H
 #define RISCV_NUMA_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/sysbus.h"
 #include "system/numa.h"
 

diff --git a/include/hw/riscv/opentitan.h b/include/hw/riscv/opentitan.h
index 609473d07b400233b8eff84ef98b363734fad3ea..5b9016e1d897fe034a50a3ff993f27e2ca182df3 100644 (file)
--- a/include/hw/riscv/opentitan.h
+++ b/include/hw/riscv/opentitan.h
@@ -24,7 +24,7 @@
 #include "hw/char/ibex_uart.h"
 #include "hw/timer/ibex_timer.h"
 #include "hw/ssi/ibex_spi_host.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qom/object.h"
 
 #define TYPE_RISCV_IBEX_SOC "riscv.lowrisc.ibex.soc"

diff --git a/include/hw/riscv/shakti_c.h b/include/hw/riscv/shakti_c.h
index 539fe1156de170b5a249b10f7f50a68c62e0e05c..f90a3bca8df068ef12c52e150c484ade8c0490e0 100644 (file)
--- a/include/hw/riscv/shakti_c.h
+++ b/include/hw/riscv/shakti_c.h
@@ -20,7 +20,7 @@
 #define HW_SHAKTI_C_H
 
 #include "hw/riscv/riscv_hart.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/char/shakti_uart.h"
 
 #define TYPE_RISCV_SHAKTI_SOC "riscv.shakti.cclass.soc"

diff --git a/include/hw/riscv/sifive_e.h b/include/hw/riscv/sifive_e.h
index 31180a680e6167d12134d74c4e16b2e5a7482986..4cf902ebc0dc28bca7e46ff669df708d10ce043c 100644 (file)
--- a/include/hw/riscv/sifive_e.h
+++ b/include/hw/riscv/sifive_e.h
@@ -23,7 +23,7 @@
 #include "hw/riscv/sifive_cpu.h"
 #include "hw/gpio/sifive_gpio.h"
 #include "hw/misc/sifive_e_aon.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 
 #define TYPE_RISCV_E_SOC "riscv.sifive.e.soc"
 #define RISCV_E_SOC(obj) \

diff --git a/include/hw/riscv/sifive_u.h b/include/hw/riscv/sifive_u.h
index 0696f8594277e1912d7e1eb7e6d225727c210f0d..e4c9860d501772ad73e5ab9e9049e650789d15f1 100644 (file)
--- a/include/hw/riscv/sifive_u.h
+++ b/include/hw/riscv/sifive_u.h
@@ -19,7 +19,7 @@
 #ifndef HW_SIFIVE_U_H
 #define HW_SIFIVE_U_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/cpu/cluster.h"
 #include "hw/dma/sifive_pdma.h"
 #include "hw/net/cadence_gem.h"

diff --git a/include/hw/riscv/spike.h b/include/hw/riscv/spike.h
index 0c2a223763053b96928592d20e875f31b7bdb911..acd41e90583ed197f68bdc9bc5c0c4eea607879d 100644 (file)
--- a/include/hw/riscv/spike.h
+++ b/include/hw/riscv/spike.h
@@ -19,7 +19,7 @@
 #ifndef HW_RISCV_SPIKE_H
 #define HW_RISCV_SPIKE_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/riscv/riscv_hart.h"
 #include "hw/sysbus.h"
 

diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h
index 7b4c2c8b7de34461709ae5e48e249e1a46cdd781..806b78cc639207ed37bd39f6e553b6fe5d412159 100644 (file)
--- a/include/hw/riscv/virt.h
+++ b/include/hw/riscv/virt.h
@@ -19,7 +19,7 @@
 #ifndef HW_RISCV_VIRT_H
 #define HW_RISCV_VIRT_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/riscv/riscv_hart.h"
 #include "hw/sysbus.h"
 #include "hw/block/flash.h"

diff --git a/include/hw/riscv/xiangshan_kmh.h b/include/hw/riscv/xiangshan_kmh.h
index c5dc6b1a9a7cf9402155eaaf9fc290489d1aa0b5..5a5af93dffdf3dd77e3a7846f976d61e6524ff6a 100644 (file)
--- a/include/hw/riscv/xiangshan_kmh.h
+++ b/include/hw/riscv/xiangshan_kmh.h
@@ -10,7 +10,7 @@
 #ifndef HW_XIANGSHAN_KMH_H
 #define HW_XIANGSHAN_KMH_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/riscv/riscv_hart.h"
 
 #define XIANGSHAN_KMH_MAX_CPUS 16

diff --git a/include/hw/s390x/cpu-topology.h b/include/hw/s390x/cpu-topology.h
index d5e9aa43f8fe4c1d43f80eff0c0590019c318766..2d5a5fa3646e12cbb29d3395f68c6c33fd1e93c8 100644 (file)
--- a/include/hw/s390x/cpu-topology.h
+++ b/include/hw/s390x/cpu-topology.h
@@ -12,7 +12,7 @@
 #ifndef CONFIG_USER_ONLY
 
 #include "qemu/queue.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qapi/qapi-types-machine-s390x.h"
 
 #define S390_TOPOLOGY_CPU_IFL   0x03

diff --git a/include/hw/s390x/s390-virtio-ccw.h b/include/hw/s390x/s390-virtio-ccw.h
index 526078a4e2b16cb5ab3788c776c3727c4e33d897..f1f06119d6dfa5ca0c35b641c2fa175b57c4b00c 100644 (file)
--- a/include/hw/s390x/s390-virtio-ccw.h
+++ b/include/hw/s390x/s390-virtio-ccw.h
@@ -11,7 +11,7 @@
 #ifndef HW_S390X_S390_VIRTIO_CCW_H
 #define HW_S390X_S390_VIRTIO_CCW_H
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qom/object.h"
 #include "hw/s390x/sclp.h"
 

diff --git a/include/hw/tricore/triboard.h b/include/hw/tricore/triboard.h
index ca49a0c75200f544798e40544967c07107699f87..c6be4dc3f349401678cca1d9c317732ab0802f04 100644 (file)
--- a/include/hw/tricore/triboard.h
+++ b/include/hw/tricore/triboard.h
@@ -19,7 +19,7 @@
  */
 
 #include "qapi/error.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/system.h"
 #include "system/address-spaces.h"
 #include "qom/object.h"

diff --git a/include/hw/xen/xen-pvh-common.h b/include/hw/xen/xen-pvh-common.h
index 5db83d88ecc78b8c3ed700b8801587e8d29d4ded..0ed07c56947002daea946329c323d3163550da34 100644 (file)
--- a/include/hw/xen/xen-pvh-common.h
+++ b/include/hw/xen/xen-pvh-common.h
@@ -11,7 +11,7 @@
 
 #include "system/memory.h"
 #include "qom/object.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/pci-host/gpex.h"
 #include "hw/xen/xen-hvm-common.h"
 

diff --git a/include/system/kvm_int.h b/include/system/kvm_int.h
index 9247493b029912547e284c5177fe9b6ee10e6b04..baeb166d393e7ec0cedb61a9b45e04f1b355cfff 100644 (file)
--- a/include/system/kvm_int.h
+++ b/include/system/kvm_int.h
@@ -15,7 +15,7 @@
 #include "qemu/queue.h"
 #include "system/kvm.h"
 #include "accel/accel-ops.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/i386/topology.h"
 #include "io/channel-socket.h"
 

diff --git a/migration/migration.c b/migration/migration.c
index b316ee01ab253d03605b40479c7113be12b4668c..697f460c4aa53dbce75cc06af1f3793a56d1c607 100644 (file)
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -54,7 +54,7 @@
 #include "io/channel-buffer.h"
 #include "io/channel-tls.h"
 #include "migration/colo.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "monitor/monitor.h"
 #include "net/announce.h"
 #include "qemu/queue.h"

diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
index 715ef021a918c2e23ad5dd851fbb3f67f86516f9..15997f715191a02d21cbec87c01cfc0107a0c2a2 100644 (file)
--- a/migration/postcopy-ram.c
+++ b/migration/postcopy-ram.c
@@ -30,7 +30,7 @@
 #include "system/system.h"
 #include "qemu/error-report.h"
 #include "trace.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/ramblock.h"
 #include "socket.h"
 #include "yank_functions.h"

diff --git a/migration/ram.c b/migration/ram.c
index 29f016cb25848acb5aa947e8913673869cb40769..6b469238ad2a40369cd47bb852e3dea39310b817 100644 (file)
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -64,7 +64,7 @@
 #include "system/dirtylimit.h"
 #include "system/kvm.h"
 
-#include "hw/boards.h" /* for machine_dump_guest_core() */
+#include "hw/core/boards.h" /* for machine_dump_guest_core() */
 
 #if defined(__linux__)
 #include "qemu/userfaultfd.h"

diff --git a/migration/savevm.c b/migration/savevm.c
index 62cc2ce25cbf793aa37b5f3c9bc48c48a95e509e..73e185caf59e0f1b0a5a5b289eba880f996eff48 100644 (file)
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -27,7 +27,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "net/net.h"
 #include "migration.h"
 #include "migration/snapshot.h"

diff --git a/monitor/qemu-config-qmp.c b/monitor/qemu-config-qmp.c
index 8bd28fc2328801391444f9f105a3019ec23b032b..298010235645615f5209a29aa6aef4fc0f9bb319 100644 (file)
--- a/monitor/qemu-config-qmp.c
+++ b/monitor/qemu-config-qmp.c
@@ -6,7 +6,7 @@
 #include "qobject/qlist.h"
 #include "qemu/option.h"
 #include "qemu/config-file.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 
 static CommandLineParameterInfoList *query_option_descs(const QemuOptDesc *desc)
 {

diff --git a/plugins/api-system.c b/plugins/api-system.c
index cc190b167eacc3d3e820510be40dbaab9f412458..9a70b9caa6c2197e3f1a4a554b5718884cc9251c 100644 (file)
--- a/plugins/api-system.c
+++ b/plugins/api-system.c
@@ -14,7 +14,7 @@
 #include "qemu/main-loop.h"
 #include "qapi/error.h"
 #include "migration/blocker.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qemu/plugin-memory.h"
 #include "qemu/plugin.h"
 

diff --git a/plugins/system.c b/plugins/system.c
index b3ecc33ba520ec84be94a8bd86f99377ca0ddb5b..88ff60ee2b3bd5813e077359def9c30ea9d724cf 100644 (file)
--- a/plugins/system.c
+++ b/plugins/system.c
@@ -11,7 +11,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/plugin.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 
 #include "plugin.h"
 

diff --git a/scripts/compare-machine-types.py b/scripts/compare-machine-types.py
index 2af3995eb82c63e226fc6b02ea915a740c5388c2..b4f899082a7015a41ac4d2c8778671f8d2048829 100755 (executable)
--- a/scripts/compare-machine-types.py
+++ b/scripts/compare-machine-types.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Script to compare machine type compatible properties (include/hw/boards.h).
+# Script to compare machine type compatible properties (include/hw/core/boards.h).
 # compat_props are applied to the driver during initialization to change
 # default values, for instance, to maintain compatibility.
 # This script constructs table with machines and values of their compat_props

diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index c5a07cb947be4f1ad22788bc13e9819cf699672d..2e9fa5842f620eef797dec276b8658b6ca9961e6 100644 (file)
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -48,7 +48,7 @@
 #else
 #include "qemu/cutils.h"
 #include "hw/loader.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #endif
 
 #define TARGET_SYS_OPEN        0x01

diff --git a/system/bootdevice.c b/system/bootdevice.c
index 1845be4507e4902ca18afa5f3d15af30393fbf2a..8acdbfb0a574835457169e4bf58934c41752bd00 100644 (file)
--- a/system/bootdevice.c
+++ b/system/bootdevice.c
@@ -29,7 +29,7 @@
 #include "qemu/error-report.h"
 #include "system/reset.h"
 #include "hw/qdev-core.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 
 typedef struct FWBootEntry FWBootEntry;
 

diff --git a/system/cpus.c b/system/cpus.c
index ef2d2f241faaa5d9da7b61caf04b5b0669e13bf3..0b1eabd3c4bd325f4f3fc35d097ec7832ec4808c 100644 (file)
--- a/system/cpus.c
+++ b/system/cpus.c
@@ -44,7 +44,7 @@
 #include "system/runstate.h"
 #include "system/cpu-timers.h"
 #include "system/whpx.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/hw.h"
 #include "trace.h"
 

diff --git a/system/device_tree.c b/system/device_tree.c
index 7850b90fa7285ac431e2b2ffbae5fce7fa5db65a..3ccdf33374cc9f89b016de39476cec58a20218ca 100644 (file)
--- a/system/device_tree.c
+++ b/system/device_tree.c
@@ -25,7 +25,7 @@
 #include "qemu/guest-random.h"
 #include "system/device_tree.h"
 #include "hw/loader.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qemu/config-file.h"
 #include "qapi/qapi-commands-machine.h"
 #include "qobject/qdict.h"

diff --git a/system/dirtylimit.c b/system/dirtylimit.c
index b48c0d4b3dab6fd248e0a7ef2aa1fd6174a7ffa5..a0c327533c30b35e424f25a14ba91684dd5c56f1 100644 (file)
--- a/system/dirtylimit.c
+++ b/system/dirtylimit.c
@@ -21,7 +21,7 @@
 #include "monitor/monitor.h"
 #include "system/memory.h"
 #include "exec/target_page.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/kvm.h"
 #include "trace.h"
 #include "migration/misc.h"

diff --git a/system/memory.c b/system/memory.c
index 8b84661ae36c5c60a9129470530930a26e35162f..b65219c2e4922fbc9895db51bc5008a9d7f57bf0 100644 (file)
--- a/system/memory.c
+++ b/system/memory.c
@@ -32,7 +32,7 @@
 #include "system/tcg.h"
 #include "qemu/accel.h"
 #include "accel/accel-ops.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "migration/vmstate.h"
 #include "system/address-spaces.h"
 

diff --git a/system/physmem.c b/system/physmem.c
index c9869e4049f852c46cd9df92a27b24b03a4e9f76..edc384f4fa115f47e7773c0a77a1946b08fd325a 100644 (file)
--- a/system/physmem.c
+++ b/system/physmem.c
@@ -38,7 +38,7 @@
 #include "exec/translation-block.h"
 #include "hw/qdev-core.h"
 #include "hw/qdev-properties.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/xen.h"
 #include "system/kvm.h"
 #include "system/tcg.h"

diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c
index f2aa400a7755900e4cae14907c9ac4ed230f468e..3babf81e3306024bab223513b4562cfe110e46cb 100644 (file)
--- a/system/qdev-monitor.c
+++ b/system/qdev-monitor.c
@@ -42,7 +42,7 @@
 #include "qemu/cutils.h"
 #include "hw/qdev-properties.h"
 #include "hw/clock.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 
 /*
  * Aliases were a bad idea from the start.  Let's keep them

diff --git a/system/runstate.c b/system/runstate.c
index e3ec16ab74d3dc022161339956faae9fc47c41a0..89bbfe7fbf93c413327d15b3db5de6f83676513a 100644 (file)
--- a/system/runstate.c
+++ b/system/runstate.c
@@ -31,7 +31,7 @@
 #include "crypto/init.h"
 #include "exec/cpu-common.h"
 #include "gdbstub/syscalls.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/resettable.h"
 #include "migration/misc.h"
 #include "migration/postcopy-ram.h"

diff --git a/target-info-stub.c b/target-info-stub.c
index d96d8249c1dd8b542c673b7b05fe4c2f16ea95a7..8392d81e8f80c43a91cba154a1b258000f052cd8 100644 (file)
--- a/target-info-stub.c
+++ b/target-info-stub.c
@@ -9,7 +9,7 @@
 #include "qemu/osdep.h"
 #include "qemu/target-info.h"
 #include "qemu/target-info-impl.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "cpu.h"
 
 /* Validate correct placement of CPUArchState. */

diff --git a/target/arm/arm-qmp-cmds.c b/target/arm/arm-qmp-cmds.c
index d292c974c44aabfe7d31c4b2f91a9c9b828d29d2..45df15de78288f073ba08ca5c2d95e3b9802e3d9 100644 (file)
--- a/target/arm/arm-qmp-cmds.c
+++ b/target/arm/arm-qmp-cmds.c
@@ -22,7 +22,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/target-info.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "kvm_arm.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"

diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index 39292fb9bc1f07a142e1a3710e27c7d3d3a45825..7720d27a3c05bc0425d02e64915f73f94d0ba572 100644 (file)
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -37,7 +37,7 @@
 #include "hw/qdev-properties.h"
 #if !defined(CONFIG_USER_ONLY)
 #include "hw/loader.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #ifdef CONFIG_TCG
 #include "hw/intc/armv7m_nvic.h"
 #endif /* CONFIG_TCG */

diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c
index 8288b605299c6974fa91522f3f59ecdd188553a7..7c48f21543fe00443966ecafcb55d92ffbb8aed6 100644 (file)
--- a/target/arm/hvf/hvf.c
+++ b/target/arm/hvf/hvf.c
@@ -25,7 +25,7 @@
 
 #include "system/address-spaces.h"
 #include "system/memory.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/irq.h"
 #include "qemu/main-loop.h"
 #include "system/cpus.h"

diff --git a/target/arm/kvm.c b/target/arm/kvm.c
index 0d57081e69fbb6628582ff79ce12e187960bcd02..c7ea6fc2f6265bf2052e50c562f8feff315b82c7 100644 (file)
--- a/target/arm/kvm.c
+++ b/target/arm/kvm.c
@@ -33,7 +33,7 @@
 #include "exec/memattrs.h"
 #include "system/address-spaces.h"
 #include "gdbstub/enums.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/irq.h"
 #include "qapi/visitor.h"
 #include "qemu/log.h"

diff --git a/target/arm/tcg/cpu32.c b/target/arm/tcg/cpu32.c
index f0761410ad0db7757357e08c5ed5174f5020e6ca..0b0bc96bac224e2f089525f12510a85e7dd8c65b 100644 (file)
--- a/target/arm/tcg/cpu32.c
+++ b/target/arm/tcg/cpu32.c
@@ -14,7 +14,7 @@
 #include "internals.h"
 #include "target/arm/idau.h"
 #if !defined(CONFIG_USER_ONLY)
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #endif
 #include "cpregs.h"
 

diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 641777578637fc3b8120e0c2e7144ba1ab83d160..4216ca9ec1d9473e1a8c8e12d4f662c1f72d811d 100644 (file)
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -42,7 +42,7 @@
 #include "system/reset.h"
 #include "qapi/qapi-commands-machine.h"
 #include "system/address-spaces.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/i386/sgx-epc.h"
 #endif
 #include "system/qtest.h"

diff --git a/target/i386/hvf/hvf-cpu.c b/target/i386/hvf/hvf-cpu.c
index 94ee096ecf7293ae9252b572bc22bfd266c20d1a..316c1b0ba07060bee90c61312e3f81489e5f5be7 100644 (file)
--- a/target/i386/hvf/hvf-cpu.c
+++ b/target/i386/hvf/hvf-cpu.c
@@ -12,7 +12,7 @@
 #include "host-cpu.h"
 #include "qapi/error.h"
 #include "system/system.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/hvf.h"
 #include "accel/accel-cpu-target.h"
 #include "hvf-i386.h"

diff --git a/target/i386/kvm/kvm-cpu.c b/target/i386/kvm/kvm-cpu.c
index 9c25b5583955716cb60b17c91e835dfbd4bdd81a..33a8c26bc27c69d88dbf48d3f3f213a895abbe80 100644 (file)
--- a/target/i386/kvm/kvm-cpu.c
+++ b/target/i386/kvm/kvm-cpu.c
@@ -12,7 +12,7 @@
 #include "host-cpu.h"
 #include "qapi/error.h"
 #include "system/system.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/i386/x86.h"
 
 #include "kvm_i386.h"

diff --git a/target/i386/kvm/vmsr_energy.c b/target/i386/kvm/vmsr_energy.c
index 890322ae37226b5af34ba73344083e42ab8d36e9..d24e827a214a1517ad32eba16e3d92f8bf164d07 100644 (file)
--- a/target/i386/kvm/vmsr_energy.c
+++ b/target/i386/kvm/vmsr_energy.c
@@ -16,7 +16,7 @@
 #include "vmsr_energy.h"
 #include "io/channel.h"
 #include "io/channel-socket.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "cpu.h"
 #include "host-cpu.h"
 

diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c
index 6bf8d5f4bbbc30039905e63f22255838673d629f..db184e1b0d0a01f82c6e67f6f5011da8f06ae1ce 100644 (file)
--- a/target/i386/whpx/whpx-all.c
+++ b/target/i386/whpx/whpx-all.c
@@ -19,7 +19,7 @@
 #include "system/cpus.h"
 #include "system/runstate.h"
 #include "qemu/main-loop.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/intc/ioapic.h"
 #include "hw/i386/apic_internal.h"
 #include "qemu/error-report.h"

diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c
index 26e40c9bdc03ce0aecc4860f293fd7897c972d82..6412584e1bdd9d54196c825100c14977ae9db88f 100644 (file)
--- a/target/loongarch/kvm/kvm.c
+++ b/target/loongarch/kvm/kvm.c
@@ -19,7 +19,7 @@
 #include "hw/pci/pci.h"
 #include "exec/memattrs.h"
 #include "system/address-spaces.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/irq.h"
 #include "hw/loongarch/virt.h"
 #include "qemu/log.h"

diff --git a/target/m68k/m68k-semi.c b/target/m68k/m68k-semi.c
index 6fbbd140f32a479e901105a63827da0b5d9c2a96..578a08dfee86a4770c75c5c59bad866ef1e7af0c 100644 (file)
--- a/target/m68k/m68k-semi.c
+++ b/target/m68k/m68k-semi.c
@@ -28,7 +28,7 @@
 #include "gdbstub/helpers.h"
 #include "semihosting/syscalls.h"
 #include "semihosting/uaccess.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "qemu/log.h"
 
 #define HOSTED_EXIT  0

diff --git a/target/mips/kvm.c b/target/mips/kvm.c
index 912cd5dfa0e067c43973b4d1f1e0f7af173e5f2d..a85e162409c2cbd183fabde96277b8805b38c31f 100644 (file)
--- a/target/mips/kvm.c
+++ b/target/mips/kvm.c
@@ -22,7 +22,7 @@
 #include "system/kvm_int.h"
 #include "system/runstate.h"
 #include "kvm_mips.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "fpu_helper.h"
 
 #define DEBUG_KVM 0

diff --git a/target/openrisc/sys_helper.c b/target/openrisc/sys_helper.c
index 7ad908b632221f530e3d5350c8725d928cfce199..ca627bd7194acfc37b25178cf0849eed178bda28 100644 (file)
--- a/target/openrisc/sys_helper.c
+++ b/target/openrisc/sys_helper.c
@@ -25,7 +25,7 @@
 #include "exec/helper-proto.h"
 #include "exception.h"
 #ifndef CONFIG_USER_ONLY
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #endif
 #include "tcg/insn-start-words.h"
 

diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c
index 86ead740eecf780a3e7bb8842218fe4de6fb7c42..a3b14cceada1bd7dd39032d4f3aabb9f5ad4a3eb 100644 (file)
--- a/target/ppc/cpu_init.c
+++ b/target/ppc/cpu_init.c
@@ -46,7 +46,7 @@
 #include "spr_common.h"
 #include "power8-pmu.h"
 #ifndef CONFIG_USER_ONLY
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/intc/intc.h"
 #include "kvm_ppc.h"
 #endif

diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c
index 47e672c7aaced368103223497b9e60a60eb0f7e1..301d8de67fd34dd1ebb7909362e3b226d522a2ac 100644 (file)
--- a/target/riscv/kvm/kvm-cpu.c
+++ b/target/riscv/kvm/kvm-cpu.c
@@ -37,7 +37,7 @@
 #include "exec/memattrs.h"
 #include "system/address-spaces.h"
 #include "system/memory.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/irq.h"
 #include "hw/intc/riscv_imsic.h"
 #include "qemu/log.h"

diff --git a/target/riscv/tcg/tcg-cpu.c b/target/riscv/tcg/tcg-cpu.c
index d3968251fad5aa085040d733875c92d16e90880c..bb03f8dc0ca73ea41fa0b9039e30bb4cada56707 100644 (file)
--- a/target/riscv/tcg/tcg-cpu.c
+++ b/target/riscv/tcg/tcg-cpu.c
@@ -34,7 +34,7 @@
 #include "accel/tcg/cpu-ops.h"
 #include "tcg/tcg.h"
 #ifndef CONFIG_USER_ONLY
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/tcg.h"
 #include "exec/icount.h"
 #endif

diff --git a/target/s390x/cpu-system.c b/target/s390x/cpu-system.c
index f3a9ffb2a2772836c0aebb42e4f960708899b797..c7a6fd7e75172c8430105780d03f1d351ab590c1 100644 (file)
--- a/target/s390x/cpu-system.c
+++ b/target/s390x/cpu-system.c
@@ -34,7 +34,7 @@
 #include "system/hw_accel.h"
 
 #include "target/s390x/kvm/pv.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/system.h"
 #include "system/tcg.h"
 #include "hw/core/sysemu-cpu-ops.h"

diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c
index 3b1e75f78336c5ad9d67781c7a1cd13dffd60fa5..7a7b381059095e8de665f367199d9da413eb12ed 100644 (file)
--- a/target/s390x/mmu_helper.c
+++ b/target/s390x/mmu_helper.c
@@ -28,7 +28,7 @@
 #include "exec/target_page.h"
 #include "hw/hw.h"
 #include "hw/s390x/storage-keys.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 
 /* Fetch/store bits in the translation exception code: */
 #define FS_READ  0x800

diff --git a/target/s390x/sigp.c b/target/s390x/sigp.c
index f5d7bc0fa2256a2c241ff14ae482a0f473906bca..b6d44c5c31bc95c1b3c36a7c2ad028450f99f8d9 100644 (file)
--- a/target/s390x/sigp.c
+++ b/target/s390x/sigp.c
@@ -11,7 +11,7 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "s390x-internal.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "system/hw_accel.h"
 #include "system/memory.h"
 #include "system/runstate.h"

diff --git a/target/s390x/tcg/excp_helper.c b/target/s390x/tcg/excp_helper.c
index c6641280bc629a990e6a8d351ddef854394465b5..54f051ae9e119bb584ead569d09ce7db1cc09b5b 100644 (file)
--- a/target/s390x/tcg/excp_helper.c
+++ b/target/s390x/tcg/excp_helper.c
@@ -33,7 +33,7 @@
 #include "system/memory.h"
 #include "hw/s390x/ioinst.h"
 #include "hw/s390x/s390_flic.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #endif
 #include "qemu/plugin.h"
 

diff --git a/target/s390x/tcg/mem_helper.c b/target/s390x/tcg/mem_helper.c
index 24675fc818dd970d3c82176dc6e9775f341f492c..9e5bd3ed07fa14816a0a6e42f4a76eb1fd8fa72e 100644 (file)
--- a/target/s390x/tcg/mem_helper.c
+++ b/target/s390x/tcg/mem_helper.c
@@ -40,7 +40,7 @@
 #include "user/page-protection.h"
 #else
 #include "hw/s390x/storage-keys.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #endif
 
 #ifdef CONFIG_USER_ONLY

diff --git a/target/s390x/tcg/misc_helper.c b/target/s390x/tcg/misc_helper.c
index 215b5b9d933a75e8a9d546fa13a364cfebb9a53f..1fd900fbbf05ffbe542d4c9e97d818f9b078db34 100644 (file)
--- a/target/s390x/tcg/misc_helper.c
+++ b/target/s390x/tcg/misc_helper.c
@@ -42,7 +42,7 @@
 #include "hw/s390x/s390_flic.h"
 #include "hw/s390x/ioinst.h"
 #include "hw/s390x/s390-pci-inst.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "hw/s390x/tod.h"
 #include CONFIG_DEVICES
 #endif

diff --git a/tests/qtest/fuzz/generic_fuzz.c b/tests/qtest/fuzz/generic_fuzz.c
index f12080eda492a14efa6a4b7cf2ba92b11a60a927..c848eec3b9337d4707cb3da1724d6cc936d929d3 100644 (file)
--- a/tests/qtest/fuzz/generic_fuzz.c
+++ b/tests/qtest/fuzz/generic_fuzz.c
@@ -25,7 +25,7 @@
 #include "hw/qdev-core.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_device.h"
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 #include "generic_fuzz_configs.h"
 #include "hw/mem/sparse-mem.h"
 

diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c
index 326045ecbb338accc6eca9549f3323cc427e13df..28ea9158e7aae570b71e657ccc90bdb18096ba55 100644 (file)
--- a/tests/unit/test-smp-parse.c
+++ b/tests/unit/test-smp-parse.c
@@ -15,7 +15,7 @@
 #include "qemu/module.h"
 #include "qapi/error.h"
 
-#include "hw/boards.h"
+#include "hw/core/boards.h"
 
 #define T true
 #define F false