Include hw/boards.h a bit less

hw/boards.h pulls in almost 60 headers.  The less we include it into
headers, the better.  As a first step, drop superfluous inclusions,
and downgrade some more to what's actually needed.  Gets rid of just
one inclusion into a header.

Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-Id: <20190812052359.30071-23-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>

diff --git a/backends/cryptodev-builtin.c b/backends/cryptodev-builtin.c
index 9fb0bd57a6d7fb6553139ca442aa367a661a7e9a..c8ae3b9742ee2ffed541e6cf8f04db02b7b5d0f8 100644 (file)
--- a/backends/cryptodev-builtin.c
+++ b/backends/cryptodev-builtin.c
@@ -23,7 +23,6 @@
 
 #include "qemu/osdep.h"
 #include "sysemu/cryptodev.h"
-#include "hw/boards.h"
 #include "qapi/error.h"
 #include "standard-headers/linux/virtio_crypto.h"
 #include "crypto/cipher.h"

diff --git a/backends/cryptodev-vhost-user.c b/backends/cryptodev-vhost-user.c
index 1052a5d0e955f9a7584a17ba674285f07d25c42e..b34428394087ecf149624167f3ca4fe04cd1b2ac 100644 (file)
--- a/backends/cryptodev-vhost-user.c
+++ b/backends/cryptodev-vhost-user.c
@@ -22,7 +22,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/boards.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/error-report.h"

diff --git a/backends/cryptodev.c b/backends/cryptodev.c
index f35be377efa4bd0fb89f4586071858a32b9b7af1..3c071eab951ae02a3b68d9e9496b1d564c011359 100644 (file)
--- a/backends/cryptodev.c
+++ b/backends/cryptodev.c
@@ -23,7 +23,6 @@
 
 #include "qemu/osdep.h"
 #include "sysemu/cryptodev.h"
-#include "hw/boards.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"
 #include "qemu/config-file.h"

diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
index 39649cbe6a6f85ac8ee7fee020dce3a94e49505c..c1aaa07d432c6d30f7965cdfd8eb0bb5bb800d56 100644 (file)
--- a/hw/acpi/ich9.c
+++ b/hw/acpi/ich9.c
@@ -31,6 +31,7 @@
 #include "hw/pci/pci.h"
 #include "migration/vmstate.h"
 #include "qemu/timer.h"
+#include "qom/cpu.h"
 #include "sysemu/reset.h"
 #include "sysemu/sysemu.h"
 #include "hw/acpi/acpi.h"

diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c
index 546b89bbccc70e58df1c24774fb8799422c9b295..51feee85581250137ee14cb472505d43b01d6cf8 100644 (file)
--- a/hw/alpha/dp264.c
+++ b/hw/alpha/dp264.c
@@ -11,7 +11,6 @@
 #include "cpu.h"
 #include "elf.h"
 #include "hw/loader.h"
-#include "hw/boards.h"
 #include "alpha_sys.h"
 #include "qemu/error-report.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c
index 5d7f8f334255794517cab3c2d17ea50831b153c3..1c0565acc1635c31eea65f03b5c4f78dcecd84c6 100644 (file)
--- a/hw/alpha/typhoon.c
+++ b/hw/alpha/typhoon.c
@@ -11,6 +11,7 @@
 #include "qemu/units.h"
 #include "qapi/error.h"
 #include "cpu.h"
+#include "hw/boards.h"
 #include "hw/irq.h"
 #include "sysemu/sysemu.h"
 #include "alpha_sys.h"

diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index 8563672942b4e024476578e06647cb83cb42fcd7..eff89ab80e8332e71d70fc83fa9a0d529fcf74d2 100644 (file)
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -18,7 +18,6 @@
 #include "sysemu/sysemu.h"
 #include "sysemu/numa.h"
 #include "sysemu/reset.h"
-#include "hw/boards.h"
 #include "hw/loader.h"
 #include "elf.h"
 #include "sysemu/device_tree.h"

diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c
index 0e403f3e78faced20f70bf90f6582121c01b9f91..a9f8a5c86885070c5f0c0288499831857634309b 100644 (file)
--- a/hw/arm/exynos4210.c
+++ b/hw/arm/exynos4210.c
@@ -27,7 +27,7 @@
 #include "cpu.h"
 #include "hw/cpu/a9mpcore.h"
 #include "hw/irq.h"
-#include "hw/boards.h"
+#include "sysemu/blockdev.h"
 #include "sysemu/sysemu.h"
 #include "hw/sysbus.h"
 #include "hw/arm/boot.h"

diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c
index 098e84c84d37d475d58d5ef2913bde0e2d978496..532d088298b12d696770391c581b432d91d771a4 100644 (file)
--- a/hw/arm/fsl-imx25.c
+++ b/hw/arm/fsl-imx25.c
@@ -28,7 +28,6 @@
 #include "hw/arm/fsl-imx25.h"
 #include "sysemu/sysemu.h"
 #include "exec/address-spaces.h"
-#include "hw/boards.h"
 #include "hw/qdev-properties.h"
 #include "chardev/char.h"
 

diff --git a/hw/arm/fsl-imx31.c b/hw/arm/fsl-imx31.c
index 093ad409840d18609dd01ec9f9167cd51a473823..1a37a7b997cb1eec3efbd6696577212ecacbace8 100644 (file)
--- a/hw/arm/fsl-imx31.c
+++ b/hw/arm/fsl-imx31.c
@@ -25,7 +25,6 @@
 #include "hw/arm/fsl-imx31.h"
 #include "sysemu/sysemu.h"
 #include "exec/address-spaces.h"
-#include "hw/boards.h"
 #include "hw/qdev-properties.h"
 #include "chardev/char.h"
 

diff --git a/hw/arm/msf2-soc.c b/hw/arm/msf2-soc.c
index 4e5251c92ecaf2834a9fadcbe56ffea0b208a1cb..8ae763f99f139fa3917c93f0782b37a931677788 100644 (file)
--- a/hw/arm/msf2-soc.c
+++ b/hw/arm/msf2-soc.c
@@ -28,7 +28,6 @@
 #include "exec/address-spaces.h"
 #include "hw/char/serial.h"
 #include "hw/irq.h"
-#include "hw/boards.h"
 #include "hw/arm/msf2-soc.h"
 #include "hw/misc/unimp.h"
 

diff --git a/hw/arm/nrf51_soc.c b/hw/arm/nrf51_soc.c
index fc067cd8eee2a85342f7c24ea3daf165f6540b01..d9e54fefbb68e669f79d99129d6078dd06388697 100644 (file)
--- a/hw/arm/nrf51_soc.c
+++ b/hw/arm/nrf51_soc.c
@@ -12,7 +12,6 @@
 #include "qapi/error.h"
 #include "hw/arm/boot.h"
 #include "hw/sysbus.h"
-#include "hw/boards.h"
 #include "hw/misc/unimp.h"
 #include "exec/address-spaces.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c
index 19fca4159ac142e844f1b415d98b882dd4754ded..d28ad2b9ff914250d04eee6cb8f7b4844cb059f1 100644 (file)
--- a/hw/arm/omap1.c
+++ b/hw/arm/omap1.c
@@ -29,6 +29,7 @@
 #include "hw/qdev-properties.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/omap.h"
+#include "sysemu/blockdev.h"
 #include "sysemu/sysemu.h"
 #include "hw/arm/soc_dma.h"
 #include "sysemu/qtest.h"

diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c
index dccb5707f8de854d0c09638bdd8b3b903f1478f6..e0a9c2da83ecbcec6c49547ce917fc7ea68124a9 100644 (file)
--- a/hw/arm/omap2.c
+++ b/hw/arm/omap2.c
@@ -22,6 +22,7 @@
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "cpu.h"
+#include "sysemu/blockdev.h"
 #include "sysemu/qtest.h"
 #include "sysemu/reset.h"
 #include "hw/boards.h"

diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c
index 0634a398d2ec5361ec805f2c3805e6ca1f014b55..0ccc77239008c759d65659c35f2ef89ebd39244d 100644 (file)
--- a/hw/arm/smmuv3.c
+++ b/hw/arm/smmuv3.c
@@ -17,7 +17,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/boards.h"
 #include "hw/irq.h"
 #include "sysemu/sysemu.h"
 #include "hw/sysbus.h"

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index e9fddec058def0e93c52af3699ad3764649f5c22..226e810d06bdca1b84398e07517b1e3532788528 100644 (file)
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -34,6 +34,7 @@
 #include "qemu/option.h"
 #include "qapi/error.h"
 #include "hw/sysbus.h"
+#include "hw/boards.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/primecell.h"
 #include "hw/arm/virt.h"

diff --git a/hw/core/numa.c b/hw/core/numa.c
index 67548064ee92af899b348c4ea74b7de7d7b6cf23..d817f06ead2af01f2e543c1ea47c6a4bd87e6591 100644 (file)
--- a/hw/core/numa.c
+++ b/hw/core/numa.c
@@ -32,8 +32,10 @@
 #include "qapi/opts-visitor.h"
 #include "qapi/qapi-visit-machine.h"
 #include "sysemu/qtest.h"
+#include "qom/cpu.h"
 #include "hw/mem/pc-dimm.h"
 #include "migration/vmstate.h"
+#include "hw/boards.h"
 #include "hw/mem/memory-device.h"
 #include "qemu/option.h"
 #include "qemu/config-file.h"

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 2fbb581c460447b044b14ed4df1ecd87b26bb7b2..9e187f856a63d43194a0989115372d45d09c1b66 100644 (file)
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -35,7 +35,6 @@
 #include "hw/pci/pci_ids.h"
 #include "hw/usb.h"
 #include "net/net.h"
-#include "hw/boards.h"
 #include "hw/ide.h"
 #include "hw/irq.h"
 #include "sysemu/kvm.h"

diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 8777c9618b433ee2dbaadc8801a6f1a826808f9d..be3464f4856087c7a63f407f138478d9a2a948b6 100644 (file)
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -33,7 +33,6 @@
 #include "hw/loader.h"
 #include "sysemu/arch_init.h"
 #include "hw/i2c/smbus_eeprom.h"
-#include "hw/boards.h"
 #include "hw/timer/mc146818rtc.h"
 #include "hw/xen/xen.h"
 #include "sysemu/kvm.h"

diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c
index 235928452b72178cf5ec859beb45e66d356b3b3b..a9983f0bfb4cf9ca8c7506a3a81ae2d701446495 100644 (file)
--- a/hw/i386/pc_sysfw.c
+++ b/hw/i386/pc_sysfw.c
@@ -32,7 +32,6 @@
 #include "qemu/units.h"
 #include "hw/sysbus.h"
 #include "hw/i386/pc.h"
-#include "hw/boards.h"
 #include "hw/loader.h"
 #include "hw/qdev-properties.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c
index 2b82a58592fc0349a90958c40a825133706cbbca..7078386300958f02aa42b8635a38e8ad2aac9506 100644 (file)
--- a/hw/ppc/e500plat.c
+++ b/hw/ppc/e500plat.c
@@ -13,7 +13,6 @@
 #include "qemu/units.h"
 #include "e500.h"
 #include "hw/net/fsl_etsec/etsec.h"
-#include "hw/boards.h"
 #include "sysemu/device_tree.h"
 #include "sysemu/kvm.h"
 #include "hw/sysbus.h"

diff --git a/hw/ppc/mpc8544ds.c b/hw/ppc/mpc8544ds.c
index 6a4657c3cd83f73ea3ef8625085c7824a58d2328..c2c5e11fa1d2837e0ff48721402330b74dc8c0f7 100644 (file)
--- a/hw/ppc/mpc8544ds.c
+++ b/hw/ppc/mpc8544ds.c
@@ -11,7 +11,6 @@
 
 #include "qemu/osdep.h"
 #include "e500.h"
-#include "hw/boards.h"
 #include "sysemu/device_tree.h"
 #include "hw/ppc/openpic.h"
 #include "qemu/error-report.h"

diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index cf318306558fd0a5352dc168721c056e4534d265..fc7d24830aea59d048e9307f29de860936c06a9b 100644 (file)
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -45,6 +45,7 @@
 #include "hw/ppc/pnv_xscom.h"
 
 #include "hw/isa/isa.h"
+#include "hw/boards.h"
 #include "hw/char/serial.h"
 #include "hw/timer/mc146818rtc.h"
 

diff --git a/hw/ppc/ppc405_uc.c b/hw/ppc/ppc405_uc.c
index ba092f293117456b29c39c1471f1c646afc84801..381720aced9e0e0faa74d84e4496009a19af3841 100644 (file)
--- a/hw/ppc/ppc405_uc.c
+++ b/hw/ppc/ppc405_uc.c
@@ -27,7 +27,6 @@
 #include "qapi/error.h"
 #include "cpu.h"
 #include "hw/ppc/ppc.h"
-#include "hw/boards.h"
 #include "hw/i2c/ppc4xx_i2c.h"
 #include "hw/irq.h"
 #include "ppc405.h"

diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c
index 920bc365ef029bdc8688c095f5e696b05b74dfe1..bf47fbdf6f7fe41f7e297da7c2fadd99fdcd4fb9 100644 (file)
--- a/hw/ppc/spapr_cpu_core.c
+++ b/hw/ppc/spapr_cpu_core.c
@@ -14,7 +14,6 @@
 #include "migration/vmstate.h"
 #include "target/ppc/cpu.h"
 #include "hw/ppc/spapr.h"
-#include "hw/boards.h"
 #include "qapi/error.h"
 #include "sysemu/cpus.h"
 #include "sysemu/kvm.h"

diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c
index 31ff0be189af0bbc674dc5cef5659ea5863a9b48..910c57fce50d6c8b0c8598aaeec519a6dcadd9ac 100644 (file)
--- a/hw/ppc/spapr_vio.c
+++ b/hw/ppc/spapr_vio.c
@@ -26,7 +26,6 @@
 #include "hw/irq.h"
 #include "qemu/log.h"
 #include "sysemu/sysemu.h"
-#include "hw/boards.h"
 #include "hw/loader.h"
 #include "elf.h"
 #include "hw/sysbus.h"

diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c
index 6b7d322e857cd254f53761ef6b0a3d65c3725f17..4c63b5cf8a878c6dc991da5aa6f1304dd4516c68 100644 (file)
--- a/hw/riscv/boot.c
+++ b/hw/riscv/boot.c
@@ -22,9 +22,9 @@
 #include "qemu/units.h"
 #include "qemu/error-report.h"
 #include "exec/cpu-defs.h"
+#include "hw/boards.h"
 #include "hw/loader.h"
 #include "hw/riscv/boot.h"
-#include "hw/boards.h"
 #include "elf.h"
 #include "sysemu/qtest.h"
 

diff --git a/hw/s390x/s390-stattrib.c b/hw/s390x/s390-stattrib.c
index 766f2015a48f0a9da72e141968d652ba3b30332a..eda5ca3bb62e3084e9f8838862d5fdac81f6f737 100644 (file)
--- a/hw/s390x/s390-stattrib.c
+++ b/hw/s390x/s390-stattrib.c
@@ -11,7 +11,6 @@
 
 #include "qemu/osdep.h"
 #include "qemu/units.h"
-#include "hw/boards.h"
 #include "cpu.h"
 #include "migration/qemu-file.h"
 #include "migration/register.h"

diff --git a/hw/xtensa/xtensa_memory.c b/hw/xtensa/xtensa_memory.c
index 394d0cf227740b69da5991ab586660b3657ac16a..40334db441ab773e6eeed756a7b07ceac9396076 100644 (file)
--- a/hw/xtensa/xtensa_memory.c
+++ b/hw/xtensa/xtensa_memory.c
@@ -29,7 +29,6 @@
 #include "qapi/error.h"
 #include "cpu.h"
 #include "sysemu/sysemu.h"
-#include "hw/boards.h"
 #include "exec/memory.h"
 #include "qemu/error-report.h"
 #include "xtensa_memory.h"

diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h
index 66dee284ace770789413ed7a50bfab39e0f8e977..47b246f95c072a2129e2839d2ad5ea8e3d003135 100644 (file)
--- a/include/hw/mem/pc-dimm.h
+++ b/include/hw/mem/pc-dimm.h
@@ -19,7 +19,6 @@
 #include "exec/memory.h"
 #include "sysemu/hostmem.h"
 #include "hw/qdev-core.h"
-#include "hw/boards.h"
 
 #define TYPE_PC_DIMM "pc-dimm"
 #define PC_DIMM(obj) \

diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c
index b9ae40eec751c8f46644814b141da0054a423353..330558f332617ea4bec7c4f130d4214d1dbe2ce5 100644 (file)
--- a/monitor/qmp-cmds.c
+++ b/monitor/qmp-cmds.c
@@ -35,7 +35,6 @@
 #include "qapi/qapi-commands-misc.h"
 #include "qapi/qapi-commands-ui.h"
 #include "qapi/qmp/qerror.h"
-#include "hw/boards.h"
 #include "hw/mem/memory-device.h"
 #include "hw/acpi/acpi_dev_interface.h"
 

diff --git a/target/alpha/machine.c b/target/alpha/machine.c
index b26ec29f0fc051e74158d17c0d0b55fead10bb96..9d20169d4f54de601cd4726d6c24ae2db4ad079b 100644 (file)
--- a/target/alpha/machine.c
+++ b/target/alpha/machine.c
@@ -1,6 +1,5 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "hw/boards.h"
 #include "migration/cpu.h"
 
 static int get_fpcr(QEMUFile *f, void *opaque, size_t size,

diff --git a/target/arm/machine.c b/target/arm/machine.c
index bf2a0a6a09e1ced41e7689d25161bf1c85e4eda5..5c36707a7c9a10ac06aaebeceb86d5262ba9bc76 100644 (file)
--- a/target/arm/machine.c
+++ b/target/arm/machine.c
@@ -1,6 +1,5 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "hw/boards.h"
 #include "qemu/error-report.h"
 #include "sysemu/kvm.h"
 #include "kvm_arm.h"

diff --git a/target/arm/monitor.c b/target/arm/monitor.c
index 6ec6dd04ac2e00d8d983867085f77b76056b75fb..6457c3c87f7c6f5e2a1f90680d7526875be86182 100644 (file)
--- a/target/arm/monitor.c
+++ b/target/arm/monitor.c
@@ -21,7 +21,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/boards.h"
 #include "kvm_arm.h"
 #include "qapi/qapi-commands-misc-target.h"
 

diff --git a/target/hppa/machine.c b/target/hppa/machine.c
index 9fb82a53db7ff93e79b6375c9f8323f3dddad7f3..7030101724899ef72216c54dbfc380902da19cc3 100644 (file)
--- a/target/hppa/machine.c
+++ b/target/hppa/machine.c
@@ -19,7 +19,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "hw/boards.h"
 #include "migration/cpu.h"
 
 #if TARGET_REGISTER_BITS == 64

diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c
index dc4bb63536c8ab57383fdab2134d6525b71be6d0..6863cf2de4987bbf78abe2aefe2fbe45543e80e5 100644 (file)
--- a/target/i386/hvf/hvf.c
+++ b/target/i386/hvf/hvf.c
@@ -66,7 +66,6 @@
 
 #include "exec/address-spaces.h"
 #include "hw/i386/apic_internal.h"
-#include "hw/boards.h"
 #include "qemu/main-loop.h"
 #include "sysemu/accel.h"
 #include "sysemu/sysemu.h"

diff --git a/target/i386/hvf/x86_task.c b/target/i386/hvf/x86_task.c
index 7099335e89839ab412818a923188ed281f6d0b96..73cd5d28172ddf820de4361e6cf8eafa132352a7 100644 (file)
--- a/target/i386/hvf/x86_task.c
+++ b/target/i386/hvf/x86_task.c
@@ -27,7 +27,6 @@
 #include <Hypervisor/hv_vmx.h>
 
 #include "hw/i386/apic_internal.h"
-#include "hw/boards.h"
 #include "qemu/main-loop.h"
 #include "sysemu/accel.h"
 #include "sysemu/sysemu.h"

diff --git a/target/i386/machine.c b/target/i386/machine.c
index f8c6feea083ad72aee9a23bf42f5135f6ac5524c..ce55755f0f115e716d282ea0f75648d08555290c 100644 (file)
--- a/target/i386/machine.c
+++ b/target/i386/machine.c
@@ -1,7 +1,6 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/exec-all.h"
-#include "hw/boards.h"
 #include "hw/i386/pc.h"
 #include "hw/isa/isa.h"
 #include "migration/cpu.h"

diff --git a/target/i386/whpx-all.c b/target/i386/whpx-all.c
index 2cf66f7804321a039326e503d77020486a8cbcd8..b57d1c6683ef1e4c84fe8fc1a1008aab224c9755 100644 (file)
--- a/target/i386/whpx-all.c
+++ b/target/i386/whpx-all.c
@@ -18,7 +18,6 @@
 #include "sysemu/sysemu.h"
 #include "sysemu/cpus.h"
 #include "qemu/main-loop.h"
-#include "hw/boards.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "migration/blocker.h"

diff --git a/target/lm32/machine.c b/target/lm32/machine.c
index db43ef0631a721568efcafc6a39f7cd31f6c60f8..365eaa2e47ab0403a2fa1363a600602c39eb56db 100644 (file)
--- a/target/lm32/machine.c
+++ b/target/lm32/machine.c
@@ -1,6 +1,5 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "hw/boards.h"
 #include "migration/cpu.h"
 
 static const VMStateDescription vmstate_env = {

diff --git a/target/moxie/machine.c b/target/moxie/machine.c
index 675272f9e0195fab81ad1db445f1d38b0535a973..d0f177048c42be071ae198eb7fccb7f2f4f617cb 100644 (file)
--- a/target/moxie/machine.c
+++ b/target/moxie/machine.c
@@ -1,6 +1,5 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "hw/boards.h"
 #include "machine.h"
 #include "migration/cpu.h"
 

diff --git a/target/openrisc/machine.c b/target/openrisc/machine.c
index 99c0470a44d3947f28fdb4d28a4a08f5916ed5b1..0a96404dc66a8855a5ef9c93b3e4b1aec7156f37 100644 (file)
--- a/target/openrisc/machine.c
+++ b/target/openrisc/machine.c
@@ -19,7 +19,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "hw/boards.h"
 #include "migration/cpu.h"
 
 static const VMStateDescription vmstate_tlb_entry = {

diff --git a/target/ppc/machine.c b/target/ppc/machine.c
index d6638ee60ec927f94b17ec959cd93f123cfdf7ce..109d0711628f686140b6a76984898014191ad46b 100644 (file)
--- a/target/ppc/machine.c
+++ b/target/ppc/machine.c
@@ -1,7 +1,6 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/exec-all.h"
-#include "hw/boards.h"
 #include "sysemu/kvm.h"
 #include "helper_regs.h"
 #include "mmu-hash64.h"

diff --git a/target/sparc/machine.c b/target/sparc/machine.c
index 7309c27319a1fc1d5bddeb5e5fdd328e88f9dddb..f38cf229af73c626be16e6a0e70a783fc690a815 100644 (file)
--- a/target/sparc/machine.c
+++ b/target/sparc/machine.c
@@ -1,7 +1,6 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/exec-all.h"
-#include "hw/boards.h"
 #include "qemu/timer.h"
 
 #include "migration/cpu.h"