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

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

diff --git a/hw/acpi/cxl.c b/hw/acpi/cxl.c
index 75d5b30bb8b337d2f8f9241a51730f3725ce3b65..75edb2c0a652d0ea6a93c392fe0a5f158bf7329b 100644 (file)
--- a/hw/acpi/cxl.c
+++ b/hw/acpi/cxl.c
@@ -18,7 +18,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/pci/pci_bridge.h"
 #include "hw/pci/pci_host.h"
 #include "hw/cxl/cxl.h"

diff --git a/hw/adc/stm32f2xx_adc.c b/hw/adc/stm32f2xx_adc.c
index a490ae640d9a96ca62b507318bd07ce568f36f9c..50a04a0722fe31fe0e56c7603ace8f1010b5b1f9 100644 (file)
--- a/hw/adc/stm32f2xx_adc.c
+++ b/hw/adc/stm32f2xx_adc.c
@@ -23,7 +23,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/arm/allwinner-a10.c b/hw/arm/allwinner-a10.c
index d7508ee0ecd30aee32be66c51ec6611c7f885258..66f30757dd540d0e3d7cda261dc117d564ed1662 100644 (file)
--- a/hw/arm/allwinner-a10.c
+++ b/hw/arm/allwinner-a10.c
@@ -20,7 +20,7 @@
 #include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "hw/char/serial-mm.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/arm/allwinner-a10.h"
 #include "hw/misc/unimp.h"
 #include "system/system.h"

diff --git a/hw/arm/allwinner-h3.c b/hw/arm/allwinner-h3.c
index 757c89ef39f27df8cf4f404afab2591f055eb527..262e99b3f9a2fac05c172bd215c560109de96882 100644 (file)
--- a/hw/arm/allwinner-h3.c
+++ b/hw/arm/allwinner-h3.c
@@ -23,7 +23,7 @@
 #include "qemu/module.h"
 #include "qemu/units.h"
 #include "hw/core/qdev.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/char/serial-mm.h"
 #include "hw/misc/unimp.h"
 #include "hw/usb/hcd-ehci.h"

diff --git a/hw/arm/allwinner-r40.c b/hw/arm/allwinner-r40.c
index 396e886af47c5f22da13007bdedc35df301db546..a1ae75deb6b0e920b105992124bc3d097039fb25 100644 (file)
--- a/hw/arm/allwinner-r40.c
+++ b/hw/arm/allwinner-r40.c
@@ -24,7 +24,7 @@
 #include "qemu/units.h"
 #include "hw/core/boards.h"
 #include "hw/core/qdev.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/char/serial-mm.h"
 #include "hw/misc/unimp.h"
 #include "hw/usb/hcd-ehci.h"

diff --git a/hw/arm/armsse.c b/hw/arm/armsse.c
index b6fc95df3b60d2903a0f9eb5d4bf79f57f780a30..ddb210c89570cd91abab02adaa7078b7a365016f 100644 (file)
--- a/hw/arm/armsse.c
+++ b/hw/arm/armsse.c
@@ -16,7 +16,7 @@
 #include "qemu/units.h"
 #include "qapi/error.h"
 #include "trace.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/core/registerfields.h"
 #include "hw/arm/armsse.h"

diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
index 844d620286c424a4b9ef8f39da861da32ee0753a..a29eab6c9157f9e1e63710a97ce834e3319408ba 100644 (file)
--- a/hw/arm/armv7m.c
+++ b/hw/arm/armv7m.c
@@ -10,7 +10,7 @@
 #include "qemu/osdep.h"
 #include "hw/arm/armv7m.h"
 #include "qapi/error.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/arm/boot.h"
 #include "hw/core/loader.h"
 #include "hw/core/qdev-properties.h"

diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c
index cd61ba150545d3e5ec815158cf77ba3a5c6f9aa0..ee2f44debd17aff95a9f6a54b1d6b4e82b64264c 100644 (file)
--- a/hw/arm/bcm2836.c
+++ b/hw/arm/bcm2836.c
@@ -14,7 +14,7 @@
 #include "qemu/module.h"
 #include "hw/arm/bcm2836.h"
 #include "hw/arm/raspi_platform.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "target/arm/cpu-qom.h"
 #include "target/arm/gtimer.h"
 

diff --git a/hw/arm/bcm2838.c b/hw/arm/bcm2838.c
index 22aa754613cb50f4f7e82cbb7cfe2e14d4f94d27..c14a8540465ba0f0cbf2c349a1f24603d42cf1af 100644 (file)
--- a/hw/arm/bcm2838.c
+++ b/hw/arm/bcm2838.c
@@ -10,7 +10,7 @@
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "hw/arm/raspi_platform.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/arm/bcm2838.h"
 #include "trace.h"
 

diff --git a/hw/arm/collie.c b/hw/arm/collie.c
index 73c40bc57da325dc533cc77ddf1bf45f311e27ca..91f0a94b6ff27b12b1e204d01d3930c70c554d94 100644 (file)
--- a/hw/arm/collie.c
+++ b/hw/arm/collie.c
@@ -11,7 +11,7 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "qemu/cutils.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/boards.h"
 #include "strongarm.h"
 #include "hw/arm/boot.h"

diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c
index 5d68579cd6bd9ad5fb97a460caa6c2577b9dc3cb..25c385ba1f55bb55e93947b2d01f4d7f5496ea0c 100644 (file)
--- a/hw/arm/exynos4210.c
+++ b/hw/arm/exynos4210.c
@@ -29,7 +29,7 @@
 #include "hw/core/irq.h"
 #include "system/blockdev.h"
 #include "system/system.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/arm/boot.h"
 #include "hw/core/loader.h"
 #include "hw/core/qdev-properties.h"

diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c
index e8c171f40a804751a7166005d000d4d6c15604aa..1b8c9b618f8c34d0a3f60127bb5634f99fefde38 100644 (file)
--- a/hw/arm/exynos4_boards.c
+++ b/hw/arm/exynos4_boards.c
@@ -25,7 +25,7 @@
 #include "qemu/units.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "net/net.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/machines-qom.h"

diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c
index b8c1256328d9b78c452a407c2522ed2d01b5f8f6..92d497999c0f4d11758111d2e711c34d9161e8fb 100644 (file)
--- a/hw/arm/highbank.c
+++ b/hw/arm/highbank.c
@@ -20,7 +20,7 @@
 #include "qemu/osdep.h"
 #include "qemu/datadir.h"
 #include "qapi/error.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/machines-qom.h"

diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c
index b24df11db92213c929bea102f11fb771bc9aab07..118808f2dc75b05fb62cf09852e343cb48cc22cb 100644 (file)
--- a/hw/arm/integratorcp.c
+++ b/hw/arm/integratorcp.c
@@ -9,7 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/core/boards.h"
 #include "hw/arm/boot.h"

diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
index 39e8f69cae0b5380f5d4ee896f079884bf646b1d..250fdb49b6f3e99cd9bf8dd47c0e64502970ffe9 100644 (file)
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@@ -12,7 +12,7 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "qapi/error.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/machines-qom.h"

diff --git a/hw/arm/nrf51_soc.c b/hw/arm/nrf51_soc.c
index a4ccfa373a63149dd6060ee92ea7972d0b180fb1..8d8ea71da435daa63cafb12e1b6b8de750b51f3b 100644 (file)
--- a/hw/arm/nrf51_soc.c
+++ b/hw/arm/nrf51_soc.c
@@ -11,7 +11,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/arm/boot.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/qdev-clock.h"
 #include "hw/misc/unimp.h"
 #include "qemu/log.h"

diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c
index fcba6eb52d5d9d885d9a03ff08be3590aca22902..f3d6be1e295b0326422e3fc42a68862f4ac4583a 100644 (file)
--- a/hw/arm/omap1.c
+++ b/hw/arm/omap1.c
@@ -38,7 +38,7 @@
 #include "system/runstate.h"
 #include "system/rtc.h"
 #include "qemu/range.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/cutils.h"
 #include "qemu/bcd.h"
 #include "target/arm/cpu-qom.h"

diff --git a/hw/arm/realview.c b/hw/arm/realview.c
index d7f96b9d3e48847136b53a449d135ec115648096..c9558be4d458becbce17a260f1cdc25f213291f0 100644 (file)
--- a/hw/arm/realview.c
+++ b/hw/arm/realview.c
@@ -10,7 +10,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "cpu.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/primecell.h"
 #include "hw/arm/machines-qom.h"

diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c
index e12a64a20fbbf8269a166d334d76223ee9f35955..985dfb345f27b356562472cf1fff116215a1fd4d 100644 (file)
--- a/hw/arm/smmuv3.c
+++ b/hw/arm/smmuv3.c
@@ -19,7 +19,7 @@
 #include "qemu/osdep.h"
 #include "qemu/bitops.h"
 #include "hw/core/irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/core/qdev.h"

diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
index f3e8e15de81130746a034bf775676d0f8191b723..56ecc828f4f40a167e79c8054b0fcb6ad2f835c5 100644 (file)
--- a/hw/arm/stellaris.c
+++ b/hw/arm/stellaris.c
@@ -11,7 +11,7 @@
 #include "qemu/bitops.h"
 #include "qapi/error.h"
 #include "hw/core/split-irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/sd/sd.h"
 #include "hw/ssi/ssi.h"
 #include "hw/arm/boot.h"

diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c
index acc75476c34aa5c1ce3bbad44cc667b848ab6434..5a3242195ab9942c88050a607f071ba543cbd960 100644 (file)
--- a/hw/arm/strongarm.c
+++ b/hw/arm/strongarm.c
@@ -31,7 +31,7 @@
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/core/qdev-properties-system.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "strongarm.h"
 #include "qemu/error-report.h"

diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c
index 94661b83d00ce598f54539eac2e776372c651591..254b1610b3919c9cd33a1c8fba16b73d3a1a40a2 100644 (file)
--- a/hw/arm/versatilepb.c
+++ b/hw/arm/versatilepb.c
@@ -9,7 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/machines-qom.h"

diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
index 75cb77da828b614ba5136f583fa63b0b0b161fdc..cc6ae7d4c48611cd5851ce7ea267a2263f68a923 100644 (file)
--- a/hw/arm/vexpress.c
+++ b/hw/arm/vexpress.c
@@ -24,7 +24,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/datadir.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/primecell.h"
 #include "hw/arm/machines-qom.h"

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index d8773cb541ff8eb2e447bf1d1c56a8b5f288fbad..fd0e28f030a31a630a1bcde5d82ebe913d8eccd4 100644 (file)
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -34,7 +34,7 @@
 #include "qemu/option.h"
 #include "qemu/target-info.h"
 #include "monitor/qdev.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/primecell.h"
 #include "hw/arm/virt.h"

diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c
index 0d9c01e4b78a914fc95c03d46d734d358cd986ea..d43f36b7189d72de8c2b5e7ff5553af37433dd43 100644 (file)
--- a/hw/arm/xilinx_zynq.c
+++ b/hw/arm/xilinx_zynq.c
@@ -18,7 +18,7 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "qapi/error.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/machines-qom.h"
 #include "net/net.h"

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

diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c
index a0b2f18b55183526dea57af331189e167955b136..facf92b45cc6cb17c558116418f08b29929666b6 100644 (file)
--- a/hw/arm/xlnx-versal.c
+++ b/hw/arm/xlnx-versal.c
@@ -15,7 +15,7 @@
 #include "qapi/error.h"
 #include "qobject/qlist.h"
 #include "qemu/module.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "net/net.h"
 #include "system/system.h"
 #include "hw/misc/unimp.h"

diff --git a/hw/audio/asc.c b/hw/audio/asc.c
index 77a5cc1092db1bfc4da89a56b36480604cd48bb1..a934c2e82c0368bf52fd51539cec49bd4b938b97 100644 (file)
--- a/hw/audio/asc.c
+++ b/hw/audio/asc.c
@@ -13,7 +13,7 @@
 #include "qemu/osdep.h"
 #include "qemu/timer.h"
 #include "qapi/error.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/irq.h"
 #include "qemu/audio.h"
 #include "hw/audio/asc.h"

diff --git a/hw/audio/cs4231.c b/hw/audio/cs4231.c
index 97cceb44d862dd401195b4600367e1c6e41e83ac..bcf98160ec3351bd92a0697517c796bf1477289c 100644 (file)
--- a/hw/audio/cs4231.c
+++ b/hw/audio/cs4231.c
@@ -23,7 +23,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"
 #include "trace.h"

diff --git a/hw/audio/marvell_88w8618.c b/hw/audio/marvell_88w8618.c
index 39f4b4514dcbf09af723e6c3cf461f6e26882938..6d5e99123d6e35740fbbb8bbfa99c5db8fb9b23d 100644 (file)
--- a/hw/audio/marvell_88w8618.c
+++ b/hw/audio/marvell_88w8618.c
@@ -11,7 +11,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"

diff --git a/hw/audio/pl041.c b/hw/audio/pl041.c
index 117b6b0ae6553848b59528d9d7a25c87bc14ee53..4a9b8ad65ce39d0085a5f00eb5351d74a0283f4f 100644 (file)
--- a/hw/audio/pl041.c
+++ b/hw/audio/pl041.c
@@ -23,7 +23,7 @@
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
 

diff --git a/hw/avr/atmega.c b/hw/avr/atmega.c
index b185295d551373709d31dd1aef371dbb1221a5c2..280f613af3af6a4389e275318e19e095cadd9c93 100644 (file)
--- a/hw/avr/atmega.c
+++ b/hw/avr/atmega.c
@@ -17,7 +17,7 @@
 #include "system/address-spaces.h"
 #include "system/system.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 #include "hw/misc/unimp.h"
 #include "migration/vmstate.h"

diff --git a/hw/block/fdc-sysbus.c b/hw/block/fdc-sysbus.c
index 956860ab298ca76dbc6cdb7aa3f164db45da0efd..ab57dfd83eace26fe475b4e227a82fec29dce30f 100644 (file)
--- a/hw/block/fdc-sysbus.c
+++ b/hw/block/fdc-sysbus.c
@@ -27,7 +27,7 @@
 #include "qapi/error.h"
 #include "qom/object.h"
 #include "system/memory.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/block/fdc.h"
 #include "migration/vmstate.h"
 #include "fdc-internal.h"

diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c
index d1673a1b4110607e7c1e3898f2cfc96c19262d38..c0f5b9d8fadee8dbb635f78f349fd769dbc91ca1 100644 (file)
--- a/hw/block/pflash_cfi01.c
+++ b/hw/block/pflash_cfi01.c
@@ -48,7 +48,7 @@
 #include "qemu/host-utils.h"
 #include "qemu/log.h"
 #include "qemu/option.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "system/blockdev.h"
 #include "system/runstate.h"

diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c
index 423516cb301da26f3c74f86f8c915a730132b38e..6f952fe7de09cd77e48464c9a462acac509cba9c 100644 (file)
--- a/hw/block/pflash_cfi02.c
+++ b/hw/block/pflash_cfi02.c
@@ -44,7 +44,7 @@
 #include "system/block-backend.h"
 #include "qemu/host-utils.h"
 #include "qemu/module.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "trace.h"
 

diff --git a/hw/block/swim.c b/hw/block/swim.c
index 53ba7fa59cf9bfc6495f11199d71b91366b8303f..54b63bfbb5250f51d7557e564c625c51656dfffd 100644 (file)
--- a/hw/block/swim.c
+++ b/hw/block/swim.c
@@ -14,7 +14,7 @@
 #include "qemu/main-loop.h"
 #include "qapi/error.h"
 #include "system/block-backend.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/block/block.h"
 #include "hw/block/swim.h"

diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c
index c24ece5fe8837ed68758e14f7ba9eb945e8802a7..eff6a3c4d17ad67dc018f7322ae0eb68469175df 100644 (file)
--- a/hw/char/cadence_uart.c
+++ b/hw/char/cadence_uart.c
@@ -22,7 +22,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "chardev/char-fe.h"
 #include "chardev/char-serial.h"

diff --git a/hw/char/cmsdk-apb-uart.c b/hw/char/cmsdk-apb-uart.c
index 1a83e4a9bd142a0aadb3b354a2a9a8aafa533e2d..bf891081dcc2a6a3dabfb3a1ddd14783634875a5 100644 (file)
--- a/hw/char/cmsdk-apb-uart.c
+++ b/hw/char/cmsdk-apb-uart.c
@@ -20,7 +20,7 @@
 #include "qemu/module.h"
 #include "qapi/error.h"
 #include "trace.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/core/registerfields.h"
 #include "chardev/char-fe.h"

diff --git a/hw/char/digic-uart.c b/hw/char/digic-uart.c
index 8a704dfcf50386c3c658eb7ce35771a795994388..bd669173f0194a8ab21655915fe02da31fd13e7f 100644 (file)
--- a/hw/char/digic-uart.c
+++ b/hw/char/digic-uart.c
@@ -27,7 +27,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "chardev/char-fe.h"
 #include "qemu/log.h"

diff --git a/hw/char/escc.c b/hw/char/escc.c
index a2fb682f8becd3073296a5717e22ff751ec5f414..3b46818ecc9873d64c5cc6f26298c46dca9a93dc 100644 (file)
--- a/hw/char/escc.c
+++ b/hw/char/escc.c
@@ -26,7 +26,7 @@
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/core/qdev-properties-system.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"
 #include "hw/char/escc.h"

diff --git a/hw/char/exynos4210_uart.c b/hw/char/exynos4210_uart.c
index d1c2f24915095e7331c26048e99c608e59aa08e9..46fc4e31b83910b12da79d6c919c101b853db08d 100644 (file)
--- a/hw/char/exynos4210_uart.c
+++ b/hw/char/exynos4210_uart.c
@@ -20,7 +20,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"

diff --git a/hw/char/goldfish_tty.c b/hw/char/goldfish_tty.c
index 35bcb2a9676b9a1d4d536ad5763400abbc6aff19..8e1e9228c78b33d9f19a14e6ea470bfaa809bc72 100644 (file)
--- a/hw/char/goldfish_tty.c
+++ b/hw/char/goldfish_tty.c
@@ -10,7 +10,7 @@
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties-system.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "chardev/char-fe.h"
 #include "qemu/log.h"

diff --git a/hw/char/grlib_apbuart.c b/hw/char/grlib_apbuart.c
index 7be847d093243cf05081462738d969adf4f4c6fb..92f534552eefc6f61c5b09547f431d95dd543dd0 100644 (file)
--- a/hw/char/grlib_apbuart.c
+++ b/hw/char/grlib_apbuart.c
@@ -29,7 +29,7 @@
 #include "hw/core/qdev-properties.h"
 #include "hw/core/qdev-properties-system.h"
 #include "hw/char/grlib_uart.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/module.h"
 #include "chardev/char-fe.h"
 

diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c
index 51edf917c9430eb2a1b9e80fded2491836e61c15..24fd42da06387450e78d9edc11589e021e869c20 100644 (file)
--- a/hw/char/mcf_uart.c
+++ b/hw/char/mcf_uart.c
@@ -8,7 +8,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/module.h"
 #include "qapi/error.h"
 #include "hw/m68k/mcf.h"

diff --git a/hw/char/pl011.c b/hw/char/pl011.c
index 0b0af6779884c0980c9b48399cb5affe5eee378f..ac453c1057fffd15efc39f4da0a335e76cfb495b 100644 (file)
--- a/hw/char/pl011.c
+++ b/hw/char/pl011.c
@@ -22,7 +22,7 @@
 #include "qapi/error.h"
 #include "hw/char/pl011.h"
 #include "hw/core/irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/qdev-clock.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/core/qdev-properties-system.h"

diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c
index b3bed2bb7bfb3df919ef7ba8ea57b1bb4b8b29bf..10f96e3a44bc1e762865d1ea7c3423f0ecf6ba04 100644 (file)
--- a/hw/char/sh_serial.c
+++ b/hw/char/sh_serial.c
@@ -26,7 +26,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev.h"
 #include "hw/core/qdev-properties.h"

diff --git a/hw/char/xilinx_uartlite.c b/hw/char/xilinx_uartlite.c
index ba7e9e339b651937eda7fbb55ca7a3950a5bfd4b..3ef99adadda93a2d8b0524c669bed4e78d22b0d5 100644 (file)
--- a/hw/char/xilinx_uartlite.c
+++ b/hw/char/xilinx_uartlite.c
@@ -29,7 +29,7 @@
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/core/qdev-properties-system.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/module.h"
 #include "chardev/char-fe.h"
 #include "qom/object.h"

diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index a3b41286ea025ad28965cd86cc6242327703cb8e..fc3425a8fe1a4f3a716102a6cdcb126b0ed3bc0d 100644 (file)
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -35,7 +35,7 @@
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/core/boards.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/qdev-clock.h"
 #include "migration/vmstate.h"
 #include "trace.h"

diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c
index ae447c1196a1be52a51e96ed426e22db5e8368f3..3adf2f2faf24ba0a05dd87c810c6ac487e553a4b 100644 (file)
--- a/hw/core/sysbus.c
+++ b/hw/core/sysbus.c
@@ -19,7 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "monitor/monitor.h"
 #include "system/address-spaces.h"
 

diff --git a/hw/display/apple-gfx-mmio.m b/hw/display/apple-gfx-mmio.m
index b83f5f4fe624f3644dd8421b66acb9cce7efdc6f..983fc1724a0ac20b2d20f161262fdaf6fcf1f42e 100644 (file)
--- a/hw/display/apple-gfx-mmio.m
+++ b/hw/display/apple-gfx-mmio.m
@@ -15,7 +15,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "block/aio-wait.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/irq.h"
 #include "apple-gfx.h"
 #include "trace.h"

diff --git a/hw/display/artist.c b/hw/display/artist.c
index 22524d9c5fe7ae269f61b59d67a379f718261d2f..206f77afba1fe0cfeaee636b85c41bb1337d300e 100644 (file)
--- a/hw/display/artist.c
+++ b/hw/display/artist.c
@@ -14,7 +14,7 @@
 #include "qemu/units.h"
 #include "qemu/bswap.h"
 #include "qapi/error.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/loader.h"
 #include "hw/core/qdev.h"
 #include "hw/core/qdev-properties.h"

diff --git a/hw/display/cg3.c b/hw/display/cg3.c
index f4067d7825a83780fd8a9eab01e500a989cdffe5..59d66d3d4b884267f8878989cee199f879d69d0a 100644 (file)
--- a/hw/display/cg3.c
+++ b/hw/display/cg3.c
@@ -28,7 +28,7 @@
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "ui/console.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/core/irq.h"
 #include "hw/core/loader.h"

diff --git a/hw/display/exynos4210_fimd.c b/hw/display/exynos4210_fimd.c
index 8e3a61ed0e87e1d8938e4e4be27daad80949b827..7f841b88047e4711d24ddcf2cff51a1a9c648732 100644 (file)
--- a/hw/display/exynos4210_fimd.c
+++ b/hw/display/exynos4210_fimd.c
@@ -26,7 +26,7 @@
 #include "hw/core/qdev-properties.h"
 #include "hw/hw.h"
 #include "hw/core/irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "ui/console.h"
 #include "ui/pixel_ops.h"

diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c
index 8ed3e6ecc37ccd661c1d569d0b033ba658a943ca..2eefafcaf6784ce7d558c530c089160f78275015 100644 (file)
--- a/hw/display/g364fb.c
+++ b/hw/display/g364fb.c
@@ -28,7 +28,7 @@
 #include "ui/console.h"
 #include "ui/pixel_ops.h"
 #include "trace.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qom/object.h"
 

diff --git a/hw/display/jazz_led.c b/hw/display/jazz_led.c
index 90e82b58be29082a4afb752fce4d9033f9b021f4..9d62e51bed929e8c2756fcaf466c18ff5d79b4c1 100644 (file)
--- a/hw/display/jazz_led.c
+++ b/hw/display/jazz_led.c
@@ -27,7 +27,7 @@
 #include "ui/console.h"
 #include "ui/pixel_ops.h"
 #include "trace.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qom/object.h"
 

diff --git a/hw/display/macfb.c b/hw/display/macfb.c
index fa3572ead34c4d7eeb1df02421af0c945dcc535f..388f8de5070ae13a2bbf277b70fdba447ac8e270 100644 (file)
--- a/hw/display/macfb.c
+++ b/hw/display/macfb.c
@@ -12,7 +12,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/units.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "ui/console.h"
 #include "ui/pixel_ops.h"
 #include "hw/nubus/nubus.h"

diff --git a/hw/display/pl110.c b/hw/display/pl110.c
index 2537c2646251d1ae23391d68fd1a16376b272af8..4cd62a98757aaa431f50968ef06b7101f0c52b44 100644 (file)
--- a/hw/display/pl110.c
+++ b/hw/display/pl110.c
@@ -9,7 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "ui/console.h"

diff --git a/hw/display/sm501.c b/hw/display/sm501.c
index 6ccec03fe72dded70e7c93498c820f6777bbeb8f..a07aa9886f90acf2038f3c4dad6fb25983302fb8 100644 (file)
--- a/hw/display/sm501.c
+++ b/hw/display/sm501.c
@@ -32,7 +32,7 @@
 #include "hw/usb/hcd-ohci.h"
 #include "hw/char/serial-mm.h"
 #include "ui/console.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/pci/pci_device.h"
 #include "hw/core/qdev-properties.h"

diff --git a/hw/display/tcx.c b/hw/display/tcx.c
index b208923523a13ad1ff07c0a9cfdfbc0c919d939d..7cba3e25a787ab51ef530018a485bc626b0b8a6e 100644 (file)
--- a/hw/display/tcx.c
+++ b/hw/display/tcx.c
@@ -29,7 +29,7 @@
 #include "ui/pixel_ops.h"
 #include "hw/core/loader.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"

diff --git a/hw/display/vga-mmio.c b/hw/display/vga-mmio.c
index 4c497b70f418aeeb535f0f170b499984c1e2a2ff..1a9608d865f3e8132a8d300d5064042aff33582f 100644 (file)
--- a/hw/display/vga-mmio.c
+++ b/hw/display/vga-mmio.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/display/vga.h"
 #include "hw/core/qdev-properties.h"
 #include "ui/console.h"

diff --git a/hw/dma/pl080.c b/hw/dma/pl080.c
index bd61d8ed4881aca1e4bdb4c6ef2b833f95c20140..514206b7c31c0e78e4cd24402574cb1129a2b1db 100644 (file)
--- a/hw/dma/pl080.c
+++ b/hw/dma/pl080.c
@@ -8,7 +8,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c
index 4f00092f856410a7d72e1fef19c605fc75486484..5a8df39d8f51c85af3a47ccdb8e4ffba2bbb18ea 100644 (file)
--- a/hw/dma/pl330.c
+++ b/hw/dma/pl330.c
@@ -18,7 +18,7 @@
 #include "qemu/cutils.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"
 #include "qemu/timer.h"

diff --git a/hw/dma/rc4030.c b/hw/dma/rc4030.c
index 8ce74257b62293e3ef74b8730e609b8e09a452cc..93db286e690c8f44f1e5645692d1143c030ca47d 100644 (file)
--- a/hw/dma/rc4030.c
+++ b/hw/dma/rc4030.c
@@ -26,7 +26,7 @@
 #include "qemu/units.h"
 #include "hw/core/irq.h"
 #include "hw/mips/mips.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"
 #include "qemu/timer.h"

diff --git a/hw/dma/sifive_pdma.c b/hw/dma/sifive_pdma.c
index 2fbc37ffd14b4f542be4e4121be280e7bfb61c21..2844515b2d76ce245212dd0f5bb6540545ee8578 100644 (file)
--- a/hw/dma/sifive_pdma.c
+++ b/hw/dma/sifive_pdma.c
@@ -26,7 +26,7 @@
 #include "qapi/error.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "system/dma.h"
 #include "hw/dma/sifive_pdma.h"

diff --git a/hw/dma/sparc32_dma.c b/hw/dma/sparc32_dma.c
index 5601d221ec268ba63654d4cb64136cff4a587c70..5b7705998659269a3ff736e578aaecf2ff873c45 100644 (file)
--- a/hw/dma/sparc32_dma.c
+++ b/hw/dma/sparc32_dma.c
@@ -30,7 +30,7 @@
 #include "hw/core/qdev-properties.h"
 #include "hw/sparc/sparc32_dma.h"
 #include "hw/sparc/sun4m_iommu.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "system/dma.h"
 #include "qapi/error.h"

diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c
index 90ba7bf0573236e75687c22740b20fc5c304f4bf..8488f125b5f84561df74849496a9d4fc86422c1f 100644 (file)
--- a/hw/dma/xilinx_axidma.c
+++ b/hw/dma/xilinx_axidma.c
@@ -23,7 +23,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qapi/error.h"
 #include "qemu/timer.h"
 #include "hw/hw.h"

diff --git a/hw/dma/xlnx_csu_dma.c b/hw/dma/xlnx_csu_dma.c
index b390d0926997d66154a306c812e54af0830f33a8..436f9915e028df4fd8a08ae2a7d78fb9dde073f2 100644 (file)
--- a/hw/dma/xlnx_csu_dma.c
+++ b/hw/dma/xlnx_csu_dma.c
@@ -23,7 +23,7 @@
 #include "qapi/error.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "system/dma.h"
 #include "hw/core/ptimer.h"

diff --git a/hw/gpio/bcm2835_gpio.c b/hw/gpio/bcm2835_gpio.c
index bd9170b8932f3ea748e23999c8d0d96a464ff9d2..d7c44ea2abe3db7395db4d00d3013298a842f865 100644 (file)
--- a/hw/gpio/bcm2835_gpio.c
+++ b/hw/gpio/bcm2835_gpio.c
@@ -16,7 +16,7 @@
 #include "qemu/module.h"
 #include "qemu/timer.h"
 #include "qapi/error.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/sd/sd.h"
 #include "hw/gpio/bcm2835_gpio.h"

diff --git a/hw/gpio/bcm2838_gpio.c b/hw/gpio/bcm2838_gpio.c
index dab50faf28502f07dbb0235d53c891f9bb66492a..4ae7706b9a0f51448cf713d6ffaf049a5ff97525 100644 (file)
--- a/hw/gpio/bcm2838_gpio.c
+++ b/hw/gpio/bcm2838_gpio.c
@@ -15,7 +15,7 @@
 #include "qemu/module.h"
 #include "qemu/timer.h"
 #include "qapi/error.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/sd/sd.h"
 #include "hw/gpio/bcm2838_gpio.h"

diff --git a/hw/gpio/gpio_key.c b/hw/gpio/gpio_key.c
index f8cf4da239a9742f272234ae5d381cf27777eb12..14e0fb9d4cb23626535e8fb075a590583775156a 100644 (file)
--- a/hw/gpio/gpio_key.c
+++ b/hw/gpio/gpio_key.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"
 #include "qemu/timer.h"

diff --git a/hw/gpio/gpio_pwr.c b/hw/gpio/gpio_pwr.c
index 2d14f8b344c0fd58b0f9a1a91d8e521c50e5fd6f..a60b24a55352011b2414fa485520307943b8f8e3 100644 (file)
--- a/hw/gpio/gpio_pwr.c
+++ b/hw/gpio/gpio_pwr.c
@@ -23,7 +23,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "system/runstate.h"
 
 #define TYPE_GPIOPWR "gpio-pwr"

diff --git a/hw/gpio/mpc8xxx.c b/hw/gpio/mpc8xxx.c
index 377832e9d245900914edd31b837bc34feeb88e73..2e882329f0fc064ed38b88cbb5d3bc1176dd9d55 100644 (file)
--- a/hw/gpio/mpc8xxx.c
+++ b/hw/gpio/mpc8xxx.c
@@ -21,7 +21,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qom/object.h"
 

diff --git a/hw/gpio/omap_gpio.c b/hw/gpio/omap_gpio.c
index 0c2a0f9aa6c1ec6a39de1cd45e506d13ddbfbe0c..f7619260ca79337f136c1070480199ee0348b6ec 100644 (file)
--- a/hw/gpio/omap_gpio.c
+++ b/hw/gpio/omap_gpio.c
@@ -23,7 +23,7 @@
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/arm/omap.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "qapi/error.h"

diff --git a/hw/gpio/pl061.c b/hw/gpio/pl061.c
index 55f51b6cf20277f5af5032d206bbb2a0fcb6672a..d6a4fb90b961f4c11aac8df13d044a73d034a79e 100644 (file)
--- a/hw/gpio/pl061.c
+++ b/hw/gpio/pl061.c
@@ -31,7 +31,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"

diff --git a/hw/gpio/zaurus.c b/hw/gpio/zaurus.c
index 0a9f76e7743b70b183966fc85b3be1d37661a14f..3cf626a550d12627c007fcc6823305cc592dc7fe 100644 (file)
--- a/hw/gpio/zaurus.c
+++ b/hw/gpio/zaurus.c
@@ -18,7 +18,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"
 #include "qemu/log.h"

diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c
index 86b53a23ade559ca3bad0a1c263e270ff3cb82e7..c01f33923603191e538c9430217a01e40ae55823 100644 (file)
--- a/hw/hyperv/vmbus.c
+++ b/hw/hyperv/vmbus.c
@@ -18,7 +18,7 @@
 #include "hw/hyperv/hyperv.h"
 #include "hw/hyperv/vmbus.h"
 #include "hw/hyperv/vmbus-bridge.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "exec/target_page.h"
 #include "trace.h"
 

diff --git a/hw/i2c/aspeed_i2c.c b/hw/i2c/aspeed_i2c.c
index 1f9ce131bf70555785649e6df2a03686654dbf58..faf2160c067061ac781d768a2edd9c332f3aa51b 100644 (file)
--- a/hw/i2c/aspeed_i2c.c
+++ b/hw/i2c/aspeed_i2c.c
@@ -19,7 +19,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/cutils.h"
 #include "qemu/log.h"

diff --git a/hw/i2c/bitbang_i2c.c b/hw/i2c/bitbang_i2c.c
index d379cfd775110572179b8299c7a504e1ccb5bbc6..1f5d66ce33d93c140e64f6e95095ef8043fcfe89 100644 (file)
--- a/hw/i2c/bitbang_i2c.c
+++ b/hw/i2c/bitbang_i2c.c
@@ -13,7 +13,7 @@
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
 #include "hw/i2c/bitbang_i2c.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/module.h"
 #include "qom/object.h"
 #include "trace.h"

diff --git a/hw/i2c/exynos4210_i2c.c b/hw/i2c/exynos4210_i2c.c
index dd72dda4fd0a998b49f7fac8ab6dba573cef47da..9fac588e82ee21b3bfb2d1fb1b54c76c3d86d6e9 100644 (file)
--- a/hw/i2c/exynos4210_i2c.c
+++ b/hw/i2c/exynos4210_i2c.c
@@ -23,7 +23,7 @@
 #include "qemu/osdep.h"
 #include "qemu/module.h"
 #include "qemu/timer.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/i2c/i2c.h"
 #include "hw/core/irq.h"

diff --git a/hw/i2c/i2c_mux_pca954x.c b/hw/i2c/i2c_mux_pca954x.c
index 7802c68452f32693dd2c61c327269ac2bccb130d..c6034460284b57abacac18c08b5827c1ab9a91ec 100644 (file)
--- a/hw/i2c/i2c_mux_pca954x.c
+++ b/hw/i2c/i2c_mux_pca954x.c
@@ -21,7 +21,7 @@
 #include "hw/i2c/smbus_slave.h"
 #include "hw/core/qdev.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "qemu/queue.h"

diff --git a/hw/i2c/mpc_i2c.c b/hw/i2c/mpc_i2c.c
index e2097f819cedb1688f57ddf0f1a0bef4d2daae5d..abb2240f9f3a5b06d2ec7829b96c334cc8a83b3a 100644 (file)
--- a/hw/i2c/mpc_i2c.c
+++ b/hw/i2c/mpc_i2c.c
@@ -20,7 +20,7 @@
 #include "qemu/osdep.h"
 #include "hw/i2c/i2c.h"
 #include "hw/core/irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qom/object.h"
 #include "trace.h"

diff --git a/hw/i2c/omap_i2c.c b/hw/i2c/omap_i2c.c
index c768f99e384756385e0e908403219b23ef9d20ca..e0798f2c8a54296b34293c613ae1a4f649b42641 100644 (file)
--- a/hw/i2c/omap_i2c.c
+++ b/hw/i2c/omap_i2c.c
@@ -24,7 +24,7 @@
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/arm/omap.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 

diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
index f744be9f70f546a25ea0ccfce58528f6643c23e8..224b7b947906589c49c26bf4f7cd1ff81a46bd1f 100644 (file)
--- a/hw/i386/intel_iommu.c
+++ b/hw/i386/intel_iommu.c
@@ -23,7 +23,7 @@
 #include "qemu/error-report.h"
 #include "qemu/main-loop.h"
 #include "qapi/error.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "intel_iommu_internal.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_bus.h"

diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c
index 310b9a8eb5a0d508c3bc7feda282f9ded42e3b8e..8ca88afae24bc04b8b891f9909c687054c1023ca 100644 (file)
--- a/hw/i386/kvm/clock.c
+++ b/hw/i386/kvm/clock.c
@@ -21,7 +21,7 @@
 #include "system/hw_accel.h"
 #include "kvm/kvm_i386.h"
 #include "migration/vmstate.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/i386/kvm/clock.h"
 #include "hw/core/qdev-properties.h"
 #include "qapi/error.h"

diff --git a/hw/i386/kvm/xen_evtchn.c b/hw/i386/kvm/xen_evtchn.c
index a510ab871defa25bc074a1207a5d4b4a871fc343..b65871f3542a01f80d066d3281c30775a046cfda 100644 (file)
--- a/hw/i386/kvm/xen_evtchn.c
+++ b/hw/i386/kvm/xen_evtchn.c
@@ -27,7 +27,7 @@
 #include "migration/vmstate.h"
 #include "trace.h"
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/xen/xen.h"
 #include "hw/i386/x86.h"
 #include "hw/i386/pc.h"

diff --git a/hw/i386/kvm/xen_evtchn.h b/hw/i386/kvm/xen_evtchn.h
index 0521ebc0922ac768338fd3442eb0627db14fc13b..8d339db5601ace1f6a4ad4ac68a1a2110464e91f 100644 (file)
--- a/hw/i386/kvm/xen_evtchn.h
+++ b/hw/i386/kvm/xen_evtchn.h
@@ -12,7 +12,7 @@
 #ifndef QEMU_XEN_EVTCHN_H
 #define QEMU_XEN_EVTCHN_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 typedef uint32_t evtchn_port_t;
 

diff --git a/hw/i386/kvm/xen_gnttab.c b/hw/i386/kvm/xen_gnttab.c
index 4b9e272c5eb049cd51a01d0564a602571b911c57..85b324e62d055e3b820600b6671f9a949d9f1133 100644 (file)
--- a/hw/i386/kvm/xen_gnttab.c
+++ b/hw/i386/kvm/xen_gnttab.c
@@ -20,7 +20,7 @@
 #include "system/address-spaces.h"
 #include "migration/vmstate.h"
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/xen/xen.h"
 #include "hw/xen/xen_backend_ops.h"
 #include "xen_overlay.h"

diff --git a/hw/i386/kvm/xen_overlay.c b/hw/i386/kvm/xen_overlay.c
index 3cb73619371840cd707506c109441a350e216986..74cadffb7287643b35b7e83897206a1cd3272a78 100644 (file)
--- a/hw/i386/kvm/xen_overlay.c
+++ b/hw/i386/kvm/xen_overlay.c
@@ -19,7 +19,7 @@
 #include "system/address-spaces.h"
 #include "migration/vmstate.h"
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/xen/xen.h"
 #include "xen_overlay.h"
 

diff --git a/hw/i386/kvm/xen_primary_console.c b/hw/i386/kvm/xen_primary_console.c
index 6e9d6417c3eb8232c117af1b3108cddb634f9696..bf61f6235be996746ed50bc41a09ed0d82e7ae7f 100644 (file)
--- a/hw/i386/kvm/xen_primary_console.c
+++ b/hw/i386/kvm/xen_primary_console.c
@@ -13,7 +13,7 @@
 
 #include "qapi/error.h"
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/xen/xen.h"
 #include "hw/xen/xen_backend_ops.h"
 #include "xen_evtchn.h"

diff --git a/hw/i386/kvm/xen_xenstore.c b/hw/i386/kvm/xen_xenstore.c
index 42955cccd909b878e418be8123380c3defb49cdd..0dc0edf3bfdd95095a68bb2aae35f7d0a9188682 100644 (file)
--- a/hw/i386/kvm/xen_xenstore.c
+++ b/hw/i386/kvm/xen_xenstore.c
@@ -20,7 +20,7 @@
 #include "qom/object.h"
 #include "migration/vmstate.h"
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/xen/xen.h"
 #include "hw/xen/xen_backend_ops.h"
 #include "xen_overlay.h"

diff --git a/hw/i386/microvm-dt.c b/hw/i386/microvm-dt.c
index 81eaddafc8ba9bea13d6b1b3df9881308dfc1e5a..45fbb5bbd150f59d7a9047ca1d0aaa93a28b43dd 100644 (file)
--- a/hw/i386/microvm-dt.c
+++ b/hw/i386/microvm-dt.c
@@ -37,7 +37,7 @@
 #include "hw/char/serial-isa.h"
 #include "hw/i386/fw_cfg.h"
 #include "hw/rtc/mc146818rtc.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/virtio/virtio-mmio.h"
 #include "hw/usb/xhci.h"
 

diff --git a/hw/i386/nitro_enclave.c b/hw/i386/nitro_enclave.c
index 5ee50f3b858600577e729ed31ec5bfc8896eb0ec..640b1d8c548e23b1023cc14c8813e147c33feca3 100644 (file)
--- a/hw/i386/nitro_enclave.c
+++ b/hw/i386/nitro_enclave.c
@@ -14,7 +14,7 @@
 #include "qom/object_interfaces.h"
 
 #include "chardev/char.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/eif.h"
 #include "hw/i386/x86.h"
 #include "hw/i386/microvm.h"

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 3f8fd0783187e6f383d7c3d13a24a90b35839b2c..2e2671d60502c6adf04e1966a3e46371a74a1bb0 100644 (file)
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -41,7 +41,7 @@
 #include "hw/core/irq.h"
 #include "system/kvm.h"
 #include "hw/i386/kvm/clock.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/i2c/smbus_eeprom.h"
 #include "system/memory.h"
 #include "hw/acpi/acpi.h"

diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c
index 906df5e788624763ad585c7c923b052e64d25183..d8a86756ca49ea30bb880b8c21b76f1ea74e1c20 100644 (file)
--- a/hw/i386/pc_sysfw.c
+++ b/hw/i386/pc_sysfw.c
@@ -29,7 +29,7 @@
 #include "qemu/error-report.h"
 #include "qemu/option.h"
 #include "qemu/units.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/i386/x86.h"
 #include "hw/i386/pc.h"
 #include "hw/core/loader.h"

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

diff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c
index 21e0d40e1143f0312001ad874843db67fba805b2..33ac0bfc97e89a743ae581b1c5a0d8a1a2eb87cd 100644 (file)
--- a/hw/i386/x86-iommu.c
+++ b/hw/i386/x86-iommu.c
@@ -18,7 +18,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/i386/x86-iommu.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/i386/pc.h"

diff --git a/hw/ide/mmio.c b/hw/ide/mmio.c
index 04b56ac5d866663cd93120b8d87710445e3bc394..0de904ac56af2134b7621cc636e0ec4ffbd73f99 100644 (file)
--- a/hw/ide/mmio.c
+++ b/hw/ide/mmio.c
@@ -24,7 +24,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"
 #include "system/dma.h"

diff --git a/hw/input/lasips2.c b/hw/input/lasips2.c
index e34e9cb5c022587ee2a2313437c65c0ea16f7fee..c03a127f3df8d1f8f9d8176d6922afe005b57c33 100644 (file)
--- a/hw/input/lasips2.c
+++ b/hw/input/lasips2.c
@@ -24,7 +24,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/input/ps2.h"
 #include "hw/input/lasips2.h"
 #include "exec/hwaddr.h"

diff --git a/hw/input/pl050.c b/hw/input/pl050.c
index cb8efc74f77b9c931cb22b454c8cee201682c2f2..48df2734e269ffc0c70012a97c30b3878ccc6ab2 100644 (file)
--- a/hw/input/pl050.c
+++ b/hw/input/pl050.c
@@ -16,7 +16,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/input/ps2.h"
 #include "hw/input/pl050.h"

diff --git a/hw/input/ps2.c b/hw/input/ps2.c
index 96850124a7ba90d2e1b51f70691b423565823686..10ac7324030bf40c172f4a9efe2e116fcd1d8843 100644 (file)
--- a/hw/input/ps2.c
+++ b/hw/input/ps2.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "hw/core/irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/input/ps2.h"
 #include "migration/vmstate.h"
 #include "ui/console.h"

diff --git a/hw/intc/allwinner-a10-pic.c b/hw/intc/allwinner-a10-pic.c
index 0e1ec521e428fe1959683397d3669925c59cfdcb..8e17a77c8013c8f6dfff8efe1c7f503d9952d330 100644 (file)
--- a/hw/intc/allwinner-a10-pic.c
+++ b/hw/intc/allwinner-a10-pic.c
@@ -16,7 +16,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/intc/allwinner-a10-pic.h"
 #include "hw/core/irq.h"

diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c
index afac20440f822ab43926f212ab1cd426f312efae..4e9e308994570715b5469629e3f1989b346faac3 100644 (file)
--- a/hw/intc/apic_common.c
+++ b/hw/intc/apic_common.c
@@ -30,7 +30,7 @@
 #include "hw/core/boards.h"
 #include "system/kvm.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 
 bool apic_report_tpr_access;

diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c
index e27bb20bf8c12b3fb4bb5640bbc0e13c72559c5f..4d0cb125a61e679e55fcb6a277421e2a1ae9f876 100644 (file)
--- a/hw/intc/arm_gic.c
+++ b/hw/intc/arm_gic.c
@@ -20,7 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "gic_internal.h"
 #include "qapi/error.h"
 #include "hw/core/cpu.h"

diff --git a/hw/intc/arm_gicv2m.c b/hw/intc/arm_gicv2m.c
index c39d31b1870aa32a3aa4e5df13015ebd4d3b3811..b343e17ca53405d65a6864ddaa5c653e06ff8fbe 100644 (file)
--- a/hw/intc/arm_gicv2m.c
+++ b/hw/intc/arm_gicv2m.c
@@ -27,7 +27,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/irq.h"
 #include "hw/pci/msi.h"
 #include "hw/core/qdev-properties.h"

diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c
index 5fa210c63357f80875af27349b202acf9aa594b3..3a31eb56f362e9ecd9013bbe5d1deb64a74565f2 100644 (file)
--- a/hw/intc/armv7m_nvic.c
+++ b/hw/intc/armv7m_nvic.c
@@ -12,7 +12,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/timer.h"
 #include "hw/intc/armv7m_nvic.h"

diff --git a/hw/intc/exynos4210_combiner.c b/hw/intc/exynos4210_combiner.c
index 8bea69d91b7c27b943ebd1c9199e98e40fa4e66c..ec935a084db2cfe81269963039128dbc3c825b97 100644 (file)
--- a/hw/intc/exynos4210_combiner.c
+++ b/hw/intc/exynos4210_combiner.c
@@ -28,7 +28,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"
 #include "hw/intc/exynos4210_combiner.h"

diff --git a/hw/intc/exynos4210_gic.c b/hw/intc/exynos4210_gic.c
index a65c9c6d28ba75b08f82e01b60254f05aaf838b1..d15e41174a9328019d7b283284af55cdbab32710 100644 (file)
--- a/hw/intc/exynos4210_gic.c
+++ b/hw/intc/exynos4210_gic.c
@@ -21,7 +21,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"
 #include "qemu/module.h"

diff --git a/hw/intc/goldfish_pic.c b/hw/intc/goldfish_pic.c
index 96e7d5c225ff2d10b5daacd0da5d1578460b3c28..16f351a30d3012fafe89325406a6c4c8e3de028e 100644 (file)
--- a/hw/intc/goldfish_pic.c
+++ b/hw/intc/goldfish_pic.c
@@ -10,7 +10,7 @@
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "trace.h"

diff --git a/hw/intc/grlib_irqmp.c b/hw/intc/grlib_irqmp.c
index ce7cbc98c1719f9660c4ef6b98e792bf43181a93..d860ec15d880aa870888087ed105e4901c19da90 100644 (file)
--- a/hw/intc/grlib_irqmp.c
+++ b/hw/intc/grlib_irqmp.c
@@ -28,7 +28,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #include "hw/core/qdev-properties.h"
 #include "hw/intc/grlib_irqmp.h"

diff --git a/hw/intc/ioapic_common.c b/hw/intc/ioapic_common.c
index fce3486e519a031d86ac8b05fe10d0ad75fe8454..d3bcd5699f528054b81b0163e6423d728a569d29 100644 (file)
--- a/hw/intc/ioapic_common.c
+++ b/hw/intc/ioapic_common.c
@@ -26,7 +26,7 @@
 #include "hw/intc/intc.h"
 #include "hw/intc/ioapic.h"
 #include "hw/intc/ioapic_internal.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 /* ioapic_no count start from 0 to MAX_IOAPICS,
  * remove as static variable from ioapic_common_init.

diff --git a/hw/intc/ioapic_internal.h b/hw/intc/ioapic_internal.h
index 51205767f44a77a22247c0fb08129ba287cef594..499b997d4b74ac8c0e3c37daff649d2f588387c4 100644 (file)
--- a/hw/intc/ioapic_internal.h
+++ b/hw/intc/ioapic_internal.h
@@ -24,7 +24,7 @@
 
 #include "system/memory.h"
 #include "hw/intc/ioapic.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/notify.h"
 #include "qom/object.h"
 

diff --git a/hw/intc/loongarch_dintc.c b/hw/intc/loongarch_dintc.c
index 574e4a0d2773fc96b92d52a69ba5d9afef1e3ac9..c42a919df4ada006da45c26aae7f2098fe441826 100644 (file)
--- a/hw/intc/loongarch_dintc.c
+++ b/hw/intc/loongarch_dintc.c
@@ -6,7 +6,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/irq.h"
 #include "hw/intc/loongarch_pch_msi.h"
 #include "hw/intc/loongarch_pch_pic.h"

diff --git a/hw/intc/loongarch_pch_msi.c b/hw/intc/loongarch_pch_msi.c
index 63090b272619af976e19a4f0e1d56c66e3f7f507..3656c6cea975a80b363b45dc8a5868a1d88c86b6 100644 (file)
--- a/hw/intc/loongarch_pch_msi.c
+++ b/hw/intc/loongarch_pch_msi.c
@@ -6,7 +6,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/irq.h"
 #include "hw/intc/loongarch_pch_msi.h"
 #include "hw/intc/loongarch_pch_pic.h"

diff --git a/hw/intc/loongson_ipi_common.c b/hw/intc/loongson_ipi_common.c
index b3d8e781ca16869b5985da37027dd23f606ce8a1..d9d8a374d36e6425ef723db3ee5022c4d659d43a 100644 (file)
--- a/hw/intc/loongson_ipi_common.c
+++ b/hw/intc/loongson_ipi_common.c
@@ -6,7 +6,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/intc/loongson_ipi_common.h"
 #include "hw/core/irq.h"
 #include "qemu/log.h"

diff --git a/hw/intc/mips_gic.c b/hw/intc/mips_gic.c
index e983f3a2b58a0c06cd97011b9137759dbc690f2e..ad9363a4c7d3eb08b77fc688c19d43361de5aade 100644 (file)
--- a/hw/intc/mips_gic.c
+++ b/hw/intc/mips_gic.c
@@ -13,7 +13,7 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "qapi/error.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "system/memory.h"
 #include "system/kvm.h"
 #include "system/reset.h"

diff --git a/hw/intc/omap_intc.c b/hw/intc/omap_intc.c
index deb21f9dc194899cdd32e14a388d37667ff9286d..b2438d2d5f834cdcbc48722ead8738dda9a297b6 100644 (file)
--- a/hw/intc/omap_intc.c
+++ b/hw/intc/omap_intc.c
@@ -22,7 +22,7 @@
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/arm/omap.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "qapi/error.h"

diff --git a/hw/intc/ompic.c b/hw/intc/ompic.c
index 05f0ef82549c8155f6d7f6469e802b501b1ece24..58736cd8a0c3a4e36b99f8c0b347ea67b2ebe6ed 100644 (file)
--- a/hw/intc/ompic.c
+++ b/hw/intc/ompic.c
@@ -11,7 +11,7 @@
 #include "qapi/error.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "system/memory.h"
 #include "qom/object.h"

diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c
index 4cc5068ffc84d62cd75fbb86e36edc4dd20f2793..cd353a04f535da036a401dd965d052019cc15776 100644 (file)
--- a/hw/intc/openpic.c
+++ b/hw/intc/openpic.c
@@ -36,7 +36,7 @@
 #include "hw/ppc/openpic.h"
 #include "hw/ppc/ppc_e500.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/pci/msi.h"
 #include "qapi/error.h"

diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c
index 6558135baa155bf7bb3906aa648d4df72d3ddf28..9aafef5d9eb8ee60e1fdd988e53955fafac3487a 100644 (file)
--- a/hw/intc/openpic_kvm.c
+++ b/hw/intc/openpic_kvm.c
@@ -29,7 +29,7 @@
 #include "hw/ppc/openpic_kvm.h"
 #include "hw/pci/msi.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "system/kvm.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/intc/pl190.c b/hw/intc/pl190.c
index f1e4959e9aefd67d31a968a9e4b7701178948ea0..d53292d15e83367a583c4d27d53da5b5fe08fd82 100644 (file)
--- a/hw/intc/pl190.c
+++ b/hw/intc/pl190.c
@@ -9,7 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/intc/riscv_aclint.c b/hw/intc/riscv_aclint.c
index 83968ad7cca23e07cb5be1fcd3111efc3e3835ae..9c1491bd043d6d5d85f05af9eb4400eee0cdc5c2 100644 (file)
--- a/hw/intc/riscv_aclint.c
+++ b/hw/intc/riscv_aclint.c
@@ -26,7 +26,7 @@
 #include "qemu/error-report.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "target/riscv/cpu.h"
 #include "target/riscv/time_helper.h"
 #include "hw/core/qdev-properties.h"

diff --git a/hw/intc/riscv_aplic.c b/hw/intc/riscv_aplic.c
index cc5f30b5588b0c11f593761c4a3762809116d37a..92ff0ecaa74f550640a4c056124c44fe344cb93f 100644 (file)
--- a/hw/intc/riscv_aplic.c
+++ b/hw/intc/riscv_aplic.c
@@ -23,7 +23,7 @@
 #include "qemu/error-report.h"
 #include "qemu/bswap.h"
 #include "system/address-spaces.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/pci/msi.h"
 #include "hw/core/boards.h"
 #include "hw/core/qdev-properties.h"

diff --git a/hw/intc/riscv_imsic.c b/hw/intc/riscv_imsic.c
index bc580c000ef5a3870ad6950ca22b98a6f2d9877a..7c9a01203359a6c0c4a159fdb658f7f54c00b2a0 100644 (file)
--- a/hw/intc/riscv_imsic.c
+++ b/hw/intc/riscv_imsic.c
@@ -23,7 +23,7 @@
 #include "qemu/error-report.h"
 #include "qemu/bswap.h"
 #include "system/address-spaces.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/pci/msi.h"
 #include "hw/core/boards.h"
 #include "hw/core/qdev-properties.h"

diff --git a/hw/intc/s390_flic.c b/hw/intc/s390_flic.c
index 508b58382ed8ea8cbc901f8247b43f6f9aaaff37..57fd4b2b81c8b46f09ba30e3643e6ad09caf118d 100644 (file)
--- a/hw/intc/s390_flic.c
+++ b/hw/intc/s390_flic.c
@@ -14,7 +14,7 @@
 #include "qemu/error-report.h"
 #include "qemu/main-loop.h"
 #include "qemu/module.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/s390x/ioinst.h"
 #include "hw/s390x/s390_flic.h"
 #include "hw/core/qdev-properties.h"

diff --git a/hw/intc/sifive_plic.c b/hw/intc/sifive_plic.c
index 5df578822f9e74b717c14f79f152d00967eceb9a..9c84ff06a9fd107bf8b9468b6536a6a5d6d2ddae 100644 (file)
--- a/hw/intc/sifive_plic.c
+++ b/hw/intc/sifive_plic.c
@@ -23,7 +23,7 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "qemu/error-report.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/pci/msi.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/intc/sifive_plic.h"

diff --git a/hw/intc/slavio_intctl.c b/hw/intc/slavio_intctl.c
index b12c8cbd69f1af9862c172f27c7ffe937aaacc5d..640d8e2baa624d975f36e684a869c700788d18c8 100644 (file)
--- a/hw/intc/slavio_intctl.c
+++ b/hw/intc/slavio_intctl.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/intc/intc.h"
 #include "hw/core/irq.h"
 #include "trace.h"

diff --git a/hw/intc/xilinx_intc.c b/hw/intc/xilinx_intc.c
index f93f0d6e7ea80232064331a465f7ca5649e19cab..782a286e43c6e1251e8188f077ddbea3539daf2f 100644 (file)
--- a/hw/intc/xilinx_intc.c
+++ b/hw/intc/xilinx_intc.c
@@ -27,7 +27,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/module.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"

diff --git a/hw/intc/xlnx-pmu-iomod-intc.c b/hw/intc/xlnx-pmu-iomod-intc.c
index b8bafe2f3f3efbd4e95dca0b032030a3baf84d9b..0d9e85473d3ff581b61dff08e98238cb038fa1e6 100644 (file)
--- a/hw/intc/xlnx-pmu-iomod-intc.c
+++ b/hw/intc/xlnx-pmu-iomod-intc.c
@@ -25,7 +25,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/core/register.h"
 #include "qemu/bitops.h"

diff --git a/hw/intc/xlnx-zynqmp-ipi.c b/hw/intc/xlnx-zynqmp-ipi.c
index e69ea74ff748ec8ebb59ecf8245e2496c9abd819..3538a0e5db97533d47afeb666fe99221dd724e2e 100644 (file)
--- a/hw/intc/xlnx-zynqmp-ipi.c
+++ b/hw/intc/xlnx-zynqmp-ipi.c
@@ -26,7 +26,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/core/register.h"
 #include "qemu/bitops.h"

diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c
index 6c9802eb7ac81616bc4055a22b231a3c8a2926e0..7e6d2ce5a94c313997f6656bb5cffc635f50c3f3 100644 (file)
--- a/hw/isa/isa-bus.c
+++ b/hw/isa/isa-bus.c
@@ -21,7 +21,7 @@
 #include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "qapi/error.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "system/system.h"
 #include "hw/isa/isa.h"
 

diff --git a/hw/m68k/mcf5206.c b/hw/m68k/mcf5206.c
index 4bc7b1d189ee08a0ebf5e677e2ff3ad10ac42ccf..c5befa02eb599514f5fbf091796a11b54c8cb296 100644 (file)
--- a/hw/m68k/mcf5206.c
+++ b/hw/m68k/mcf5206.c
@@ -17,7 +17,7 @@
 #include "qemu/timer.h"
 #include "hw/core/ptimer.h"
 #include "system/system.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 /* General purpose timer module.  */
 typedef struct {

diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c
index 3a87e1f282ca422cd70d108b0c7389ebd6db0fc4..c6d1c5fae9fae999bc9f1243cb721bde0eee2af7 100644 (file)
--- a/hw/m68k/mcf5208.c
+++ b/hw/m68k/mcf5208.c
@@ -31,7 +31,7 @@
 #include "net/net.h"
 #include "hw/core/boards.h"
 #include "hw/core/loader.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "elf.h"
 
 #define SYS_FREQ 166666666

diff --git a/hw/m68k/mcf_intc.c b/hw/m68k/mcf_intc.c
index b8770e3a53f6329b1a08cb4e18da5eafb35d1827..20112c94be19507c4f229e70cbe16de854166ccb 100644 (file)
--- a/hw/m68k/mcf_intc.c
+++ b/hw/m68k/mcf_intc.c
@@ -12,7 +12,7 @@
 #include "qemu/log.h"
 #include "cpu.h"
 #include "hw/core/irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/m68k/mcf.h"
 #include "hw/core/qdev-properties.h"
 #include "qom/object.h"

diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c
index 75ae66c311a4bc1f29918063122e7c1a02b0451b..ca3df7b887b5e7a68435ce5f852d4342c426ecc8 100644 (file)
--- a/hw/m68k/next-cube.c
+++ b/hw/m68k/next-cube.c
@@ -20,7 +20,7 @@
 #include "hw/core/boards.h"
 #include "hw/core/loader.h"
 #include "hw/scsi/esp.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 #include "hw/char/escc.h" /* ZILOG 8530 Serial Emulation */
 #include "hw/block/fdc.h"

diff --git a/hw/m68k/next-kbd.c b/hw/m68k/next-kbd.c
index 2bec945acfb11001ca9fcac7346e25cf5581319d..571a955504048e2f59611e16e1bb6ded599ed057 100644 (file)
--- a/hw/m68k/next-kbd.c
+++ b/hw/m68k/next-kbd.c
@@ -29,7 +29,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/m68k/next-cube.h"
 #include "ui/console.h"
 #include "migration/vmstate.h"

diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index 6fe030e8c5d306036bce57444fddffcd2903d5c9..25ddddb5d9fe9869bc5a07b5914ebef04badd158 100644 (file)
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -33,7 +33,7 @@
 #include "hw/core/loader.h"
 #include "ui/console.h"
 #include "hw/char/escc.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/scsi/esp.h"
 #include "standard-headers/asm-m68k/bootinfo.h"
 #include "standard-headers/asm-m68k/bootinfo-mac.h"

diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c
index 2d83919fa8688cb0d9c615365d3c2067e86335fa..7be3a2480002bb87970c9852f973c672b713f476 100644 (file)
--- a/hw/m68k/virt.c
+++ b/hw/m68k/virt.c
@@ -18,7 +18,7 @@
 #include "elf.h"
 #include "hw/core/loader.h"
 #include "ui/console.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "standard-headers/asm-m68k/bootinfo.h"
 #include "standard-headers/asm-m68k/bootinfo-virt.h"
 #include "bootinfo.h"

diff --git a/hw/mem/sparse-mem.c b/hw/mem/sparse-mem.c
index 9186da6b1a91c3299facfd09ac508c23eef4a9d3..3b754de887ea68c7dc1fbc34f435c431450471ce 100644 (file)
--- a/hw/mem/sparse-mem.c
+++ b/hw/mem/sparse-mem.c
@@ -14,7 +14,7 @@
 #include "qemu/error-report.h"
 
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qapi/error.h"
 #include "qemu/units.h"
 #include "system/qtest.h"

diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c
index 51ee237d5841c758cb0905f0225089a1f68d4562..b3bdc4d65f2e32f215725547082e3d5ee313c78a 100644 (file)
--- a/hw/microblaze/petalogix_ml605_mmu.c
+++ b/hw/microblaze/petalogix_ml605_mmu.c
@@ -29,7 +29,7 @@
 #include "qemu/units.h"
 #include "qapi/error.h"
 #include "cpu.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "net/net.h"
 #include "hw/block/flash.h"
 #include "system/system.h"

diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c
index 266ecf9e8ab8e5f5bad73d6e7e1ec3524d455bd8..2a853a7fa5f090ac844d6137286c924d7e486c54 100644 (file)
--- a/hw/microblaze/petalogix_s3adsp1800_mmu.c
+++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c
@@ -27,7 +27,7 @@
 #include "qemu/units.h"
 #include "qapi/error.h"
 #include "cpu.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "net/net.h"
 #include "hw/block/flash.h"
 #include "system/system.h"

diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c
index fb01af8ece32dd08df54e82e42ff5e36751e0866..e0adb96c5482e2d04ec4337656603fed2ea1b6d8 100644 (file)
--- a/hw/mips/jazz.c
+++ b/hw/mips/jazz.c
@@ -43,7 +43,7 @@
 #include "hw/display/bochs-vbe.h"
 #include "hw/audio/pcspk.h"
 #include "hw/input/i8042.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "system/qtest.h"
 #include "system/reset.h"
 #include "qapi/error.h"

diff --git a/hw/mips/malta.c b/hw/mips/malta.c
index e5ed0b5692317d71651f80cf197f69d6c34091ed..812ff64d831d84462f5c09321fe758ef4cc48028 100644 (file)
--- a/hw/mips/malta.c
+++ b/hw/mips/malta.c
@@ -47,7 +47,7 @@
 #include "hw/core/loader.h"
 #include "elf.h"
 #include "qom/object.h"
-#include "hw/sysbus.h"             /* SysBusDevice */
+#include "hw/core/sysbus.h"             /* SysBusDevice */
 #include "qemu/host-utils.h"
 #include "system/qtest.h"
 #include "system/reset.h"

diff --git a/hw/misc/allwinner-a10-ccm.c b/hw/misc/allwinner-a10-ccm.c
index 6b188c25a5de7f69e82a5dba182a6eb9b94a0fdc..dc7f8ff205a748802e7dba1d56e351d00df3d26a 100644 (file)
--- a/hw/misc/allwinner-a10-ccm.c
+++ b/hw/misc/allwinner-a10-ccm.c
@@ -22,7 +22,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/units.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/misc/allwinner-a10-dramc.c b/hw/misc/allwinner-a10-dramc.c
index c16814cc5b82eedb8ca7dcc54df590729d3509ad..757f2cad95725dea7b74b2a6215804743cd82f2a 100644 (file)
--- a/hw/misc/allwinner-a10-dramc.c
+++ b/hw/misc/allwinner-a10-dramc.c
@@ -22,7 +22,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/units.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/misc/allwinner-cpucfg.c b/hw/misc/allwinner-cpucfg.c
index 90dd872abf04d4215bc03c98fa5684c2251f841b..3a1526bda0d299899ce36acbebf34449c2390e02 100644 (file)
--- a/hw/misc/allwinner-cpucfg.c
+++ b/hw/misc/allwinner-cpucfg.c
@@ -19,7 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/units.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/misc/allwinner-h3-ccu.c b/hw/misc/allwinner-h3-ccu.c
index be91c0c1caeb08cd9479a4e52b8c4c894b0e2953..ac5ae01acc0eec5cc1d1eb934f815ee26cf8dc94 100644 (file)
--- a/hw/misc/allwinner-h3-ccu.c
+++ b/hw/misc/allwinner-h3-ccu.c
@@ -19,7 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/units.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/misc/allwinner-h3-dramc.c b/hw/misc/allwinner-h3-dramc.c
index ef491b36ffb79904f876e867d72c80c5a8105881..10d929a3039b96a380d1bc31d2eceea6288c2980 100644 (file)
--- a/hw/misc/allwinner-h3-dramc.c
+++ b/hw/misc/allwinner-h3-dramc.c
@@ -20,7 +20,7 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "qemu/error-report.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/misc/allwinner-h3-sysctrl.c b/hw/misc/allwinner-h3-sysctrl.c
index 6b86524606a526e2de8d2339d07c94772ca60f65..d37c0a6e260a418453e841655284742fd8757df1 100644 (file)
--- a/hw/misc/allwinner-h3-sysctrl.c
+++ b/hw/misc/allwinner-h3-sysctrl.c
@@ -19,7 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/units.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/misc/allwinner-r40-ccu.c b/hw/misc/allwinner-r40-ccu.c
index 4e21eeafdd0f2a7a54db929983bd284ab0ce5da8..8ba4e7aa42980e5f39066021e02b4149c016a715 100644 (file)
--- a/hw/misc/allwinner-r40-ccu.c
+++ b/hw/misc/allwinner-r40-ccu.c
@@ -19,7 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/units.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/misc/allwinner-r40-dramc.c b/hw/misc/allwinner-r40-dramc.c
index 3af8af733ace7b02558a1645280bfadac2b1c304..8e6aa7c3106d4d0c1c0e611c769a85ff98efd784 100644 (file)
--- a/hw/misc/allwinner-r40-dramc.c
+++ b/hw/misc/allwinner-r40-dramc.c
@@ -20,7 +20,7 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "qemu/error-report.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/misc/allwinner-sid.c b/hw/misc/allwinner-sid.c
index 92a0c7918bce0cd92a9325ef4ecbe8d2dcef0d33..b5f827d4bdfc76f37bd5b484d049d77674adf409 100644 (file)
--- a/hw/misc/allwinner-sid.c
+++ b/hw/misc/allwinner-sid.c
@@ -19,7 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/units.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/misc/allwinner-sramc.c b/hw/misc/allwinner-sramc.c
index 423e0a844fa44b3a5b872912a0e85edc932cf98c..1d30f8cf3262230feebbfcc71fe6374b855953d1 100644 (file)
--- a/hw/misc/allwinner-sramc.c
+++ b/hw/misc/allwinner-sramc.c
@@ -19,7 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/units.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/misc/arm_integrator_debug.c b/hw/misc/arm_integrator_debug.c
index 9a197278290fd457969d684079d7592e3ca075b7..9ac6a50a930ae7981babffd6b092abdbbd2759c9 100644 (file)
--- a/hw/misc/arm_integrator_debug.c
+++ b/hw/misc/arm_integrator_debug.c
@@ -15,7 +15,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/misc/arm_integrator_debug.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/misc/arm_l2x0.c b/hw/misc/arm_l2x0.c
index a5511845c7cf629a2d1ec8ff49f3e456c92f6fb1..039f1b0f2ce137cd9b41b5039835d7431c44ee69 100644 (file)
--- a/hw/misc/arm_l2x0.c
+++ b/hw/misc/arm_l2x0.c
@@ -20,7 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/misc/arm_sysctl.c b/hw/misc/arm_sysctl.c
index 0c91ebafac7df5936b6953d241aa6b60ac90c4c5..2a317ac7f5b8472f2c9a3f5f2fe01066a94fe6e9 100644 (file)
--- a/hw/misc/arm_sysctl.c
+++ b/hw/misc/arm_sysctl.c
@@ -13,7 +13,7 @@
 #include "qemu/timer.h"
 #include "system/runstate.h"
 #include "qemu/bitops.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/arm/primecell.h"
 #include "qemu/log.h"

diff --git a/hw/misc/armsse-cpu-pwrctrl.c b/hw/misc/armsse-cpu-pwrctrl.c
index 87770facfced32e55a77ee13555a95594d944b96..86a26a8ac5ae7226476285c9b457558ab67917b8 100644 (file)
--- a/hw/misc/armsse-cpu-pwrctrl.c
+++ b/hw/misc/armsse-cpu-pwrctrl.c
@@ -21,7 +21,7 @@
 #include "trace.h"
 #include "qapi/error.h"
 #include "migration/vmstate.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/registerfields.h"
 #include "hw/misc/armsse-cpu-pwrctrl.h"
 

diff --git a/hw/misc/armsse-cpuid.c b/hw/misc/armsse-cpuid.c
index 038331255143d3ba71b44726bc8c0a3849820fdb..ea2a099ccb128d365ffdfd2a2a5d950885ab51dd 100644 (file)
--- a/hw/misc/armsse-cpuid.c
+++ b/hw/misc/armsse-cpuid.c
@@ -23,7 +23,7 @@
 #include "qemu/module.h"
 #include "trace.h"
 #include "qapi/error.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/registerfields.h"
 #include "hw/misc/armsse-cpuid.h"
 #include "hw/core/qdev-properties.h"

diff --git a/hw/misc/armsse-mhu.c b/hw/misc/armsse-mhu.c
index 6fbe2cca37e2de03a8574ea44c01a249e74eef83..48c4b59067afcdfff4c9debea6df7463e5ffd545 100644 (file)
--- a/hw/misc/armsse-mhu.c
+++ b/hw/misc/armsse-mhu.c
@@ -20,7 +20,7 @@
 #include "qemu/module.h"
 #include "trace.h"
 #include "qapi/error.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/core/registerfields.h"
 #include "hw/core/irq.h"

diff --git a/hw/misc/eccmemctl.c b/hw/misc/eccmemctl.c
index f93cbd16590740d6661d0bcb3cfd550a8e409412..dd1be7d698ebf102bd1020b1f48636b481702b8e 100644 (file)
--- a/hw/misc/eccmemctl.c
+++ b/hw/misc/eccmemctl.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"
 #include "trace.h"

diff --git a/hw/misc/empty_slot.c b/hw/misc/empty_slot.c
index a012668214fe0c0da86cd85a9c5575f51719d319..aab9373c097912805dc0017814de875805c63496 100644 (file)
--- a/hw/misc/empty_slot.c
+++ b/hw/misc/empty_slot.c
@@ -10,7 +10,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/misc/empty_slot.h"
 #include "qapi/error.h"

diff --git a/hw/misc/exynos4210_clk.c b/hw/misc/exynos4210_clk.c
index fdf5bdd6034838468f462f161ab14aab548fb670..e7526792191c690c82e69dbf40734b04f6dd5956 100644 (file)
--- a/hw/misc/exynos4210_clk.c
+++ b/hw/misc/exynos4210_clk.c
@@ -18,7 +18,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/misc/exynos4210_pmu.c b/hw/misc/exynos4210_pmu.c
index a86ec9aba85770702c0b01781800e2121faec8c9..0be793b3aa7fa5dadcdac05b61b226e9b93bfcf2 100644 (file)
--- a/hw/misc/exynos4210_pmu.c
+++ b/hw/misc/exynos4210_pmu.c
@@ -25,7 +25,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"
 #include "system/runstate.h"

diff --git a/hw/misc/exynos4210_rng.c b/hw/misc/exynos4210_rng.c
index 2d0ebc457bc4f0b6141c87530e35dcdc073be597..3f743b4750203f26c8055b32230639e4f8bc0990 100644 (file)
--- a/hw/misc/exynos4210_rng.c
+++ b/hw/misc/exynos4210_rng.c
@@ -18,7 +18,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"
 #include "qemu/log.h"

diff --git a/hw/misc/grlib_ahb_apb_pnp.c b/hw/misc/grlib_ahb_apb_pnp.c
index cdca00ad5425c725de8dacd7dc5e30fc78d9aac9..0d12bcde9d8ab8ba32f20889fc8a022c46cc1e69 100644 (file)
--- a/hw/misc/grlib_ahb_apb_pnp.c
+++ b/hw/misc/grlib_ahb_apb_pnp.c
@@ -23,7 +23,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/misc/grlib_ahb_apb_pnp.h"
 #include "trace.h"
 

diff --git a/hw/misc/iosb.c b/hw/misc/iosb.c
index 96221e1ee5a8b8014dcf22bd9dcc5e6c9a2bc90c..ea63e34b9377304a797d447c2f75bd72c5f27582 100644 (file)
--- a/hw/misc/iosb.c
+++ b/hw/misc/iosb.c
@@ -10,7 +10,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "migration/vmstate.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/misc/iosb.h"
 #include "trace.h"
 

diff --git a/hw/misc/iotkit-secctl.c b/hw/misc/iotkit-secctl.c
index 832b02177746500d94c2c1b335b2f4f00ad41ee1..54bfe1ba59721ae90140975aff42abc20759a912 100644 (file)
--- a/hw/misc/iotkit-secctl.c
+++ b/hw/misc/iotkit-secctl.c
@@ -14,7 +14,7 @@
 #include "qemu/module.h"
 #include "qapi/error.h"
 #include "trace.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/core/registerfields.h"
 #include "hw/core/irq.h"

diff --git a/hw/misc/iotkit-sysctl.c b/hw/misc/iotkit-sysctl.c
index d673ae326bcb1b2058ec508902d2a03cac5ffac7..dff89c677f74bf165db10f03d83ed60401d725cd 100644 (file)
--- a/hw/misc/iotkit-sysctl.c
+++ b/hw/misc/iotkit-sysctl.c
@@ -23,7 +23,7 @@
 #include "system/runstate.h"
 #include "trace.h"
 #include "qapi/error.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/core/registerfields.h"
 #include "hw/misc/iotkit-sysctl.h"

diff --git a/hw/misc/iotkit-sysinfo.c b/hw/misc/iotkit-sysinfo.c
index 3b4d228e3ef850128047b329e481a89ff40cab14..19f089e6ee968eea432cd2e89ffa2840ff668de1 100644 (file)
--- a/hw/misc/iotkit-sysinfo.c
+++ b/hw/misc/iotkit-sysinfo.c
@@ -22,7 +22,7 @@
 #include "qemu/module.h"
 #include "trace.h"
 #include "qapi/error.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/registerfields.h"
 #include "hw/misc/iotkit-sysinfo.h"
 #include "hw/core/qdev-properties.h"

diff --git a/hw/misc/ivshmem-flat.c b/hw/misc/ivshmem-flat.c
index 1248f9e81bc79fa0edf39ffa9e1c782b8800894c..920aa4943a762b49d94dcd3806f67a8b20598650 100644 (file)
--- a/hw/misc/ivshmem-flat.c
+++ b/hw/misc/ivshmem-flat.c
@@ -15,7 +15,7 @@
 #include "qapi/error.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties-system.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "chardev/char-fe.h"
 #include "system/address-spaces.h"
 #include "trace.h"

diff --git a/hw/misc/mac_via.c b/hw/misc/mac_via.c
index 0c608c3dc637d8ae92b57aee68cad7a8fe33a5ba..26ee230dcc4ad0395badc9655c68c1f6c5e03a4a 100644 (file)
--- a/hw/misc/mac_via.c
+++ b/hw/misc/mac_via.c
@@ -18,7 +18,7 @@
 #include "qemu/osdep.h"
 #include "system/address-spaces.h"
 #include "migration/vmstate.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/irq.h"
 #include "qemu/timer.h"
 #include "hw/misc/mac_via.h"

diff --git a/hw/misc/mchp_pfsoc_dmc.c b/hw/misc/mchp_pfsoc_dmc.c
index 599f845f4594cbbc7b59d11d42c406b1bca10a2b..1fe4535464f96b9ffd45b81b81d0fc3c1735dc48 100644 (file)
--- a/hw/misc/mchp_pfsoc_dmc.c
+++ b/hw/misc/mchp_pfsoc_dmc.c
@@ -24,7 +24,7 @@
 #include "qemu/bitops.h"
 #include "qemu/log.h"
 #include "qapi/error.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/misc/mchp_pfsoc_dmc.h"
 
 /* DDR SGMII PHY module */

diff --git a/hw/misc/mchp_pfsoc_ioscb.c b/hw/misc/mchp_pfsoc_ioscb.c
index 84e957244e53dc007004b6deda5478bfa572f427..05538d012a9cc132d566fc191debcf0021de837e 100644 (file)
--- a/hw/misc/mchp_pfsoc_ioscb.c
+++ b/hw/misc/mchp_pfsoc_ioscb.c
@@ -25,7 +25,7 @@
 #include "qemu/log.h"
 #include "qapi/error.h"
 #include "hw/core/irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/misc/mchp_pfsoc_ioscb.h"
 
 /*

diff --git a/hw/misc/mchp_pfsoc_sysreg.c b/hw/misc/mchp_pfsoc_sysreg.c
index 2a4151510373272ab19a62142eaee99b569dbb81..f190ecc78e067130528c2043af982221617b3eb3 100644 (file)
--- a/hw/misc/mchp_pfsoc_sysreg.c
+++ b/hw/misc/mchp_pfsoc_sysreg.c
@@ -25,7 +25,7 @@
 #include "qemu/log.h"
 #include "qapi/error.h"
 #include "hw/core/irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/misc/mchp_pfsoc_sysreg.h"
 #include "system/runstate.h"
 

diff --git a/hw/misc/mips_cmgcr.c b/hw/misc/mips_cmgcr.c
index 1c6e9d1f6f03d5d563e2f8c0145c1819f7faf0ef..3e262e828bcc6603620e905ff4b838bdfd9fbdaa 100644 (file)
--- a/hw/misc/mips_cmgcr.c
+++ b/hw/misc/mips_cmgcr.c
@@ -12,7 +12,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/misc/mips_cmgcr.h"
 #include "hw/misc/mips_cpc.h"

diff --git a/hw/misc/mips_cpc.c b/hw/misc/mips_cpc.c
index efc0326f6f251170d5f53f79ef58280d2028fb3b..924de855ee28c7b61eb5ba0b2e5e144a9bdf913c 100644 (file)
--- a/hw/misc/mips_cpc.c
+++ b/hw/misc/mips_cpc.c
@@ -22,7 +22,7 @@
 #include "cpu.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 
 #include "hw/misc/mips_cpc.h"

diff --git a/hw/misc/mps2-fpgaio.c b/hw/misc/mps2-fpgaio.c
index 9cd5e9884c086dfe5afe501dc49113a1c574e082..da78cb60701b882514d20e38715b2f66b1a2d8a5 100644 (file)
--- a/hw/misc/mps2-fpgaio.c
+++ b/hw/misc/mps2-fpgaio.c
@@ -20,7 +20,7 @@
 #include "qemu/module.h"
 #include "qapi/error.h"
 #include "trace.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/core/registerfields.h"
 #include "hw/misc/mps2-fpgaio.h"

diff --git a/hw/misc/mps2-scc.c b/hw/misc/mps2-scc.c
index 06d436cf58e1f8152b934d285befe32871a30b57..350bba3dab80b79e76b94f572a21ee78c6ed4eb9 100644 (file)
--- a/hw/misc/mps2-scc.c
+++ b/hw/misc/mps2-scc.c
@@ -22,7 +22,7 @@
 #include "qemu/module.h"
 #include "qemu/bitops.h"
 #include "trace.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/irq.h"
 #include "migration/vmstate.h"
 #include "hw/core/registerfields.h"

diff --git a/hw/misc/pvpanic-mmio.c b/hw/misc/pvpanic-mmio.c
index 2d1464435a8e431af6d91d00d90226c07a00684c..a173a1a9a58976aee6f0201d0a12f3827ef75485 100644 (file)
--- a/hw/misc/pvpanic-mmio.c
+++ b/hw/misc/pvpanic-mmio.c
@@ -10,7 +10,7 @@
 
 #include "hw/core/qdev-properties.h"
 #include "hw/misc/pvpanic.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "standard-headers/misc/pvpanic.h"
 
 OBJECT_DECLARE_SIMPLE_TYPE(PVPanicMMIOState, PVPANIC_MMIO_DEVICE)

diff --git a/hw/misc/sbsa_ec.c b/hw/misc/sbsa_ec.c
index dfee1af5ad2a3f51cf30d1abfca20f8f29890d3b..93296d3350c0c769e0884e6ac043283c6fe53398 100644 (file)
--- a/hw/misc/sbsa_ec.c
+++ b/hw/misc/sbsa_ec.c
@@ -12,7 +12,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "system/runstate.h"
 
 typedef struct SECUREECState {

diff --git a/hw/misc/sifive_e_prci.c b/hw/misc/sifive_e_prci.c
index a8702c6a5d44fe80ccb31dde68e25b055eb0e0da..400664aabae02d15b7ac69f28f4d8f3035e47971 100644 (file)
--- a/hw/misc/sifive_e_prci.c
+++ b/hw/misc/sifive_e_prci.c
@@ -19,7 +19,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qapi/error.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/misc/sifive_test.c b/hw/misc/sifive_test.c
index b94bb2d29dbacee9281487775c20636257eb0a5a..41f102e2dca46586075aa70b147e39936f4789c1 100644 (file)
--- a/hw/misc/sifive_test.c
+++ b/hw/misc/sifive_test.c
@@ -19,7 +19,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qapi/error.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/misc/sifive_u_otp.c b/hw/misc/sifive_u_otp.c
index 899bc31745cbf4d0edf1d1984cf18494a622d26b..7205374bc391aaa320e7e16033400708e7c27d1a 100644 (file)
--- a/hw/misc/sifive_u_otp.c
+++ b/hw/misc/sifive_u_otp.c
@@ -22,7 +22,7 @@
 #include "qapi/error.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/core/qdev-properties-system.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/error-report.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/misc/sifive_u_prci.c b/hw/misc/sifive_u_prci.c
index 6e75cb6d0d571e5137ce6b9e870c4977091e98fd..f51588623abd2830cc31215ff9f19a8a89da9a89 100644 (file)
--- a/hw/misc/sifive_u_prci.c
+++ b/hw/misc/sifive_u_prci.c
@@ -19,7 +19,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "hw/misc/sifive_u_prci.h"

diff --git a/hw/misc/slavio_misc.c b/hw/misc/slavio_misc.c
index 43ce5d0bc9738ee0cce9f594cc4caf4faddaa218..49be827c458843ba73c181f7e6de16dc7c4ac12e 100644 (file)
--- a/hw/misc/slavio_misc.c
+++ b/hw/misc/slavio_misc.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"
 #include "system/runstate.h"

diff --git a/hw/misc/tz-mpc.c b/hw/misc/tz-mpc.c
index 65517d390d376546f686af110b421413d84d498a..02fe0bcb1d56f8060015a047b6a9782f2289a77d 100644 (file)
--- a/hw/misc/tz-mpc.c
+++ b/hw/misc/tz-mpc.c
@@ -14,7 +14,7 @@
 #include "qemu/module.h"
 #include "qapi/error.h"
 #include "trace.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/core/registerfields.h"
 #include "hw/core/irq.h"

diff --git a/hw/misc/tz-msc.c b/hw/misc/tz-msc.c
index dd845193d64fd342e23af38125a46cd7503f1389..9d9fc072ff0d13dfd29de8bcbd873cfd14b0d0be 100644 (file)
--- a/hw/misc/tz-msc.c
+++ b/hw/misc/tz-msc.c
@@ -14,7 +14,7 @@
 #include "qemu/module.h"
 #include "qapi/error.h"
 #include "trace.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/core/registerfields.h"
 #include "hw/core/irq.h"

diff --git a/hw/misc/tz-ppc.c b/hw/misc/tz-ppc.c
index 7b812a034b20afb8aff32a56c7a53be04d158170..159073d1e6d3d85ee34018d60c4273a4efc1b6e7 100644 (file)
--- a/hw/misc/tz-ppc.c
+++ b/hw/misc/tz-ppc.c
@@ -14,7 +14,7 @@
 #include "qemu/module.h"
 #include "qapi/error.h"
 #include "trace.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/core/registerfields.h"
 #include "hw/core/irq.h"

diff --git a/hw/misc/unimp.c b/hw/misc/unimp.c
index 4370c14ef16678fb7047ed4db5605fec8c5b8861..521b84bf20bfdea987d2e1465752fa496bc572a2 100644 (file)
--- a/hw/misc/unimp.c
+++ b/hw/misc/unimp.c
@@ -12,7 +12,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/misc/unimp.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/misc/virt_ctrl.c b/hw/misc/virt_ctrl.c
index 7cb1ea5d18197e4139da75d9abf7db38b9320517..40747925a290c1dd29ea6e593ecbefda61157ad9 100644 (file)
--- a/hw/misc/virt_ctrl.c
+++ b/hw/misc/virt_ctrl.c
@@ -6,7 +6,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "trace.h"

diff --git a/hw/misc/xlnx-versal-cframe-reg.c b/hw/misc/xlnx-versal-cframe-reg.c
index efacbe83abb7a11ffa8520f91312023fad65af1c..47d3b9e84ad11ebfe676a5849a99f0ac27b6b836 100644 (file)
--- a/hw/misc/xlnx-versal-cframe-reg.c
+++ b/hw/misc/xlnx-versal-cframe-reg.c
@@ -9,7 +9,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/register.h"
 #include "hw/core/registerfields.h"
 #include "qemu/bitops.h"

diff --git a/hw/misc/xlnx-versal-cfu.c b/hw/misc/xlnx-versal-cfu.c
index bdce0ce74750156d257ba6863bf0fec1041bbd8b..86df37d6e8abf4e9b72526956e3fa650f1f2ecdd 100644 (file)
--- a/hw/misc/xlnx-versal-cfu.c
+++ b/hw/misc/xlnx-versal-cfu.c
@@ -11,7 +11,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/register.h"
 #include "hw/core/irq.h"
 #include "qemu/bitops.h"

diff --git a/hw/misc/xlnx-versal-crl.c b/hw/misc/xlnx-versal-crl.c
index 9bbf44def6bf386d840e0b9fea4406115afb9a94..1379974f81ea7a1abbd2c2cae1f27dbd3b4e63c4 100644 (file)
--- a/hw/misc/xlnx-versal-crl.c
+++ b/hw/misc/xlnx-versal-crl.c
@@ -10,7 +10,7 @@
 #include "qemu/osdep.h"
 #include "migration/vmstate.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/irq.h"
 #include "hw/core/register.h"
 #include "hw/core/resettable.h"

diff --git a/hw/misc/xlnx-versal-pmc-iou-slcr.c b/hw/misc/xlnx-versal-pmc-iou-slcr.c
index 0246167a5e681142bc2dd66f544d2b0f5100f059..57a24641cfa167c78e772032cce7ebf0a983f0e4 100644 (file)
--- a/hw/misc/xlnx-versal-pmc-iou-slcr.c
+++ b/hw/misc/xlnx-versal-pmc-iou-slcr.c
@@ -24,7 +24,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/register.h"
 #include "hw/core/irq.h"
 #include "qemu/bitops.h"

diff --git a/hw/misc/xlnx-versal-xramc.c b/hw/misc/xlnx-versal-xramc.c
index f4f02c7680b069e2179a9f6e9e0b2c8a951f6bfb..da8c98ae0324e5962b0e18f7060e912971c3c77b 100644 (file)
--- a/hw/misc/xlnx-versal-xramc.c
+++ b/hw/misc/xlnx-versal-xramc.c
@@ -10,7 +10,7 @@
 #include "qemu/units.h"
 #include "qapi/error.h"
 #include "migration/vmstate.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/register.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/core/irq.h"

diff --git a/hw/misc/xlnx-zynqmp-apu-ctrl.c b/hw/misc/xlnx-zynqmp-apu-ctrl.c
index 957043f01b958f92726620de41c40990d8040a8f..c46951d552eae5dcc93e789aa7e2ed62b221c0ce 100644 (file)
--- a/hw/misc/xlnx-zynqmp-apu-ctrl.c
+++ b/hw/misc/xlnx-zynqmp-apu-ctrl.c
@@ -13,7 +13,7 @@
 #include "qemu/log.h"
 #include "migration/vmstate.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/irq.h"
 #include "hw/core/register.h"
 

diff --git a/hw/misc/xlnx-zynqmp-crf.c b/hw/misc/xlnx-zynqmp-crf.c
index a2ebf6ce5d7edc0662b93fa72e7416710e5c6857..1f7107c322c551cc88d9b0112545229b373f778b 100644 (file)
--- a/hw/misc/xlnx-zynqmp-crf.c
+++ b/hw/misc/xlnx-zynqmp-crf.c
@@ -7,7 +7,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/register.h"
 #include "qemu/bitops.h"
 #include "qemu/log.h"

diff --git a/hw/misc/zynq_slcr.c b/hw/misc/zynq_slcr.c
index d7d490b093d0a5a08b4ee7bf6f1f1d209483ab9a..faae98fa0230f5252e497026f0e213ae01fe4710 100644 (file)
--- a/hw/misc/zynq_slcr.c
+++ b/hw/misc/zynq_slcr.c
@@ -17,7 +17,7 @@
 #include "qemu/osdep.h"
 #include "qemu/timer.h"
 #include "system/runstate.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/net/allwinner-sun8i-emac.c b/hw/net/allwinner-sun8i-emac.c
index 8ff0db5ccdcc33b2ecd5163aca31a39b4ad62b54..9b7c67ae8e4798b11ad0918b85e9767964427630 100644 (file)
--- a/hw/net/allwinner-sun8i-emac.c
+++ b/hw/net/allwinner-sun8i-emac.c
@@ -20,7 +20,7 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "qapi/error.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "net/net.h"
 #include "hw/core/irq.h"

diff --git a/hw/net/allwinner_emac.c b/hw/net/allwinner_emac.c
index cbe4cb80e4a1a7dc3aacaf7bc00efd7cd475138f..55d1b6a9a6b7cc5f775824e40cd5cc7fc6442585 100644 (file)
--- a/hw/net/allwinner_emac.c
+++ b/hw/net/allwinner_emac.c
@@ -18,7 +18,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "net/net.h"
 #include "qemu/fifo8.h"

diff --git a/hw/net/can/xlnx-versal-canfd.c b/hw/net/can/xlnx-versal-canfd.c
index 3ceb1a8b912d2350bbe408746054803bd49240a2..4a7cdc31ee494fc733f14e4182b39fc61b922894 100644 (file)
--- a/hw/net/can/xlnx-versal-canfd.c
+++ b/hw/net/can/xlnx-versal-canfd.c
@@ -31,7 +31,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/irq.h"
 #include "hw/core/register.h"
 #include "qapi/error.h"

diff --git a/hw/net/can/xlnx-zynqmp-can.c b/hw/net/can/xlnx-zynqmp-can.c
index 6c583cab8f58190191e9f1489bee7e8688218321..bccf62401694b6935ed2eb9c00182760acf7ae63 100644 (file)
--- a/hw/net/can/xlnx-zynqmp-can.c
+++ b/hw/net/can/xlnx-zynqmp-can.c
@@ -30,7 +30,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/register.h"
 #include "hw/core/irq.h"
 #include "qapi/error.h"

diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c
index 182f0e5f6b1c2c5295efffd1fa14e84ea2cbf81a..5b611fcbbe79bdaf4bc652668ac411bc59478cd1 100644 (file)
--- a/hw/net/dp8393x.c
+++ b/hw/net/dp8393x.c
@@ -21,7 +21,7 @@
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/net/dp8393x.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "net/net.h"
 #include "qapi/error.h"

diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c
index 5b77528e365e3101d864217ea94e3faa356433b3..1d61d918b8db133f1675c542b16e7e9431b0d13a 100644 (file)
--- a/hw/net/fsl_etsec/etsec.c
+++ b/hw/net/fsl_etsec/etsec.c
@@ -27,7 +27,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/irq.h"
 #include "hw/net/mii.h"
 #include "hw/core/ptimer.h"

diff --git a/hw/net/fsl_etsec/etsec.h b/hw/net/fsl_etsec/etsec.h
index ca8ad5638a3e4b98bde7c367c544e0839a1ef58b..24e1344bf1e4aae36f803939b36c58a2db7f5faa 100644 (file)
--- a/hw/net/fsl_etsec/etsec.h
+++ b/hw/net/fsl_etsec/etsec.h
@@ -25,7 +25,7 @@
 #ifndef ETSEC_H
 #define ETSEC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "net/net.h"
 #include "hw/core/ptimer.h"
 #include "qom/object.h"

diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c
index 381fd3876412fa1d84612735e587cd54dbff854a..072a741d811bc351e9d159b7eaacf25f89971c34 100644 (file)
--- a/hw/net/lan9118.c
+++ b/hw/net/lan9118.c
@@ -11,7 +11,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "net/net.h"
 #include "net/eth.h"

diff --git a/hw/net/lasi_i82596.c b/hw/net/lasi_i82596.c
index 50e3c4fa86d0bdc6f11e668fad19eeb918250a9e..423a8676a08be57f423a4375e0da94b73d1c0324 100644 (file)
--- a/hw/net/lasi_i82596.c
+++ b/hw/net/lasi_i82596.c
@@ -13,7 +13,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/timer.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "system/system.h"
 #include "net/eth.h"
 #include "hw/net/lasi_82596.h"

diff --git a/hw/net/mcf_fec.c b/hw/net/mcf_fec.c
index ecf105adf2e5aa4f204e84802ff33c1264e12cde..5f267e5ea389a65132957251dc4f76dcdb6e9610 100644 (file)
--- a/hw/net/mcf_fec.c
+++ b/hw/net/mcf_fec.c
@@ -15,7 +15,7 @@
 #include "hw/m68k/mcf_fec.h"
 #include "hw/net/mii.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include <zlib.h> /* for crc32 */
 
 //#define DEBUG_FEC 1

diff --git a/hw/net/mv88w8618_eth.c b/hw/net/mv88w8618_eth.c
index 1a1bba8b572129a4fb5f876b2bad2fff5dde20ec..1fcfbe912ee2de17cc2522cf79f185647b95be32 100644 (file)
--- a/hw/net/mv88w8618_eth.c
+++ b/hw/net/mv88w8618_eth.c
@@ -8,7 +8,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/irq.h"
 #include "hw/net/mv88w8618_eth.h"
 #include "migration/vmstate.h"

diff --git a/hw/net/opencores_eth.c b/hw/net/opencores_eth.c
index 34992f3cc9f63dac4ca12a4d075dc8903f57e58a..ec3301414cc0a741ed05b2f10446740a2cd5acb2 100644 (file)
--- a/hw/net/opencores_eth.c
+++ b/hw/net/opencores_eth.c
@@ -35,7 +35,7 @@
 #include "hw/core/irq.h"
 #include "hw/net/mii.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "net/net.h"
 #include "qemu/module.h"
 #include "net/eth.h"

diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c
index d6f57bc004aa1d79050ddc7e1c4b40c59d698e14..3420d8e28e1760b8cfd1533e102c4e184e8c70c7 100644 (file)
--- a/hw/net/smc91c111.c
+++ b/hw/net/smc91c111.c
@@ -8,7 +8,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "net/net.h"
 #include "hw/core/irq.h"

diff --git a/hw/net/stellaris_enet.c b/hw/net/stellaris_enet.c
index c97d694585261ea11c9c3c6caf7c3d7411d2f647..ac7924bdd9e366504c627530157dfc1b5006a574 100644 (file)
--- a/hw/net/stellaris_enet.c
+++ b/hw/net/stellaris_enet.c
@@ -10,7 +10,7 @@
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "net/net.h"
 #include "qemu/log.h"

diff --git a/hw/net/xgmac.c b/hw/net/xgmac.c
index f07be72512034d8a84c064f5f6fbf99cf910b860..8d316e94c178dff9cd49e3a32caca7673888d9ac 100644 (file)
--- a/hw/net/xgmac.c
+++ b/hw/net/xgmac.c
@@ -27,7 +27,7 @@
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"
 #include "net/net.h"

diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c
index 451f8da2122d19b3aad50ca64f2efb8a8de0d3e3..29c09b88ebffab6e2e9eb44616f99f6d6a0da400 100644 (file)
--- a/hw/net/xilinx_axienet.c
+++ b/hw/net/xilinx_axienet.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qapi/error.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/net/xilinx_ethlite.c b/hw/net/xilinx_ethlite.c
index 72b14811a9d496ae2b4c0e794c8c082486bd1979..ba3acd4c77cb353367a9ade0ffd50983a8c8947e 100644 (file)
--- a/hw/net/xilinx_ethlite.c
+++ b/hw/net/xilinx_ethlite.c
@@ -31,7 +31,7 @@
 #include "qemu/bitops.h"
 #include "qom/object.h"
 #include "qapi/error.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/core/qdev-properties-system.h"

diff --git a/hw/nubus/mac-nubus-bridge.c b/hw/nubus/mac-nubus-bridge.c
index 0dac8d19b3757776f17c134c4b172e83f4d3e9b6..dc9ae6d21facf0b468248c0229a254f54a808680 100644 (file)
--- a/hw/nubus/mac-nubus-bridge.c
+++ b/hw/nubus/mac-nubus-bridge.c
@@ -9,7 +9,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/nubus/mac-nubus-bridge.h"
 
 

diff --git a/hw/nubus/nubus-bridge.c b/hw/nubus/nubus-bridge.c
index fb14402c4fc4ae40a35f5760385f3fa5f44ad387..f0e1620ee0934a0be0571ddc3cc08c45adbb0b08 100644 (file)
--- a/hw/nubus/nubus-bridge.c
+++ b/hw/nubus/nubus-bridge.c
@@ -9,7 +9,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/nubus/nubus.h"
 
 

diff --git a/hw/nvram/ds1225y.c b/hw/nvram/ds1225y.c
index 512e5485187909216854c7a98b17f63ac29c1007..4f35bfebdab90242ded9b59b34589b56dd8cb8b7 100644 (file)
--- a/hw/nvram/ds1225y.c
+++ b/hw/nvram/ds1225y.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "trace.h"
 #include "qemu/error-report.h"

diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index e5c35b0e2e403673b8f62546a22d92bf394884bc..437ab6e210fc7fdfa9f05e1aca89eb80eadd1d41 100644 (file)
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -31,7 +31,7 @@
 #include "hw/core/boards.h"
 #include "hw/nvram/fw_cfg.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/qemu-file-types.h"
 #include "migration/vmstate.h"
 #include "trace.h"

diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c
index bafb877cc38c2694956aa414a7385b3684196aef..603d8ca0d990461d3f0558cb69441d4e668df177 100644 (file)
--- a/hw/openrisc/openrisc_sim.c
+++ b/hw/openrisc/openrisc_sim.c
@@ -31,7 +31,7 @@
 #include "system/address-spaces.h"
 #include "system/device_tree.h"
 #include "system/system.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "system/qtest.h"
 #include "system/reset.h"
 #include "hw/core/split-irq.h"

diff --git a/hw/openrisc/virt.c b/hw/openrisc/virt.c
index 446a81579c15b6cb55be4d72475310b7a69a4295..54ce96666e56504225873d4a9631e2fd71e38dc2 100644 (file)
--- a/hw/openrisc/virt.c
+++ b/hw/openrisc/virt.c
@@ -22,7 +22,7 @@
 #include "hw/pci-host/gpex.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/rtc/goldfish_rtc.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/virtio/virtio-mmio.h"
 #include "system/device_tree.h"
 #include "system/system.h"

diff --git a/hw/pci-bridge/cxl_root_port.c b/hw/pci-bridge/cxl_root_port.c
index 616d5d934cc590aabfdd172b3e88ee2c5c9cbc68..197d3148d201028aa3cc1875b968e11b387f8a70 100644 (file)
--- a/hw/pci-bridge/cxl_root_port.c
+++ b/hw/pci-bridge/cxl_root_port.c
@@ -25,7 +25,7 @@
 #include "hw/pci/msi.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/core/qdev-properties-system.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qapi/error.h"
 #include "hw/cxl/cxl.h"
 

diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c
index 15354abf3bac280b31da028b15c846e23a401d71..e7d638b296c071e206c4327f9df25defe710ec10 100644 (file)
--- a/hw/pci-host/i440fx.c
+++ b/hw/pci-host/i440fx.c
@@ -30,7 +30,7 @@
 #include "hw/pci/pci_host.h"
 #include "hw/pci-host/i440fx.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qapi/error.h"
 #include "migration/vmstate.h"
 #include "qapi/visitor.h"

diff --git a/hw/pci-host/mv64361.c b/hw/pci-host/mv64361.c
index 636228c4074e63520514ad5b1b752b01f83b8e73..ef1c77563e8f69f2dbdbaab63ddc8c2793c83c1d 100644 (file)
--- a/hw/pci-host/mv64361.c
+++ b/hw/pci-host/mv64361.c
@@ -11,7 +11,7 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "qapi/error.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/pci/pci_device.h"
 #include "hw/pci/pci_host.h"
 #include "hw/core/irq.h"

diff --git a/hw/pci-host/sabre.c b/hw/pci-host/sabre.c
index 87af933dc290c0d00ae92aecc269353e4de85081..b3f57dca7d7573aa9d540055e4c926a2c075e4ba 100644 (file)
--- a/hw/pci-host/sabre.c
+++ b/hw/pci-host/sabre.c
@@ -25,7 +25,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_host.h"
 #include "hw/core/qdev-properties.h"

diff --git a/hw/pci-host/sh_pci.c b/hw/pci-host/sh_pci.c
index 87a71c889e42c16880097603c563690eaf01f62d..3ffd2cdbd70f6d992b049eced564f2851f8d14c9 100644 (file)
--- a/hw/pci-host/sh_pci.c
+++ b/hw/pci-host/sh_pci.c
@@ -23,7 +23,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/sh4/sh.h"
 #include "hw/core/irq.h"
 #include "hw/pci/pci_device.h"

diff --git a/hw/pci-host/versatile.c b/hw/pci-host/versatile.c
index 1fdae78210a5492e96568aa9b6b31c94b32e1619..b27531f7fbbc4a56a368e6aa70d8169d50a4e29a 100644 (file)
--- a/hw/pci-host/versatile.c
+++ b/hw/pci-host/versatile.c
@@ -9,7 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/units.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/core/irq.h"
 #include "hw/pci/pci_device.h"

diff --git a/hw/ppc/e500-ccsr.h b/hw/ppc/e500-ccsr.h
index 249c17be3b8107e6a3cee1369c3761e9f54e4b08..4de006b443481d73cf45e3672522c6c6a60a7e6f 100644 (file)
--- a/hw/ppc/e500-ccsr.h
+++ b/hw/ppc/e500-ccsr.h
@@ -1,7 +1,7 @@
 #ifndef E500_CCSR_H
 #define E500_CCSR_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 struct PPCE500CCSRState {

diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 7f164331c8edb89a1fcc7e2b991ec3fe06990c4f..113a2daca1d79aa0ef30621356d29df14dba96b6 100644 (file)
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -41,7 +41,7 @@
 #include "hw/core/qdev-properties.h"
 #include "hw/core/loader.h"
 #include "elf.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/host-utils.h"
 #include "qemu/option.h"
 #include "hw/pci-host/ppce500.h"

diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c
index 4f1d659e72344e2600e0421dd6a11dd001b0f542..ca5647284d0858f9396b35144bda01341bef7fcd 100644 (file)
--- a/hw/ppc/e500plat.c
+++ b/hw/ppc/e500plat.c
@@ -15,7 +15,7 @@
 #include "hw/net/fsl_etsec/etsec.h"
 #include "system/device_tree.h"
 #include "system/kvm.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/pci/pci.h"
 #include "hw/ppc/openpic.h"
 #include "kvm_ppc.h"

diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 410a3ac392e219759501c5f2a3e43d8d0a80c687..7275563a155633a698de6698ad0ff66af3f05304 100644 (file)
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -73,7 +73,7 @@
 #include "system/reset.h"
 #include "kvm_ppc.h"
 #include "hw/usb/usb.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "trace.h"
 
 #define MAX_IDE_BUS 2

diff --git a/hw/ppc/mpc8544_guts.c b/hw/ppc/mpc8544_guts.c
index a25041e836729ff3f9d73c11dc711d44f0548ee1..88ae573d1e8bdc0918a8b88b6004f5ea43efcb1b 100644 (file)
--- a/hw/ppc/mpc8544_guts.c
+++ b/hw/ppc/mpc8544_guts.c
@@ -21,7 +21,7 @@
 #include "qemu/log.h"
 #include "system/runstate.h"
 #include "cpu.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define MPC8544_GUTS_MMIO_SIZE        0x1000

diff --git a/hw/ppc/pegasos.c b/hw/ppc/pegasos.c
index bf290a7dcd54002256eb6a1778cfad7938b4480b..3e4d19fbe844c6a169c3b4c06496912a645b3567 100644 (file)
--- a/hw/ppc/pegasos.c
+++ b/hw/ppc/pegasos.c
@@ -11,7 +11,7 @@
 #include "qemu/units.h"
 #include "qapi/error.h"
 #include "hw/ppc/ppc.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/pci/pci_host.h"
 #include "hw/core/irq.h"
 #include "hw/core/or-irq.h"

diff --git a/hw/ppc/pnv_xscom.c b/hw/ppc/pnv_xscom.c
index fbfec829d5b6818e5f15b5d7cfd9866085630ae1..8557b560aebf86a51e9986fb5cb14c2d65039af6 100644 (file)
--- a/hw/ppc/pnv_xscom.c
+++ b/hw/ppc/pnv_xscom.c
@@ -22,7 +22,7 @@
 #include "qemu/module.h"
 #include "system/hw_accel.h"
 #include "target/ppc/cpu.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #include "hw/ppc/fdt.h"
 #include "hw/ppc/pnv.h"

diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
index 491560575c0b5b0a26cef3db47a3534b1102675a..2dde008b0e4a169eff2bf53580b8f3960493a625 100644 (file)
--- a/hw/ppc/ppc440_bamboo.c
+++ b/hw/ppc/ppc440_bamboo.c
@@ -28,7 +28,7 @@
 #include "hw/pci-host/ppc4xx.h"
 #include "system/system.h"
 #include "system/reset.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/intc/ppc-uic.h"
 #include "hw/core/qdev-properties.h"
 #include "qapi/error.h"

diff --git a/hw/ppc/ppce500_spin.c b/hw/ppc/ppce500_spin.c
index bc70e50e926eb0e349d395b930f6d9f42395ecbb..a066ada77ed180b67517dd76cef3258ae240000f 100644 (file)
--- a/hw/ppc/ppce500_spin.c
+++ b/hw/ppc/ppce500_spin.c
@@ -31,7 +31,7 @@
 #include "qemu/module.h"
 #include "qemu/units.h"
 #include "hw/hw.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "system/hw_accel.h"
 #include "hw/ppc/ppc.h"
 #include "e500.h"

diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c
index b6e233747edebe5b60f5320f03de3c2db2d8c5ad..b13dd224ba13b13e57c0b21f4f07654e31c5bdb7 100644 (file)
--- a/hw/ppc/sam460ex.c
+++ b/hw/ppc/sam460ex.c
@@ -30,7 +30,7 @@
 #include "hw/block/flash.h"
 #include "system/system.h"
 #include "system/reset.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/char/serial-mm.h"
 #include "hw/i2c/ppc4xx_i2c.h"
 #include "hw/i2c/smbus_eeprom.h"

diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index a7c064be33057c00b1f23701372f837f8ea8c1d0..ea998bdff15ccfc90e2d988541e0faeba589e745 100644 (file)
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -26,7 +26,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/core/irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/msi.h"

diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c
index 875c17f478443345e3139d0ce4582aab4d07e5d8..501e82a7665bb238f314a9c6348a2e13204e1e94 100644 (file)
--- a/hw/ppc/spapr_vio.c
+++ b/hw/ppc/spapr_vio.c
@@ -26,7 +26,7 @@
 #include "qemu/log.h"
 #include "hw/core/loader.h"
 #include "elf.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "system/kvm.h"
 #include "system/device_tree.h"
 #include "kvm_ppc.h"

diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
index cf2d10ecb2704b398d66dfab774ca62d8a01daf4..8b3e67b627c0c0a35c7da862081f7738e38bd375 100644 (file)
--- a/hw/ppc/virtex_ml507.c
+++ b/hw/ppc/virtex_ml507.c
@@ -27,7 +27,7 @@
 #include "qemu/units.h"
 #include "exec/page-protection.h"
 #include "cpu.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/char/serial-mm.h"
 #include "hw/block/flash.h"
 #include "system/system.h"

diff --git a/hw/riscv/microblaze-v-generic.c b/hw/riscv/microblaze-v-generic.c
index 8a461a0dd566914e2d5f78904313fe0d70308ef4..d56b64792d7eee57e3de1f823bc6bbe9b92de438 100644 (file)
--- a/hw/riscv/microblaze-v-generic.c
+++ b/hw/riscv/microblaze-v-generic.c
@@ -17,7 +17,7 @@
 #include "qemu/units.h"
 #include "qapi/error.h"
 #include "cpu.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "system/system.h"
 #include "net/net.h"
 #include "hw/core/boards.h"

diff --git a/hw/riscv/microchip_pfsoc.c b/hw/riscv/microchip_pfsoc.c
index 9de6456c1417580c9366997129583c2b6a10fee0..0cf849ffb6d545e99f790643bfc457a2eb3b6ead 100644 (file)
--- a/hw/riscv/microchip_pfsoc.c
+++ b/hw/riscv/microchip_pfsoc.c
@@ -42,7 +42,7 @@
 #include "qapi/visitor.h"
 #include "hw/core/boards.h"
 #include "hw/core/loader.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "chardev/char.h"
 #include "hw/cpu/cluster.h"
 #include "target/riscv/cpu.h"

diff --git a/hw/riscv/riscv-iommu-sys.c b/hw/riscv/riscv-iommu-sys.c
index 2a11c4dab6d0557f05bc9576be1b8393688a44d3..bf87b0b4ea34ccfbb16fa7fd89fd5f5adc1774a5 100644 (file)
--- a/hw/riscv/riscv-iommu-sys.c
+++ b/hw/riscv/riscv-iommu-sys.c
@@ -20,7 +20,7 @@
 #include "hw/core/irq.h"
 #include "hw/pci/pci_bus.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qemu/host-utils.h"

diff --git a/hw/riscv/riscv_hart.c b/hw/riscv/riscv_hart.c
index 31187487946f671e0b06d0dc955e97c393971f44..e675358e1a10e13e29f9d06d0b2705c736e4cecd 100644 (file)
--- a/hw/riscv/riscv_hart.c
+++ b/hw/riscv/riscv_hart.c
@@ -24,7 +24,7 @@
 #include "system/reset.h"
 #include "system/qtest.h"
 #include "qemu/cutils.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "target/riscv/cpu.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/riscv/riscv_hart.h"

diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c
index c2032176c4356527e3851613168cc7430489eadc..4cb9c07ffbf27f62f658c87499f5e03308809df7 100644 (file)
--- a/hw/riscv/sifive_e.c
+++ b/hw/riscv/sifive_e.c
@@ -34,7 +34,7 @@
 #include "qapi/error.h"
 #include "hw/core/boards.h"
 #include "hw/core/loader.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/misc/unimp.h"
 #include "target/riscv/cpu.h"
 #include "hw/riscv/riscv_hart.h"

diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c
index 3e081ddf37e044f404916e243ad7a25ca09fcfe5..f1b47ab5848c722dc3cad7149a2ba430dcf757d2 100644 (file)
--- a/hw/riscv/sifive_u.c
+++ b/hw/riscv/sifive_u.c
@@ -42,7 +42,7 @@
 #include "hw/core/boards.h"
 #include "hw/core/irq.h"
 #include "hw/core/loader.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/cpu/cluster.h"
 #include "hw/misc/unimp.h"
 #include "hw/sd/sd.h"

diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c
index c9451d7e3b36e4a47d1d3f2bd072d5a6f94ee575..ea527c7bfc1f2379e84a760bd113e845c71ec30f 100644 (file)
--- a/hw/riscv/spike.c
+++ b/hw/riscv/spike.c
@@ -27,7 +27,7 @@
 #include "qapi/error.h"
 #include "hw/core/boards.h"
 #include "hw/core/loader.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "target/riscv/cpu.h"
 #include "hw/riscv/riscv_hart.h"
 #include "hw/riscv/spike.h"

diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
index d79add557684c8cd4a1e10bdf21ab517f6250bf2..c87c169d38cd04f41231013256b3056c5dad9aa0 100644 (file)
--- a/hw/riscv/virt.c
+++ b/hw/riscv/virt.c
@@ -25,7 +25,7 @@
 #include "qapi/error.h"
 #include "hw/core/boards.h"
 #include "hw/core/loader.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/char/serial-mm.h"
 #include "target/riscv/cpu.h"

diff --git a/hw/rtc/allwinner-rtc.c b/hw/rtc/allwinner-rtc.c
index 0ffd38cf78742fcca18191393c09b2fccafbdf6b..52006a0e3a3d6ac1759d41added1f1196ac60aa4 100644 (file)
--- a/hw/rtc/allwinner-rtc.c
+++ b/hw/rtc/allwinner-rtc.c
@@ -19,7 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/units.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/rtc/exynos4210_rtc.c b/hw/rtc/exynos4210_rtc.c
index a15b5274bd3c79f7f8073370caac6cbeb274a99e..846839d2d8bc8dd67d1affcdb1e0a2f491134f88 100644 (file)
--- a/hw/rtc/exynos4210_rtc.c
+++ b/hw/rtc/exynos4210_rtc.c
@@ -28,7 +28,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/timer.h"
 #include "qemu/bcd.h"

diff --git a/hw/rtc/goldfish_rtc.c b/hw/rtc/goldfish_rtc.c
index 79d2a04c7212b01be0292b4a884f1f11009b0630..5354a6b02f3c6091b78a5a209411c795f4bb2f01 100644 (file)
--- a/hw/rtc/goldfish_rtc.c
+++ b/hw/rtc/goldfish_rtc.c
@@ -24,7 +24,7 @@
 #include "migration/vmstate.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/bitops.h"
 #include "qemu/timer.h"
 #include "system/system.h"

diff --git a/hw/rtc/ls7a_rtc.c b/hw/rtc/ls7a_rtc.c
index b0c6588e09896edc6a9eea607e0a354804376c72..158c8155055835f3dccc5943d8f94ee511854ad5 100644 (file)
--- a/hw/rtc/ls7a_rtc.c
+++ b/hw/rtc/ls7a_rtc.c
@@ -6,7 +6,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/irq.h"
 #include "hw/core/register.h"
 #include "qemu/timer.h"

diff --git a/hw/rtc/m48t59.c b/hw/rtc/m48t59.c
index be8efb8c0adfeac39ed5c2dcff2c5cbac215a329..be4196b21c4fb092ea0da9520988380460931dfb 100644 (file)
--- a/hw/rtc/m48t59.c
+++ b/hw/rtc/m48t59.c
@@ -31,7 +31,7 @@
 #include "system/runstate.h"
 #include "system/rtc.h"
 #include "system/system.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qapi/error.h"
 #include "qemu/bcd.h"
 #include "qemu/module.h"

diff --git a/hw/rtc/pl031.c b/hw/rtc/pl031.c
index 847349b407aa2c703e70491797bd4166a0d2d5c9..b56877c3a208d3a046b37cfd88c6c8fa20f1da8a 100644 (file)
--- a/hw/rtc/pl031.c
+++ b/hw/rtc/pl031.c
@@ -16,7 +16,7 @@
 #include "migration/vmstate.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/timer.h"
 #include "system/system.h"
 #include "system/rtc.h"

diff --git a/hw/rtc/sun4v-rtc.c b/hw/rtc/sun4v-rtc.c
index 29e24ef6bed29978c0ea8358a10638d6cf29c75e..675b6cd5bd6a2e96158c30e587852d4b13c35db5 100644 (file)
--- a/hw/rtc/sun4v-rtc.c
+++ b/hw/rtc/sun4v-rtc.c
@@ -10,7 +10,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "qemu/timer.h"

diff --git a/hw/rtc/xlnx-zynqmp-rtc.c b/hw/rtc/xlnx-zynqmp-rtc.c
index 49d48dc67822e7d7b8e1de46fc4e37df5b95cbd9..28ae7a24f9df1de83c798397b209ed42257db39d 100644 (file)
--- a/hw/rtc/xlnx-zynqmp-rtc.c
+++ b/hw/rtc/xlnx-zynqmp-rtc.c
@@ -25,7 +25,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/register.h"
 #include "qemu/bitops.h"
 #include "qemu/log.h"

diff --git a/hw/rx/rx62n.c b/hw/rx/rx62n.c
index e1fa3d56618874c13eb2ef1b49521e386bdafa77..3d137a517b83f2bff8d72a440aa4d6ab29b26a4d 100644 (file)
--- a/hw/rx/rx62n.c
+++ b/hw/rx/rx62n.c
@@ -26,7 +26,7 @@
 #include "qemu/units.h"
 #include "hw/rx/rx62n.h"
 #include "hw/core/loader.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/qdev-properties.h"
 #include "system/system.h"
 #include "qobject/qlist.h"

diff --git a/hw/s390x/ap-bridge.c b/hw/s390x/ap-bridge.c
index edeb3dbef3483311c81e4f7c948569d146b7f508..5cdbf0980744b5b1e70b15c34d3756c40c020655 100644 (file)
--- a/hw/s390x/ap-bridge.c
+++ b/hw/s390x/ap-bridge.c
@@ -10,7 +10,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/bitops.h"
 #include "qemu/module.h"
 #include "hw/s390x/ap-bridge.h"

diff --git a/hw/s390x/css-bridge.c b/hw/s390x/css-bridge.c
index 887794beef763e7ec4227a6aa0b637653ec4ff9e..440fefb7d0f77544304d7fc93b1241750b2f2dad 100644 (file)
--- a/hw/s390x/css-bridge.c
+++ b/hw/s390x/css-bridge.c
@@ -14,7 +14,7 @@
 #include "qapi/error.h"
 #include "hw/core/hotplug.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/bitops.h"
 #include "qemu/module.h"
 #include "hw/s390x/css.h"

diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index 9da6119be26b1dd78948de82093ac42c677798a9..933271431ba02cb288fb7723f9f3253a004207ee 100644 (file)
--- a/hw/scsi/esp.c
+++ b/hw/scsi/esp.c
@@ -25,7 +25,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/core/irq.h"
 #include "hw/scsi/esp.h"

diff --git a/hw/scsi/lasi_ncr710.c b/hw/scsi/lasi_ncr710.c
index 7e0076c7a3b4d7c7d3682c4692270cde6216ad7a..4fde2265b5be64bef14a989626258da140092b84 100644 (file)
--- a/hw/scsi/lasi_ncr710.c
+++ b/hw/scsi/lasi_ncr710.c
@@ -14,7 +14,7 @@
 #include "qemu/osdep.h"
 #include "hw/scsi/lasi_ncr710.h"
 #include "hw/scsi/ncr53c710.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/timer.h"
 #include "qemu/log.h"
 #include "trace.h"

diff --git a/hw/scsi/lasi_ncr710.h b/hw/scsi/lasi_ncr710.h
index 058718068e84a72f7b9f3e9325e00714f0c44619..99be001fc3c970598852d4cb2b6c69f6070e6716 100644 (file)
--- a/hw/scsi/lasi_ncr710.h
+++ b/hw/scsi/lasi_ncr710.h
@@ -14,7 +14,7 @@
 #ifndef HW_LASI_NCR710_H
 #define HW_LASI_NCR710_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/osdep.h"
 #include "exec/memattrs.h"
 #include "hw/scsi/scsi.h"

diff --git a/hw/scsi/ncr53c710.c b/hw/scsi/ncr53c710.c
index 9931fd4dc7d7fd220afe8aecfcfb8cbb6588d982..0f8914d353d0896c5f540196a29bbd8cb780c4f8 100644 (file)
--- a/hw/scsi/ncr53c710.c
+++ b/hw/scsi/ncr53c710.c
@@ -29,7 +29,7 @@
 #include "qapi/error.h"
 #include "qemu/timer.h"
 #include "hw/core/irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/scsi/scsi.h"
 #include "hw/scsi/ncr53c710.h"
 #include "migration/vmstate.h"

diff --git a/hw/scsi/ncr53c710.h b/hw/scsi/ncr53c710.h
index 9ae64a182d5eeb9bf3faad349db767f37de6c519..a8dc92f4ef878ab95cff19e528e27668edfe3943 100644 (file)
--- a/hw/scsi/ncr53c710.h
+++ b/hw/scsi/ncr53c710.h
@@ -16,7 +16,7 @@
 #define HW_NCR53C710_H
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/scsi/scsi.h"
 #include "qemu/fifo8.h"
 #include "qom/object.h"

diff --git a/hw/sd/omap_mmc.c b/hw/sd/omap_mmc.c
index 267b723e3c592c6353c9bc2ecf38c815cea61256..020429aa4f42231308d48a94f7b5f2a39554f5ae 100644 (file)
--- a/hw/sd/omap_mmc.c
+++ b/hw/sd/omap_mmc.c
@@ -23,7 +23,7 @@
 #include "qemu/log.h"
 #include "qapi/error.h"
 #include "hw/core/irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/arm/omap.h"
 #include "hw/sd/sd.h"
 

diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c
index 761b262d7ba0f9c6fcad278f0206c471d10f299c..08c34fea31d657df61ff2ef05eae184d6031a8d4 100644 (file)
--- a/hw/sd/pl181.c
+++ b/hw/sd/pl181.c
@@ -9,7 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "system/blockdev.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/core/irq.h"
 #include "hw/sd/sd.h"

diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index 35db5cbbcd1973d32a274f5966be99faf2e0e384..acb3fe75a8b82aa570783923cda75cc37e25337b 100644 (file)
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -28,7 +28,7 @@
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "cpu.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/sh4/sh.h"
 #include "system/reset.h"
 #include "system/runstate.h"

diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c
index a0aa89ad318f8c91236ab423adf85b594429fb46..3ae71f99fe5e8ff331d1d46f23fb0afb109dd25a 100644 (file)
--- a/hw/sh4/sh7750.c
+++ b/hw/sh4/sh7750.c
@@ -25,7 +25,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/irq.h"
 #include "hw/sh4/sh.h"
 #include "system/system.h"

diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index 2e3952c917b946989e20965b6eb41741807c7c1c..8ad4eb46bbed2c320d2bf5399fad3d20afddd5d4 100644 (file)
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -28,7 +28,7 @@
 #include "qemu/datadir.h"
 #include "cpu.h"
 #include "exec/target_page.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/error-report.h"
 #include "qemu/timer.h"
 #include "hw/sparc/sun4m_iommu.h"

diff --git a/hw/sparc/sun4m_iommu.c b/hw/sparc/sun4m_iommu.c
index 10c4786dad67c63739fef36a3c57a333f46f2578..ab5eb67072a6e170dae739300ccb006d9f6471cb 100644 (file)
--- a/hw/sparc/sun4m_iommu.c
+++ b/hw/sparc/sun4m_iommu.c
@@ -26,7 +26,7 @@
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/sparc/sun4m_iommu.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"
 #include "system/address-spaces.h"

diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index 14b47c037bac606aa7cded447ac486bd3ffea267..d3ce32b6b095d7de7da8bd8b092830365fedd458 100644 (file)
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -51,7 +51,7 @@
 #include "hw/nvram/chrp_nvram.h"
 #include "hw/sparc/sparc64.h"
 #include "hw/nvram/fw_cfg.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/ide/pci.h"
 #include "hw/core/loader.h"
 #include "hw/core/fw-path-provider.h"

diff --git a/hw/sparc64/sun4u_iommu.c b/hw/sparc64/sun4u_iommu.c
index 14645f475a09ed3a6bef77f8d8b4b6b4b36ae40a..0188ce35d29b8d5b382c2d66d4026906c5f28ae8 100644 (file)
--- a/hw/sparc64/sun4u_iommu.c
+++ b/hw/sparc64/sun4u_iommu.c
@@ -25,7 +25,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/sparc/sun4u_iommu.h"
 #include "system/address-spaces.h"
 #include "qemu/log.h"

diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c
index 6bef856c620fb250f25516840201ed797c37b7b7..b9d5ecba29291efcd681086bc076764bb7ee1964 100644 (file)
--- a/hw/ssi/aspeed_smc.c
+++ b/hw/ssi/aspeed_smc.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/block/flash.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/ssi/pl022.c b/hw/ssi/pl022.c
index 1851118d55fc0805fba157cacbd3486b385a34e2..715a2d21f4ef090c76d462cee1d98898adcb5fc5 100644 (file)
--- a/hw/ssi/pl022.c
+++ b/hw/ssi/pl022.c
@@ -8,7 +8,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/core/irq.h"
 #include "hw/ssi/pl022.h"

diff --git a/hw/ssi/sifive_spi.c b/hw/ssi/sifive_spi.c
index 577cd5d2d8b49dff3f4a2ddc18656a0342774059..2ece78053b2eca2364e12f8925003400fdc61e08 100644 (file)
--- a/hw/ssi/sifive_spi.c
+++ b/hw/ssi/sifive_spi.c
@@ -22,7 +22,7 @@
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/ssi/ssi.h"
 #include "qemu/fifo8.h"
 #include "qemu/log.h"

diff --git a/hw/ssi/xilinx_spi.c b/hw/ssi/xilinx_spi.c
index cf406d082463cee50c7e1acbeaefc7687cf35af2..79f3e8bfae35f361f2ab5fa3b9edac4a33d323a8 100644 (file)
--- a/hw/ssi/xilinx_spi.c
+++ b/hw/ssi/xilinx_spi.c
@@ -26,7 +26,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"
 #include "qemu/fifo8.h"

diff --git a/hw/ssi/xilinx_spips.c b/hw/ssi/xilinx_spips.c
index a56a5e304dc17acd30ef46eeebaba21e82526eb9..a4718fb72d9da3f5767b1ca8de0bc1c15e874344 100644 (file)
--- a/hw/ssi/xilinx_spips.c
+++ b/hw/ssi/xilinx_spips.c
@@ -23,7 +23,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/irq.h"
 #include "hw/core/ptimer.h"
 #include "hw/core/qdev-properties.h"

diff --git a/hw/ssi/xlnx-versal-ospi.c b/hw/ssi/xlnx-versal-ospi.c
index 93cdc9d39997f15fa08b4fa4107ae4e0c3ced8e1..467f0ce7033e090cb7edc3a2a76abf471ba4f951 100644 (file)
--- a/hw/ssi/xlnx-versal-ospi.c
+++ b/hw/ssi/xlnx-versal-ospi.c
@@ -23,7 +23,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/core/qdev-properties.h"
 #include "qemu/bitops.h"

diff --git a/hw/timer/allwinner-a10-pit.c b/hw/timer/allwinner-a10-pit.c
index d52669787ee7ab57e3383181640c23872912597d..bb995313ae007b55927588ceb7012fa91fe685e3 100644 (file)
--- a/hw/timer/allwinner-a10-pit.c
+++ b/hw/timer/allwinner-a10-pit.c
@@ -18,7 +18,7 @@
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/timer/allwinner-a10-pit.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"

diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c
index c38e56f5b897e4c30317c53f03657efc34257d0d..fb70333c538098323d435700dd36de29f6e8139d 100644 (file)
--- a/hw/timer/arm_timer.c
+++ b/hw/timer/arm_timer.c
@@ -8,7 +8,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/timer.h"
 #include "hw/core/irq.h"

diff --git a/hw/timer/armv7m_systick.c b/hw/timer/armv7m_systick.c
index baba0817b8f898363e442e01983ab735f201a542..65cfaf491425a912fccf25feb6bc6cd4fb83ba68 100644 (file)
--- a/hw/timer/armv7m_systick.c
+++ b/hw/timer/armv7m_systick.c
@@ -13,7 +13,7 @@
 #include "hw/timer/armv7m_systick.h"
 #include "migration/vmstate.h"
 #include "hw/core/irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/qdev-clock.h"
 #include "qemu/timer.h"
 #include "qemu/log.h"

diff --git a/hw/timer/aspeed_timer.c b/hw/timer/aspeed_timer.c
index 20adb7decbe337f876000f2856fe1a197ab76fbf..1e954f7aec5c8df3383adf9498b1cfb613b3e7fd 100644 (file)
--- a/hw/timer/aspeed_timer.c
+++ b/hw/timer/aspeed_timer.c
@@ -12,7 +12,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/core/irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/timer/aspeed_timer.h"
 #include "migration/vmstate.h"
 #include "qemu/bitops.h"

diff --git a/hw/timer/cadence_ttc.c b/hw/timer/cadence_ttc.c
index 6f02c6a02d999d258fef7790f2d1eba54f8f2f1f..3d53921cfafa4d4cd532b7796256de8cd2bd89af 100644 (file)
--- a/hw/timer/cadence_ttc.c
+++ b/hw/timer/cadence_ttc.c
@@ -18,7 +18,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"
 #include "qemu/timer.h"

diff --git a/hw/timer/cmsdk-apb-dualtimer.c b/hw/timer/cmsdk-apb-dualtimer.c
index 39b1fa3a149e8e0fe51212139dd8860fbdba6590..0f57f01aad9edbe7995287375466e3f70ee279d8 100644 (file)
--- a/hw/timer/cmsdk-apb-dualtimer.c
+++ b/hw/timer/cmsdk-apb-dualtimer.c
@@ -21,7 +21,7 @@
 #include "trace.h"
 #include "qapi/error.h"
 #include "qemu/module.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/core/registerfields.h"

diff --git a/hw/timer/cmsdk-apb-timer.c b/hw/timer/cmsdk-apb-timer.c
index e8b6601097c703e2c7cc241e9e0cc8b366c7b3ad..4717cec0464bc4c56b0d1bc394f924b1c062af8f 100644 (file)
--- a/hw/timer/cmsdk-apb-timer.c
+++ b/hw/timer/cmsdk-apb-timer.c
@@ -32,7 +32,7 @@
 #include "qemu/module.h"
 #include "qapi/error.h"
 #include "trace.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/irq.h"
 #include "hw/core/registerfields.h"
 #include "hw/core/qdev-clock.h"

diff --git a/hw/timer/digic-timer.c b/hw/timer/digic-timer.c
index 12b79914df0cbc1b9ddeec4af9929f15078b4276..352132bf214d5681618e7369920430b32663ae67 100644 (file)
--- a/hw/timer/digic-timer.c
+++ b/hw/timer/digic-timer.c
@@ -27,7 +27,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/ptimer.h"
 #include "qemu/module.h"
 #include "qemu/log.h"

diff --git a/hw/timer/exynos4210_mct.c b/hw/timer/exynos4210_mct.c
index f6527a451b67048adf93dca00d9610688779d5b8..0424539c78fb6dbf70184b935253ec9efd5b1c04 100644 (file)
--- a/hw/timer/exynos4210_mct.c
+++ b/hw/timer/exynos4210_mct.c
@@ -54,7 +54,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/timer.h"
 #include "qemu/module.h"

diff --git a/hw/timer/exynos4210_pwm.c b/hw/timer/exynos4210_pwm.c
index 1643fa3941808989c815e86720bc036975718e05..64eb4f5c8d718b4d57a21ae9c2453e13f44e1c88 100644 (file)
--- a/hw/timer/exynos4210_pwm.c
+++ b/hw/timer/exynos4210_pwm.c
@@ -22,7 +22,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/timer.h"
 #include "qemu/module.h"

diff --git a/hw/timer/grlib_gptimer.c b/hw/timer/grlib_gptimer.c
index dbce6f736fa98fd9b8115f02ee2af927945b06b7..099ab6c586616a1d88547c967dd012804230c414 100644 (file)
--- a/hw/timer/grlib_gptimer.c
+++ b/hw/timer/grlib_gptimer.c
@@ -26,7 +26,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/timer/grlib_gptimer.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/timer.h"
 #include "hw/core/irq.h"
 #include "hw/core/ptimer.h"

diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
index 82006df0e3460413c4b3aa640b8e9b7b9fc10828..070b40e7f67e7decd848d2eb0d2157b999eef0da 100644 (file)
--- a/hw/timer/hpet.c
+++ b/hw/timer/hpet.c
@@ -31,7 +31,7 @@
 #include "qemu/timer.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/timer/hpet.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/rtc/mc146818rtc.h"
 #include "hw/rtc/mc146818rtc_regs.h"
 #include "migration/vmstate.h"

diff --git a/hw/timer/pxa2xx_timer.c b/hw/timer/pxa2xx_timer.c
index b875c0505253ef00c41c7d164feb7190e6dd3a81..b4f501e57fe63d244a016de91f2e781b90b5e733 100644 (file)
--- a/hw/timer/pxa2xx_timer.c
+++ b/hw/timer/pxa2xx_timer.c
@@ -12,7 +12,7 @@
 #include "hw/core/qdev-properties.h"
 #include "qemu/timer.h"
 #include "system/runstate.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/timer/slavio_timer.c b/hw/timer/slavio_timer.c
index 07359a6fe70bf1fc6ce7e2c65e969c054bdb7135..71696a4b615115b55c49646fcf8698824f8fad5b 100644 (file)
--- a/hw/timer/slavio_timer.c
+++ b/hw/timer/slavio_timer.c
@@ -27,7 +27,7 @@
 #include "hw/core/irq.h"
 #include "hw/core/ptimer.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "trace.h"
 #include "qemu/module.h"

diff --git a/hw/timer/sse-counter.c b/hw/timer/sse-counter.c
index 39d140347e5d12796b92985630c7028e9db88e2d..bec3333b0d8246ecf3541c6a9f81569801448809 100644 (file)
--- a/hw/timer/sse-counter.c
+++ b/hw/timer/sse-counter.c
@@ -32,7 +32,7 @@
 #include "qapi/error.h"
 #include "trace.h"
 #include "hw/timer/sse-counter.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/registerfields.h"
 #include "hw/core/clock.h"
 #include "hw/core/qdev-clock.h"

diff --git a/hw/timer/sse-timer.c b/hw/timer/sse-timer.c
index 62381e07e065cccdb3a731512b9d855d93921904..ea60711892211194a2de023cf5467258629f56ee 100644 (file)
--- a/hw/timer/sse-timer.c
+++ b/hw/timer/sse-timer.c
@@ -40,7 +40,7 @@
 #include "trace.h"
 #include "hw/timer/sse-timer.h"
 #include "hw/timer/sse-counter.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/irq.h"
 #include "hw/core/registerfields.h"
 #include "hw/core/clock.h"

diff --git a/hw/timer/xilinx_timer.c b/hw/timer/xilinx_timer.c
index 9c2969a2c4fe7e07b53d16ba29d5385af85b6db5..8a502dae0ee4891e4ca4e15621151095b0da3864 100644 (file)
--- a/hw/timer/xilinx_timer.c
+++ b/hw/timer/xilinx_timer.c
@@ -27,7 +27,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/irq.h"
 #include "hw/core/ptimer.h"
 #include "hw/core/qdev-properties.h"

diff --git a/hw/tpm/tpm_tis_i2c.c b/hw/tpm/tpm_tis_i2c.c
index 5ce84dc7a453a54f303967b049f32893085eaf3e..9f13e0ec1207ae4b616292105cd088a48bd4008e 100644 (file)
--- a/hw/tpm/tpm_tis_i2c.c
+++ b/hw/tpm/tpm_tis_i2c.c
@@ -19,7 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/i2c/i2c.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/acpi/tpm.h"
 #include "migration/vmstate.h"
 #include "tpm_prop.h"

diff --git a/hw/tpm/tpm_tis_sysbus.c b/hw/tpm/tpm_tis_sysbus.c
index 07c304013012564dae2598c871cbfeae59184882..e9372e7316305fe1a4d415a712ab516e0fd5f073 100644 (file)
--- a/hw/tpm/tpm_tis_sysbus.c
+++ b/hw/tpm/tpm_tis_sysbus.c
@@ -27,7 +27,7 @@
 #include "migration/vmstate.h"
 #include "hw/acpi/tpm.h"
 #include "tpm_prop.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "tpm_tis.h"
 #include "qom/object.h"
 

diff --git a/hw/tricore/tc27x_soc.c b/hw/tricore/tc27x_soc.c
index e1a97a43874e930fb11a6eb74542774efbf49ecf..5b1b07cee1cbbf937bddd4a494042fc2f9f16f0a 100644 (file)
--- a/hw/tricore/tc27x_soc.c
+++ b/hw/tricore/tc27x_soc.c
@@ -20,7 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/loader.h"
 #include "qemu/units.h"
 #include "hw/misc/unimp.h"

diff --git a/hw/tricore/tricore_testdevice.c b/hw/tricore/tricore_testdevice.c
index d3ffc5fe9f3596e8999648c49ae0ca33004dc997..2eb16731e90e89a4c338e4a2d419afbb20d49534 100644 (file)
--- a/hw/tricore/tricore_testdevice.c
+++ b/hw/tricore/tricore_testdevice.c
@@ -17,7 +17,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/tricore/tricore_testdevice.h"
 

diff --git a/hw/uefi/var-service-sysbus.c b/hw/uefi/var-service-sysbus.c
index 3bf933565065b6cfa1a711bb75d7b1c8d2e99398..75b07905184893507a982c865607a761fe0cb69f 100644 (file)
--- a/hw/uefi/var-service-sysbus.c
+++ b/hw/uefi/var-service-sysbus.c
@@ -7,7 +7,7 @@
 #include "migration/vmstate.h"
 
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #include "hw/uefi/hardware-info.h"
 #include "hw/uefi/var-service.h"

diff --git a/hw/usb/hcd-dwc2.h b/hw/usb/hcd-dwc2.h
index a99409a654b1899a8d3e643a3a648dfb64589f2a..68877661ca0da29dd2cc42814d36bbd5b902d37c 100644 (file)
--- a/hw/usb/hcd-dwc2.h
+++ b/hw/usb/hcd-dwc2.h
@@ -21,7 +21,7 @@
 
 #include "qemu/timer.h"
 #include "hw/core/irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/usb/usb.h"
 #include "system/dma.h"
 #include "qom/object.h"

diff --git a/hw/usb/hcd-dwc3.c b/hw/usb/hcd-dwc3.c
index 4018d70f02f3a989bd3bfe3b5341d6df087b5b17..785732fc978d0a9eb0705f75b656134c5871842b 100644 (file)
--- a/hw/usb/hcd-dwc3.c
+++ b/hw/usb/hcd-dwc3.c
@@ -28,7 +28,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/register.h"
 #include "qemu/bitops.h"
 #include "qom/object.h"

diff --git a/hw/usb/hcd-ehci.h b/hw/usb/hcd-ehci.h
index c16717294d373c47dcca45cb67c309049097a010..0ae8c06331aba84f63630d1c23e34f4cb3a18c61 100644 (file)
--- a/hw/usb/hcd-ehci.h
+++ b/hw/usb/hcd-ehci.h
@@ -22,7 +22,7 @@
 #include "hw/usb/usb.h"
 #include "system/dma.h"
 #include "hw/pci/pci_device.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #ifndef EHCI_DEBUG
 #define EHCI_DEBUG   0

diff --git a/hw/usb/hcd-ohci-pci.c b/hw/usb/hcd-ohci-pci.c
index bdbbaaa87a3a25c5b41bdcd692d318ae9d217a88..18b58f5fcbc360245cff6ac493904e080f16b53b 100644 (file)
--- a/hw/usb/hcd-ohci-pci.c
+++ b/hw/usb/hcd-ohci-pci.c
@@ -24,7 +24,7 @@
 #include "hw/usb/usb.h"
 #include "migration/vmstate.h"
 #include "hw/pci/pci_device.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/qdev-dma.h"
 #include "hw/core/qdev-properties.h"
 #include "trace.h"

diff --git a/hw/usb/hcd-ohci-sysbus.c b/hw/usb/hcd-ohci-sysbus.c
index 350b01189972fa49c6ef6621193555ebbebe6308..1a2cf29bed84a14a5ae662c40176797beaf7e8ab 100644 (file)
--- a/hw/usb/hcd-ohci-sysbus.c
+++ b/hw/usb/hcd-ohci-sysbus.c
@@ -25,7 +25,7 @@
 #include "qemu/timer.h"
 #include "hw/usb/usb.h"
 #include "migration/vmstate.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/qdev-dma.h"
 #include "hw/core/qdev-properties.h"
 #include "trace.h"

diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c
index c771aafdd06f6df88ffa48e43507b89f5ded167d..c7e9c7190350c865cf8e4263a5861fd9a284b0e0 100644 (file)
--- a/hw/usb/hcd-ohci.c
+++ b/hw/usb/hcd-ohci.c
@@ -32,7 +32,7 @@
 #include "qemu/timer.h"
 #include "hw/usb/usb.h"
 #include "migration/vmstate.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/qdev-dma.h"
 #include "hw/core/qdev-properties.h"
 #include "trace.h"

diff --git a/hw/usb/hcd-ohci.h b/hw/usb/hcd-ohci.h
index 75e266de90b4b961ee01258d26dfad12260bd30f..243cd1f46ac61b17891af9013c563ef41b04d96e 100644 (file)
--- a/hw/usb/hcd-ohci.h
+++ b/hw/usb/hcd-ohci.h
@@ -21,7 +21,7 @@
 #ifndef HCD_OHCI_H
 #define HCD_OHCI_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "system/dma.h"
 #include "hw/usb/usb.h"
 #include "qom/object.h"

diff --git a/hw/usb/hcd-xhci-sysbus.h b/hw/usb/hcd-xhci-sysbus.h
index f8175470bab7f324734b8589b93938290fcde3bc..0ce6b6d9896b8b3bd7d5c937884c0c73ad245d94 100644 (file)
--- a/hw/usb/hcd-xhci-sysbus.h
+++ b/hw/usb/hcd-xhci-sysbus.h
@@ -13,7 +13,7 @@
 
 #include "hw/usb/usb.h"
 #include "hcd-xhci.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #define XHCI_SYSBUS(obj) \
     OBJECT_CHECK(XHCISysbusState, (obj), TYPE_XHCI_SYSBUS)

diff --git a/hw/usb/xlnx-usb-subsystem.c b/hw/usb/xlnx-usb-subsystem.c
index e0dfdfdcbd1fe22f916e03a57bc2f4b6d14af50a..9bf040c917bafaabe9efcae9d88c0b24f12735f8 100644 (file)
--- a/hw/usb/xlnx-usb-subsystem.c
+++ b/hw/usb/xlnx-usb-subsystem.c
@@ -23,7 +23,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/register.h"
 #include "qemu/bitops.h"
 #include "qom/object.h"

diff --git a/hw/usb/xlnx-versal-usb2-ctrl-regs.c b/hw/usb/xlnx-versal-usb2-ctrl-regs.c
index 33a7d7fbca030049d6cff83faa3aa492d9e503c6..15ea4384488d71aac9116fa53e0f2c2ad1b54740 100644 (file)
--- a/hw/usb/xlnx-versal-usb2-ctrl-regs.c
+++ b/hw/usb/xlnx-versal-usb2-ctrl-regs.c
@@ -28,7 +28,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/irq.h"
 #include "hw/core/register.h"
 #include "qemu/bitops.h"

diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c
index 54bd0c57b5f952be63ffe763624e4abdfa6418be..0b0412b22f2367fb7e6a3cc5f8c62582f2a77347 100644 (file)
--- a/hw/virtio/virtio-mmio.c
+++ b/hw/virtio/virtio-mmio.c
@@ -23,7 +23,7 @@
 #include "standard-headers/linux/virtio_mmio.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/virtio/virtio.h"
 #include "migration/qemu-file-types.h"
 #include "qemu/host-utils.h"

diff --git a/hw/vmapple/aes.c b/hw/vmapple/aes.c
index a6e94610b85f027cfa2fc1daba248c270fe694eb..553e688adbe7e2636b9514c27a2b180af5cc66e5 100644 (file)
--- a/hw/vmapple/aes.c
+++ b/hw/vmapple/aes.c
@@ -15,7 +15,7 @@
 #include "crypto/aes.h"
 #include "crypto/cipher.h"
 #include "hw/core/irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/vmapple/vmapple.h"
 #include "migration/vmstate.h"
 #include "qemu/cutils.h"

diff --git a/hw/vmapple/bdif.c b/hw/vmapple/bdif.c
index 5ccd374581969c0e8c70714fbd82aa0bdb0e189f..4dc10c151d28245b07df2110b892534fda2471d6 100644 (file)
--- a/hw/vmapple/bdif.c
+++ b/hw/vmapple/bdif.c
@@ -15,7 +15,7 @@
 #include "qemu/module.h"
 #include "trace.h"
 #include "hw/vmapple/vmapple.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/block/block.h"
 #include "qapi/error.h"
 #include "system/block-backend.h"

diff --git a/hw/vmapple/cfg.c b/hw/vmapple/cfg.c
index 3d58a29f69d7b6090436afbe9609ee9370a6c115..2a3204f0ec2615097a4198e42cbe8d185f526e9e 100644 (file)
--- a/hw/vmapple/cfg.c
+++ b/hw/vmapple/cfg.c
@@ -11,7 +11,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/vmapple/vmapple.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "qapi/error.h"

diff --git a/hw/vmapple/vmapple.c b/hw/vmapple/vmapple.c
index 2ebd0f07bd345af655638dc854eeaba361663ea1..b1379eafef314884283d5871f98d4c5431f4cafd 100644 (file)
--- a/hw/vmapple/vmapple.c
+++ b/hw/vmapple/vmapple.c
@@ -29,7 +29,7 @@
 #include "hw/core/irq.h"
 #include "hw/core/loader.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/usb/usb.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/primecell.h"

diff --git a/hw/watchdog/allwinner-wdt.c b/hw/watchdog/allwinner-wdt.c
index 68b600689a535e269aa2aa4d44d79ce974dc0911..156f82353423d9861d88b79b5caaab8a7269cd90 100644 (file)
--- a/hw/watchdog/allwinner-wdt.c
+++ b/hw/watchdog/allwinner-wdt.c
@@ -25,7 +25,7 @@
 #include "qemu/units.h"
 #include "qemu/module.h"
 #include "trace.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/registerfields.h"
 #include "hw/watchdog/allwinner-wdt.h"
 #include "system/watchdog.h"

diff --git a/hw/watchdog/cmsdk-apb-watchdog.c b/hw/watchdog/cmsdk-apb-watchdog.c
index ceae792580e9e5df8319de1e0f93c8fcd70dcb2a..c474166cfcc6977fdc31a746e824d2a4b3127e34 100644 (file)
--- a/hw/watchdog/cmsdk-apb-watchdog.c
+++ b/hw/watchdog/cmsdk-apb-watchdog.c
@@ -26,7 +26,7 @@
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "system/watchdog.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/core/registerfields.h"

diff --git a/hw/watchdog/wdt_aspeed.c b/hw/watchdog/wdt_aspeed.c
index 930834bfcafdfa1d0af916a952bb5bf8fd3b68be..26506f3c33f9a96e1d150f47fa610ba22067f574 100644 (file)
--- a/hw/watchdog/wdt_aspeed.c
+++ b/hw/watchdog/wdt_aspeed.c
@@ -15,7 +15,7 @@
 #include "qemu/timer.h"
 #include "system/watchdog.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/watchdog/wdt_aspeed.h"
 #include "migration/vmstate.h"
 #include "trace.h"

diff --git a/hw/xen/xen-bus.c b/hw/xen/xen-bus.c
index e3c51030f35e3c63fe555321d6701b5fa9170a0f..dfad2bc5085f8da5984fec68c46556908f409823 100644 (file)
--- a/hw/xen/xen-bus.c
+++ b/hw/xen/xen-bus.c
@@ -10,7 +10,7 @@
 #include "qemu/module.h"
 #include "qemu/uuid.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/xen/xen.h"
 #include "hw/xen/xen-backend.h"
 #include "hw/xen/xen-legacy-backend.h" /* xen_be_init() */

diff --git a/hw/xen/xen-legacy-backend.c b/hw/xen/xen-legacy-backend.c
index f9b0dd1513da422b81c3d8fba8d870a0b4bb368e..7977b527127b045342d83975020969f6f01c145f 100644 (file)
--- a/hw/xen/xen-legacy-backend.c
+++ b/hw/xen/xen-legacy-backend.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/boards.h"
 #include "hw/core/qdev-properties.h"
 #include "qemu/main-loop.h"

diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c
index a533f2bac3f7591b96196ec0938f764fbb70597d..5e6f897429d286785eb1f9b5b70e5b081c523410 100644 (file)
--- a/hw/xtensa/xtfpga.c
+++ b/hw/xtensa/xtfpga.c
@@ -38,7 +38,7 @@
 #include "exec/tswap.h"
 #include "hw/char/serial-mm.h"
 #include "net/net.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/block/flash.h"
 #include "chardev/char.h"
 #include "system/device_tree.h"

diff --git a/include/hw/acpi/generic_event_device.h b/include/hw/acpi/generic_event_device.h
index 130c014d3f0eb4a50ddb96d812f46685e4fe2a88..7cbfb5fe7d72ad059a2cc014a03412271a25623d 100644 (file)
--- a/include/hw/acpi/generic_event_device.h
+++ b/include/hw/acpi/generic_event_device.h
@@ -59,7 +59,7 @@
 #ifndef HW_ACPI_GENERIC_EVENT_DEVICE_H
 #define HW_ACPI_GENERIC_EVENT_DEVICE_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/acpi/memory_hotplug.h"
 #include "hw/acpi/ghes.h"
 #include "hw/acpi/cpu.h"

diff --git a/include/hw/adc/aspeed_adc.h b/include/hw/adc/aspeed_adc.h
index f502f197ac008da5b7364094ac5917d4f7e78d35..75c00b032555e2aad135bce02310105d728c0adb 100644 (file)
--- a/include/hw/adc/aspeed_adc.h
+++ b/include/hw/adc/aspeed_adc.h
@@ -11,7 +11,7 @@
 #ifndef HW_ADC_ASPEED_ADC_H
 #define HW_ADC_ASPEED_ADC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #define TYPE_ASPEED_ADC "aspeed.adc"
 #define TYPE_ASPEED_2400_ADC TYPE_ASPEED_ADC "-ast2400"

diff --git a/include/hw/adc/npcm7xx_adc.h b/include/hw/adc/npcm7xx_adc.h
index 02dc1902fceb8b981c75085a9e6775c35353423d..867e4c767c07ac5d98bb41df80a0a323c317de84 100644 (file)
--- a/include/hw/adc/npcm7xx_adc.h
+++ b/include/hw/adc/npcm7xx_adc.h
@@ -18,7 +18,7 @@
 
 #include "hw/core/clock.h"
 #include "hw/core/irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/timer.h"
 
 #define NPCM7XX_ADC_NUM_INPUTS      8

diff --git a/include/hw/adc/stm32f2xx_adc.h b/include/hw/adc/stm32f2xx_adc.h
index 42b48981f2412b78db71759a19b6169d340868cb..2af21f1852dab9a7e73f6ef2ab380ab5bbf6c1f3 100644 (file)
--- a/include/hw/adc/stm32f2xx_adc.h
+++ b/include/hw/adc/stm32f2xx_adc.h
@@ -25,7 +25,7 @@
 #ifndef HW_STM32F2XX_ADC_H
 #define HW_STM32F2XX_ADC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define ADC_SR    0x00

diff --git a/include/hw/adc/zynq-xadc.h b/include/hw/adc/zynq-xadc.h
index c10cc4c379c232f2e8180492e589ee9f65b8c053..9b4943681b8d05edec7b443377cd426e0d061a7b 100644 (file)
--- a/include/hw/adc/zynq-xadc.h
+++ b/include/hw/adc/zynq-xadc.h
@@ -15,7 +15,7 @@
 #ifndef ZYNQ_XADC_H
 #define ZYNQ_XADC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define ZYNQ_XADC_MMIO_SIZE     0x0020

diff --git a/include/hw/arm/armsse.h b/include/hw/arm/armsse.h
index 414e553600d5d71e34400e6e85c5852243bc6045..bdf2d4db8e2fd4997e72581d2bd1466d57dd3507 100644 (file)
--- a/include/hw/arm/armsse.h
+++ b/include/hw/arm/armsse.h
@@ -93,7 +93,7 @@
 #ifndef ARMSSE_H
 #define ARMSSE_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/arm/armv7m.h"
 #include "hw/misc/iotkit-secctl.h"
 #include "hw/misc/tz-ppc.h"

diff --git a/include/hw/arm/armv7m.h b/include/hw/arm/armv7m.h
index e31888cc8cd07a5d7b5e36c779b142b7f56648d3..98ad08db03685af40e4387add10dea52f18dc2da 100644 (file)
--- a/include/hw/arm/armv7m.h
+++ b/include/hw/arm/armv7m.h
@@ -10,7 +10,7 @@
 #ifndef HW_ARM_ARMV7M_H
 #define HW_ARM_ARMV7M_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/intc/armv7m_nvic.h"
 #include "hw/misc/armv7m_ras.h"
 #include "target/arm/idau.h"

diff --git a/include/hw/arm/bcm2835_peripherals.h b/include/hw/arm/bcm2835_peripherals.h
index d46d892956d7c41c342e7236a932a602791aa86b..bf35bb18e542332374e2b4b21069743d73b395ef 100644 (file)
--- a/include/hw/arm/bcm2835_peripherals.h
+++ b/include/hw/arm/bcm2835_peripherals.h
@@ -12,7 +12,7 @@
 #ifndef BCM2835_PERIPHERALS_H
 #define BCM2835_PERIPHERALS_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/char/pl011.h"
 #include "hw/char/bcm2835_aux.h"
 #include "hw/display/bcm2835_fb.h"

diff --git a/include/hw/arm/exynos4210.h b/include/hw/arm/exynos4210.h
index fbe4370219d20b98340b0b1b84f6554b890e2175..b29e7243c72ce22b7aca337315036a6b5d17e037 100644 (file)
--- a/include/hw/arm/exynos4210.h
+++ b/include/hw/arm/exynos4210.h
@@ -25,7 +25,7 @@
 #define EXYNOS4210_H
 
 #include "hw/core/or-irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/cpu/a9mpcore.h"
 #include "hw/intc/exynos4210_gic.h"
 #include "hw/intc/exynos4210_combiner.h"

diff --git a/include/hw/arm/fsl-imx8mp.h b/include/hw/arm/fsl-imx8mp.h
index 1275df22f1964dc171a079bbad7c4bde582a5cb1..4b367b754c6cf20ea58f0a2b79d8ede376c9f6ee 100644 (file)
--- a/include/hw/arm/fsl-imx8mp.h
+++ b/include/hw/arm/fsl-imx8mp.h
@@ -26,7 +26,7 @@
 #include "hw/timer/imx_gpt.h"
 #include "hw/usb/hcd-dwc3.h"
 #include "hw/watchdog/wdt_imx2.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 #include "qemu/units.h"
 

diff --git a/include/hw/arm/nrf51_soc.h b/include/hw/arm/nrf51_soc.h
index 94d7fc62ac427c466b0af9487708b8ac56da1431..f759d007a136bf04b05608514a6a87516472b91c 100644 (file)
--- a/include/hw/arm/nrf51_soc.h
+++ b/include/hw/arm/nrf51_soc.h
@@ -10,7 +10,7 @@
 #ifndef NRF51_SOC_H
 #define NRF51_SOC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/arm/armv7m.h"
 #include "hw/char/nrf51_uart.h"
 #include "hw/misc/nrf51_rng.h"

diff --git a/include/hw/arm/smmu-common.h b/include/hw/arm/smmu-common.h
index 80d0fecfde8ad8202aef7186524566d856266d9f..48368c8e8949a805c5df2368bd828a13156b2d44 100644 (file)
--- a/include/hw/arm/smmu-common.h
+++ b/include/hw/arm/smmu-common.h
@@ -19,7 +19,7 @@
 #ifndef HW_ARM_SMMU_COMMON_H
 #define HW_ARM_SMMU_COMMON_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/pci/pci.h"
 #include "qom/object.h"
 

diff --git a/include/hw/arm/xlnx-versal.h b/include/hw/arm/xlnx-versal.h
index e1fb1f4cf5b3dade7da55cae6f7aa24eb5f5e2f8..4c4599add1d394e1fd8c57d19e1b280e8946fa9f 100644 (file)
--- a/include/hw/arm/xlnx-versal.h
+++ b/include/hw/arm/xlnx-versal.h
@@ -13,7 +13,7 @@
 #ifndef XLNX_VERSAL_H
 #define XLNX_VERSAL_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 #include "net/can_emu.h"
 #include "hw/arm/xlnx-versal-version.h"

diff --git a/include/hw/audio/asc.h b/include/hw/audio/asc.h
index bb51e9a3d1917f9ada6ecd98bbe55c80062e960a..f4aefbfe5a56bcda7dd386251c8339cebe663829 100644 (file)
--- a/include/hw/audio/asc.h
+++ b/include/hw/audio/asc.h
@@ -13,7 +13,7 @@
 #ifndef HW_AUDIO_ASC_H
 #define HW_AUDIO_ASC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/audio.h"
 
 #define ASC_FREQ 22257

diff --git a/include/hw/block/swim.h b/include/hw/block/swim.h
index 5f567e8d59579b54b76080eb56fad95f0d12f6e5..e8998f57c4b0bbcfaa032c9349ce2f78352dec9d 100644 (file)
--- a/include/hw/block/swim.h
+++ b/include/hw/block/swim.h
@@ -12,7 +12,7 @@
 #define SWIM_H
 
 #include "hw/block/block.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define SWIM_MAX_FD            2

diff --git a/include/hw/char/avr_usart.h b/include/hw/char/avr_usart.h
index bd2d488f9a11e12dfa276c76fb8e6126395b4bb0..8af7a5d1eec3538c17399a88fb8a697158c9e33a 100644 (file)
--- a/include/hw/char/avr_usart.h
+++ b/include/hw/char/avr_usart.h
@@ -22,7 +22,7 @@
 #ifndef HW_CHAR_AVR_USART_H
 #define HW_CHAR_AVR_USART_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "chardev/char-fe.h"
 #include "qom/object.h"
 

diff --git a/include/hw/char/bcm2835_aux.h b/include/hw/char/bcm2835_aux.h
index a11134f216ff85a352342cf931dffb1e30efcef4..c5ce148bbce4e6337188f706b4fec448ea8ac54f 100644 (file)
--- a/include/hw/char/bcm2835_aux.h
+++ b/include/hw/char/bcm2835_aux.h
@@ -9,7 +9,7 @@
 #ifndef BCM2835_AUX_H
 #define BCM2835_AUX_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "chardev/char-fe.h"
 #include "qom/object.h"
 

diff --git a/include/hw/char/cadence_uart.h b/include/hw/char/cadence_uart.h
index ad09fbdf32cc3a9b45d3e49586342aa434ba44bd..751a751248fb08ea4eeec05d7684367b49d0ba5c 100644 (file)
--- a/include/hw/char/cadence_uart.h
+++ b/include/hw/char/cadence_uart.h
@@ -20,7 +20,7 @@
 #define CADENCE_UART_H
 
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "chardev/char-fe.h"
 #include "qapi/error.h"
 #include "qemu/timer.h"

diff --git a/include/hw/char/cmsdk-apb-uart.h b/include/hw/char/cmsdk-apb-uart.h
index 3d0af26cebc92ee79591a0666d7c150bf0ea3080..0c62b7f2f504a9c04f832f5be44713048c1590c9 100644 (file)
--- a/include/hw/char/cmsdk-apb-uart.h
+++ b/include/hw/char/cmsdk-apb-uart.h
@@ -12,7 +12,7 @@
 #ifndef CMSDK_APB_UART_H
 #define CMSDK_APB_UART_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "chardev/char-fe.h"
 #include "qom/object.h"
 

diff --git a/include/hw/char/digic-uart.h b/include/hw/char/digic-uart.h
index 3eebdab8a01b25242a82009bb1f5d023c65cc997..6f67b70dfd53281f5c3df75f31801f2859a5ccf6 100644 (file)
--- a/include/hw/char/digic-uart.h
+++ b/include/hw/char/digic-uart.h
@@ -18,7 +18,7 @@
 #ifndef HW_CHAR_DIGIC_UART_H
 #define HW_CHAR_DIGIC_UART_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "chardev/char-fe.h"
 #include "qom/object.h"
 

diff --git a/include/hw/char/escc.h b/include/hw/char/escc.h
index 857f64699e37e41c1ea848e25acbe95804133e2d..9e60175b77805569cb92028871af4d155ab60ac4 100644 (file)
--- a/include/hw/char/escc.h
+++ b/include/hw/char/escc.h
@@ -3,7 +3,7 @@
 
 #include "chardev/char-fe.h"
 #include "chardev/char-serial.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "ui/input.h"
 #include "qom/object.h"
 

diff --git a/include/hw/char/goldfish_tty.h b/include/hw/char/goldfish_tty.h
index 70fdedd1d0f425c36d2aa682684c642cc0168032..a696362fa5530996f185409e30080b4fd6615c4a 100644 (file)
--- a/include/hw/char/goldfish_tty.h
+++ b/include/hw/char/goldfish_tty.h
@@ -12,7 +12,7 @@
 
 #include "qemu/fifo8.h"
 #include "chardev/char-fe.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #define TYPE_GOLDFISH_TTY "goldfish_tty"
 OBJECT_DECLARE_SIMPLE_TYPE(GoldfishTTYState, GOLDFISH_TTY)

diff --git a/include/hw/char/ibex_uart.h b/include/hw/char/ibex_uart.h
index 1ccbb602e615db3539bdf897ff1325b1a52194dd..882796e0c64df88341f6f757ee91d29b1be64cba 100644 (file)
--- a/include/hw/char/ibex_uart.h
+++ b/include/hw/char/ibex_uart.h
@@ -25,7 +25,7 @@
 #ifndef HW_IBEX_UART_H
 #define HW_IBEX_UART_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "chardev/char-fe.h"
 #include "qemu/timer.h"
 #include "qom/object.h"

diff --git a/include/hw/char/imx_serial.h b/include/hw/char/imx_serial.h
index 2dcd2e6bcdd29f8a950ba5f21af33d2742f530b1..855792b6055d11ef37a14279c08b7c0d7ce3ce3a 100644 (file)
--- a/include/hw/char/imx_serial.h
+++ b/include/hw/char/imx_serial.h
@@ -18,7 +18,7 @@
 #ifndef IMX_SERIAL_H
 #define IMX_SERIAL_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "chardev/char-fe.h"
 #include "qom/object.h"
 #include "qemu/fifo32.h"

diff --git a/include/hw/char/max78000_uart.h b/include/hw/char/max78000_uart.h
index ac93f83389a21aa8461184f790b8f3146b698d4f..6977c7b3f16fd856e90c3b2b8583eea476001051 100644 (file)
--- a/include/hw/char/max78000_uart.h
+++ b/include/hw/char/max78000_uart.h
@@ -9,7 +9,7 @@
 #ifndef HW_MAX78000_UART_H
 #define HW_MAX78000_UART_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "chardev/char-fe.h"
 #include "qemu/fifo8.h"
 #include "qom/object.h"

diff --git a/include/hw/char/mchp_pfsoc_mmuart.h b/include/hw/char/mchp_pfsoc_mmuart.h
index a7b8b1b08b3ffbd52c01bf2ca7da426d17210312..1e27732df12ffa06f120536613ae95eba886e76d 100644 (file)
--- a/include/hw/char/mchp_pfsoc_mmuart.h
+++ b/include/hw/char/mchp_pfsoc_mmuart.h
@@ -28,7 +28,7 @@
 #ifndef HW_MCHP_PFSOC_MMUART_H
 #define HW_MCHP_PFSOC_MMUART_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/char/serial-mm.h"
 
 #define MCHP_PFSOC_MMUART_REG_COUNT 13

diff --git a/include/hw/char/nrf51_uart.h b/include/hw/char/nrf51_uart.h
index 7a54db746bde5798dbd8699f84f15728f820ee29..36a6c54cde10b8f9d0cf87eaae1e92af45e0b0d8 100644 (file)
--- a/include/hw/char/nrf51_uart.h
+++ b/include/hw/char/nrf51_uart.h
@@ -11,7 +11,7 @@
 #ifndef NRF51_UART_H
 #define NRF51_UART_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "chardev/char-fe.h"
 #include "hw/core/registerfields.h"
 #include "qom/object.h"

diff --git a/include/hw/char/pl011.h b/include/hw/char/pl011.h
index 2d4ff01c815de41f41305b775633b606197f8a2d..ff735b5234a52a33158df643e86f8447cb82c9f8 100644 (file)
--- a/include/hw/char/pl011.h
+++ b/include/hw/char/pl011.h
@@ -15,7 +15,7 @@
 #ifndef HW_PL011_H
 #define HW_PL011_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "chardev/char-fe.h"
 #include "qom/object.h"
 

diff --git a/include/hw/char/renesas_sci.h b/include/hw/char/renesas_sci.h
index 90e784f36a3f1dc6607728e864f5225ee3c28e6f..372e788be4cf6b29090bffc5fd676118c2223eb8 100644 (file)
--- a/include/hw/char/renesas_sci.h
+++ b/include/hw/char/renesas_sci.h
@@ -10,7 +10,7 @@
 #define HW_CHAR_RENESAS_SCI_H
 
 #include "chardev/char-fe.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_RENESAS_SCI "renesas-sci"

diff --git a/include/hw/char/serial-mm.h b/include/hw/char/serial-mm.h
index 77abd098e0d7f6edec0ced38af504c2f6d872974..0076bdc061b5f5fe271becd2fff8487284f96aed 100644 (file)
--- a/include/hw/char/serial-mm.h
+++ b/include/hw/char/serial-mm.h
@@ -29,7 +29,7 @@
 #include "hw/char/serial.h"
 #include "system/memory.h"
 #include "chardev/char.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_SERIAL_MM "serial-mm"

diff --git a/include/hw/char/shakti_uart.h b/include/hw/char/shakti_uart.h
index e5e775d7c9ae1c0b84df6ad8df51509e052838dd..e77553f2b5777ee4f4486d514ed680716b09a2df 100644 (file)
--- a/include/hw/char/shakti_uart.h
+++ b/include/hw/char/shakti_uart.h
@@ -25,7 +25,7 @@
 #ifndef HW_SHAKTI_UART_H
 #define HW_SHAKTI_UART_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "chardev/char-fe.h"
 
 #define SHAKTI_UART_BAUD        0x00

diff --git a/include/hw/char/sifive_uart.h b/include/hw/char/sifive_uart.h
index dea6055f872295dfd35d05638260aaa0e1006ac3..414564b0266c27ad76e9327c621e348864079240 100644 (file)
--- a/include/hw/char/sifive_uart.h
+++ b/include/hw/char/sifive_uart.h
@@ -22,7 +22,7 @@
 
 #include "chardev/char-fe.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 #include "qemu/fifo8.h"
 

diff --git a/include/hw/char/stm32f2xx_usart.h b/include/hw/char/stm32f2xx_usart.h
index f9018b8b8f67004cf4b870c02d19110c9b03afd8..5bb5bb28c13acb44f16fb543f01f5d29e609c347 100644 (file)
--- a/include/hw/char/stm32f2xx_usart.h
+++ b/include/hw/char/stm32f2xx_usart.h
@@ -25,7 +25,7 @@
 #ifndef HW_STM32F2XX_USART_H
 #define HW_STM32F2XX_USART_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "chardev/char-fe.h"
 #include "qom/object.h"
 

diff --git a/include/hw/char/stm32l4x5_usart.h b/include/hw/char/stm32l4x5_usart.h
index cdf7419f533180c02befe8879e44d7268c4957d5..3bb59fd654b2036ae6215270f546bda592a85175 100644 (file)
--- a/include/hw/char/stm32l4x5_usart.h
+++ b/include/hw/char/stm32l4x5_usart.h
@@ -18,7 +18,7 @@
 #ifndef HW_STM32L4X5_USART_H
 #define HW_STM32L4X5_USART_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "chardev/char-fe.h"
 #include "qom/object.h"
 

diff --git a/include/hw/core/or-irq.h b/include/hw/core/or-irq.h
index c0a42f3711252909416e5805dbc1f3bb0f1a19c5..1123cc518fb7efc133d034e814ce21cde13d00df 100644 (file)
--- a/include/hw/core/or-irq.h
+++ b/include/hw/core/or-irq.h
@@ -25,7 +25,7 @@
 #ifndef HW_OR_IRQ_H
 #define HW_OR_IRQ_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_OR_IRQ "or-irq"

diff --git a/include/hw/core/platform-bus.h b/include/hw/core/platform-bus.h
index 44f30c5353f792cdc77a6eb59a999b9758fedbf7..45b9d8dbc7bcaf9fca666b74d7f38245a8edd998 100644 (file)
--- a/include/hw/core/platform-bus.h
+++ b/include/hw/core/platform-bus.h
@@ -22,7 +22,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 

diff --git a/include/hw/core/split-irq.h b/include/hw/core/split-irq.h
index ff8852f4071cfb6e8b808f73d1b69a4f535783ce..19e9830b7632e1366f42445d6e1e24263ec5a9cc 100644 (file)
--- a/include/hw/core/split-irq.h
+++ b/include/hw/core/split-irq.h
@@ -35,7 +35,7 @@
 #ifndef HW_SPLIT_IRQ_H
 #define HW_SPLIT_IRQ_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_SPLIT_IRQ "split-irq"

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

diff --git a/include/hw/cpu/a15mpcore.h b/include/hw/cpu/a15mpcore.h
index 75d39e5458aedd46daf58fc0a0979d966bd9b7c1..138f491c2220409a21841b8e9a3b415203b11689 100644 (file)
--- a/include/hw/cpu/a15mpcore.h
+++ b/include/hw/cpu/a15mpcore.h
@@ -20,7 +20,7 @@
 #ifndef HW_CPU_A15MPCORE_H
 #define HW_CPU_A15MPCORE_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/intc/arm_gic.h"
 #include "qom/object.h"
 

diff --git a/include/hw/cpu/a9mpcore.h b/include/hw/cpu/a9mpcore.h
index e0396ab6af7e7f50730dfedb07cd644596909f0b..60765990247b80d9d24ef3062443d5c224c0c16d 100644 (file)
--- a/include/hw/cpu/a9mpcore.h
+++ b/include/hw/cpu/a9mpcore.h
@@ -10,7 +10,7 @@
 #ifndef HW_CPU_A9MPCORE_H
 #define HW_CPU_A9MPCORE_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/intc/arm_gic.h"
 #include "hw/misc/a9scu.h"
 #include "hw/timer/arm_mptimer.h"

diff --git a/include/hw/cpu/arm11mpcore.h b/include/hw/cpu/arm11mpcore.h
index 2cac8c1232d19cee7e033a6e18f07e05a974843d..1a8fbc550a6bfe1361c903a64613df74682c71c2 100644 (file)
--- a/include/hw/cpu/arm11mpcore.h
+++ b/include/hw/cpu/arm11mpcore.h
@@ -10,7 +10,7 @@
 #ifndef HW_CPU_ARM11MPCORE_H
 #define HW_CPU_ARM11MPCORE_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/misc/arm11scu.h"
 #include "hw/intc/arm_gic.h"
 #include "hw/timer/arm_mptimer.h"

diff --git a/include/hw/display/bcm2835_fb.h b/include/hw/display/bcm2835_fb.h
index acc9230b6a857b70c62b8920e46059d77b0051e1..f7ef076f1f4f6aab56b218b39f12fb3c124f359e 100644 (file)
--- a/include/hw/display/bcm2835_fb.h
+++ b/include/hw/display/bcm2835_fb.h
@@ -12,7 +12,7 @@
 #ifndef BCM2835_FB_H
 #define BCM2835_FB_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define UPPER_RAM_BASE 0x40000000

diff --git a/include/hw/display/macfb.h b/include/hw/display/macfb.h
index 356a03ce31ac37b569a39dd37fd380413300aa61..495dead44b519eab131e76cf1bcf73bef5eebeb0 100644 (file)
--- a/include/hw/display/macfb.h
+++ b/include/hw/display/macfb.h
@@ -16,7 +16,7 @@
 #include "system/memory.h"
 #include "hw/core/irq.h"
 #include "hw/nubus/nubus.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "ui/console.h"
 #include "qemu/timer.h"
 

diff --git a/include/hw/display/xlnx_dp.h b/include/hw/display/xlnx_dp.h
index 9ec5a90c3420fc7c37f0b64950280a5a0c1d9f60..b01c77fed69963e8556694e80109d2e1fa935c17 100644 (file)
--- a/include/hw/display/xlnx_dp.h
+++ b/include/hw/display/xlnx_dp.h
@@ -24,7 +24,7 @@
 #ifndef XLNX_DP_H
 #define XLNX_DP_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "ui/console.h"
 #include "hw/misc/auxbus.h"
 #include "hw/i2c/i2c.h"

diff --git a/include/hw/dma/bcm2835_dma.h b/include/hw/dma/bcm2835_dma.h
index 1d26b1d8d0f784e9b9a81e8314860e7c672c9451..9c20652d4e48e28501ffafe31a9d93a90590b75e 100644 (file)
--- a/include/hw/dma/bcm2835_dma.h
+++ b/include/hw/dma/bcm2835_dma.h
@@ -8,7 +8,7 @@
 #ifndef BCM2835_DMA_H
 #define BCM2835_DMA_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 typedef struct {

diff --git a/include/hw/dma/pl080.h b/include/hw/dma/pl080.h
index 3c9659e4381f9218501c35cd191b1a08ebcf4ca0..6635cd8e93d32e69246c299313454f7866525fd2 100644 (file)
--- a/include/hw/dma/pl080.h
+++ b/include/hw/dma/pl080.h
@@ -29,7 +29,7 @@
 #ifndef HW_DMA_PL080_H
 #define HW_DMA_PL080_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define PL080_MAX_CHANNELS 8

diff --git a/include/hw/dma/sifive_pdma.h b/include/hw/dma/sifive_pdma.h
index 8c6cfa7f32509e22e7b3a1c573e54b126dad1a40..34494ec6014d3c5098c3a185ed30227b27abd8ca 100644 (file)
--- a/include/hw/dma/sifive_pdma.h
+++ b/include/hw/dma/sifive_pdma.h
@@ -23,7 +23,7 @@
 #ifndef SIFIVE_PDMA_H
 #define SIFIVE_PDMA_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 struct sifive_pdma_chan {
     uint32_t control;

diff --git a/include/hw/dma/xlnx-zdma.h b/include/hw/dma/xlnx-zdma.h
index 2d2d4aeefab0be6ae47286363b1fb263b4c7635f..7d254c66e7d39d7354594f159f35695412637a89 100644 (file)
--- a/include/hw/dma/xlnx-zdma.h
+++ b/include/hw/dma/xlnx-zdma.h
@@ -29,7 +29,7 @@
 #ifndef XLNX_ZDMA_H
 #define XLNX_ZDMA_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/register.h"
 #include "system/dma.h"
 #include "qom/object.h"

diff --git a/include/hw/dma/xlnx-zynq-devcfg.h b/include/hw/dma/xlnx-zynq-devcfg.h
index 8d10553c22a32040fedc9d38b26c872329895e0e..3e3cc7b98ba72fd1c49954644eb5b9483c41cde5 100644 (file)
--- a/include/hw/dma/xlnx-zynq-devcfg.h
+++ b/include/hw/dma/xlnx-zynq-devcfg.h
@@ -28,7 +28,7 @@
 #define XLNX_ZYNQ_DEVCFG_H
 
 #include "hw/core/register.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_XLNX_ZYNQ_DEVCFG "xlnx.ps7-dev-cfg"

diff --git a/include/hw/dma/xlnx_csu_dma.h b/include/hw/dma/xlnx_csu_dma.h
index 4d6d18fb9b5ba6b4171f45ead6f78fb8082a34db..ceb28f40baedd112f421d42fcd1363187753bfdf 100644 (file)
--- a/include/hw/dma/xlnx_csu_dma.h
+++ b/include/hw/dma/xlnx_csu_dma.h
@@ -21,7 +21,7 @@
 #ifndef XLNX_CSU_DMA_H
 #define XLNX_CSU_DMA_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/register.h"
 #include "hw/core/ptimer.h"
 #include "hw/core/stream.h"

diff --git a/include/hw/dma/xlnx_dpdma.h b/include/hw/dma/xlnx_dpdma.h
index 484b2e377f00d9efa8ea84ab16b81531b96686c7..7cf67aef6e142f978eb0a39e4a2803f42c32dd33 100644 (file)
--- a/include/hw/dma/xlnx_dpdma.h
+++ b/include/hw/dma/xlnx_dpdma.h
@@ -25,7 +25,7 @@
 #ifndef XLNX_DPDMA_H
 #define XLNX_DPDMA_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "system/dma.h"
 #include "qom/object.h"
 

diff --git a/include/hw/fsi/aspeed_apb2opb.h b/include/hw/fsi/aspeed_apb2opb.h
index 878619eafa7165a6530236b41b03f3ae542f1175..e42399185ad91e23bbb5b5343cd3b17dc3ee5109 100644 (file)
--- a/include/hw/fsi/aspeed_apb2opb.h
+++ b/include/hw/fsi/aspeed_apb2opb.h
@@ -10,7 +10,7 @@
 
 #include "system/memory.h"
 #include "hw/fsi/fsi-master.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #define TYPE_FSI_OPB "fsi.opb"
 

diff --git a/include/hw/gpio/aspeed_gpio.h b/include/hw/gpio/aspeed_gpio.h
index e6b2fe71b50328c04cea129f70466d7852556a4c..0ff4539cb2dd4c073d56c52b8f39d19b0d866ac0 100644 (file)
--- a/include/hw/gpio/aspeed_gpio.h
+++ b/include/hw/gpio/aspeed_gpio.h
@@ -10,7 +10,7 @@
 #ifndef ASPEED_GPIO_H
 #define ASPEED_GPIO_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_ASPEED_GPIO "aspeed.gpio"

diff --git a/include/hw/gpio/bcm2835_gpio.h b/include/hw/gpio/bcm2835_gpio.h
index 1c53a05090851ddaf4a2901729c6634dfcd895a1..c1410ccbebfcae165693396b1b171beda6a416a4 100644 (file)
--- a/include/hw/gpio/bcm2835_gpio.h
+++ b/include/hw/gpio/bcm2835_gpio.h
@@ -15,7 +15,7 @@
 #define BCM2835_GPIO_H
 
 #include "hw/sd/sd.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 struct BCM2835GpioState {

diff --git a/include/hw/gpio/bcm2838_gpio.h b/include/hw/gpio/bcm2838_gpio.h
index f2a57a697f20dbf0d2cdeb937ceac86cd9e6a17e..9324ebcbaeb233206b1e77b215a8fa5e8775300b 100644 (file)
--- a/include/hw/gpio/bcm2838_gpio.h
+++ b/include/hw/gpio/bcm2838_gpio.h
@@ -15,7 +15,7 @@
 #define BCM2838_GPIO_H
 
 #include "hw/sd/sd.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_BCM2838_GPIO "bcm2838-gpio"

diff --git a/include/hw/gpio/imx_gpio.h b/include/hw/gpio/imx_gpio.h
index 227860b9f0abb6b78916eaee31eb492724b4bc6d..ae2afb3c0fbce4ae9f2f026dd1d3df54a02e3db2 100644 (file)
--- a/include/hw/gpio/imx_gpio.h
+++ b/include/hw/gpio/imx_gpio.h
@@ -20,7 +20,7 @@
 #ifndef IMX_GPIO_H
 #define IMX_GPIO_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_IMX_GPIO "imx.gpio"

diff --git a/include/hw/gpio/npcm7xx_gpio.h b/include/hw/gpio/npcm7xx_gpio.h
index 7c0bf61a960e7e8f768645e444c62170016f774f..9b2a3f27d37021e11267e980ad1383bdf3b02689 100644 (file)
--- a/include/hw/gpio/npcm7xx_gpio.h
+++ b/include/hw/gpio/npcm7xx_gpio.h
@@ -16,7 +16,7 @@
 #define NPCM7XX_GPIO_H
 
 #include "system/memory.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 /* Number of pins managed by each controller. */
 #define NPCM7XX_GPIO_NR_PINS (32)

diff --git a/include/hw/gpio/nrf51_gpio.h b/include/hw/gpio/nrf51_gpio.h
index fcfa2bac173c99cae820713d45230a59d8cca571..661e79b9217fb8c35f736a5f17a0af9ad84d96db 100644 (file)
--- a/include/hw/gpio/nrf51_gpio.h
+++ b/include/hw/gpio/nrf51_gpio.h
@@ -26,7 +26,7 @@
 #ifndef NRF51_GPIO_H
 #define NRF51_GPIO_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 #define TYPE_NRF51_GPIO "nrf51_soc.gpio"
 OBJECT_DECLARE_SIMPLE_TYPE(NRF51GPIOState, NRF51_GPIO)

diff --git a/include/hw/gpio/sifive_gpio.h b/include/hw/gpio/sifive_gpio.h
index fc53785c9d0ca2b068c4514c5a15b76be5774a61..e96cf33df686c1231bdec6f9b270e3ec962c4b78 100644 (file)
--- a/include/hw/gpio/sifive_gpio.h
+++ b/include/hw/gpio/sifive_gpio.h
@@ -14,7 +14,7 @@
 #ifndef SIFIVE_GPIO_H
 #define SIFIVE_GPIO_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_SIFIVE_GPIO "sifive_soc.gpio"

diff --git a/include/hw/gpio/stm32l4x5_gpio.h b/include/hw/gpio/stm32l4x5_gpio.h
index 878bd19fc9b6c2b18ef1e1997316a71cb7aec081..62197541295bb9ee38f1adbfe552badaf763d751 100644 (file)
--- a/include/hw/gpio/stm32l4x5_gpio.h
+++ b/include/hw/gpio/stm32l4x5_gpio.h
@@ -19,7 +19,7 @@
 #ifndef HW_STM32L4X5_GPIO_H
 #define HW_STM32L4X5_GPIO_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_STM32L4X5_GPIO "stm32l4x5-gpio"

diff --git a/include/hw/hyperv/vmbus-bridge.h b/include/hw/hyperv/vmbus-bridge.h
index 1e5419574ee68a0d6c76bb545f8f7b35db7221cb..2cf73075c6fea0107157bc7b61910a5deb2b6cf4 100644 (file)
--- a/include/hw/hyperv/vmbus-bridge.h
+++ b/include/hw/hyperv/vmbus-bridge.h
@@ -10,7 +10,7 @@
 #ifndef HW_HYPERV_VMBUS_BRIDGE_H
 #define HW_HYPERV_VMBUS_BRIDGE_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/hyperv/vmbus.h"
 #include "qom/object.h"
 

diff --git a/include/hw/i2c/allwinner-i2c.h b/include/hw/i2c/allwinner-i2c.h
index 0e325d265eecb8c974b49d6ef8c1a6fb1e4d0095..72836cc1017dedd7e7e4f5bdd893cd79a97bdd0b 100644 (file)
--- a/include/hw/i2c/allwinner-i2c.h
+++ b/include/hw/i2c/allwinner-i2c.h
@@ -24,7 +24,7 @@
 #ifndef ALLWINNER_I2C_H
 #define ALLWINNER_I2C_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_AW_I2C "allwinner.i2c"

diff --git a/include/hw/i2c/arm_sbcon_i2c.h b/include/hw/i2c/arm_sbcon_i2c.h
index da9b5e8f83ba39030fe827659d64f92419f29d81..39b99f57bfbf67f04915e066e27e088242553657 100644 (file)
--- a/include/hw/i2c/arm_sbcon_i2c.h
+++ b/include/hw/i2c/arm_sbcon_i2c.h
@@ -13,7 +13,7 @@
 #ifndef HW_I2C_ARM_SBCON_I2C_H
 #define HW_I2C_ARM_SBCON_I2C_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/i2c/bitbang_i2c.h"
 #include "qom/object.h"
 

diff --git a/include/hw/i2c/aspeed_i2c.h b/include/hw/i2c/aspeed_i2c.h
index c9c2620a8a336358ed805fb47eb7b23d4f1bbb37..ffcff2580f05b9f4fcbb26761179a750f3ddee19 100644 (file)
--- a/include/hw/i2c/aspeed_i2c.h
+++ b/include/hw/i2c/aspeed_i2c.h
@@ -21,7 +21,7 @@
 #define ASPEED_I2C_H
 
 #include "hw/i2c/i2c.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/registerfields.h"
 #include "qom/object.h"
 

diff --git a/include/hw/i2c/bcm2835_i2c.h b/include/hw/i2c/bcm2835_i2c.h
index 0a56df4720bd9721442b271011ad30cb5187c8a6..45f876df2241629eae1e56ec5afed9f45ba4f140 100644 (file)
--- a/include/hw/i2c/bcm2835_i2c.h
+++ b/include/hw/i2c/bcm2835_i2c.h
@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/i2c/i2c.h"
 #include "qom/object.h"
 

diff --git a/include/hw/i2c/imx_i2c.h b/include/hw/i2c/imx_i2c.h
index e4f91339f581487a834186ab87c51830fc07c7d5..988a3e284fbd1421ce5db13c4a5150101f9efd34 100644 (file)
--- a/include/hw/i2c/imx_i2c.h
+++ b/include/hw/i2c/imx_i2c.h
@@ -21,7 +21,7 @@
 #ifndef IMX_I2C_H
 #define IMX_I2C_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_IMX_I2C "imx.i2c"

diff --git a/include/hw/i2c/microbit_i2c.h b/include/hw/i2c/microbit_i2c.h
index 3c29e09bf38bfcf6f9ba09f92b2924ff533d19ff..a3ec27ff6c2d14322c0a069ba73c1cbe3eec5267 100644 (file)
--- a/include/hw/i2c/microbit_i2c.h
+++ b/include/hw/i2c/microbit_i2c.h
@@ -11,7 +11,7 @@
 #ifndef MICROBIT_I2C_H
 #define MICROBIT_I2C_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/arm/nrf51.h"
 #include "qom/object.h"
 

diff --git a/include/hw/i2c/npcm7xx_smbus.h b/include/hw/i2c/npcm7xx_smbus.h
index f5adb69c672f3a55fbd3a3bde626d48d3c60c7e3..dff9bc2f6ed4cc7dd75470f08329f20be308c0b9 100644 (file)
--- a/include/hw/i2c/npcm7xx_smbus.h
+++ b/include/hw/i2c/npcm7xx_smbus.h
@@ -19,7 +19,7 @@
 #include "system/memory.h"
 #include "hw/i2c/i2c.h"
 #include "hw/core/irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 /*
  * Number of addresses this module contains. Do not change this without

diff --git a/include/hw/i2c/ppc4xx_i2c.h b/include/hw/i2c/ppc4xx_i2c.h
index 4e882fa3c80616ea55e430a688507441e314e9b4..5b875eedacc57854cdb8ca9f786b78ebdf4ff3eb 100644 (file)
--- a/include/hw/i2c/ppc4xx_i2c.h
+++ b/include/hw/i2c/ppc4xx_i2c.h
@@ -27,7 +27,7 @@
 #ifndef PPC4XX_I2C_H
 #define PPC4XX_I2C_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/i2c/bitbang_i2c.h"
 #include "qom/object.h"
 

diff --git a/include/hw/i386/x86-iommu.h b/include/hw/i386/x86-iommu.h
index e89f55a5c215c77a520592e525f173eacea03d2e..c526a047ab6e9613e3a07d6a04e6da7b6889481b 100644 (file)
--- a/include/hw/i386/x86-iommu.h
+++ b/include/hw/i386/x86-iommu.h
@@ -20,7 +20,7 @@
 #ifndef HW_I386_X86_IOMMU_H
 #define HW_I386_X86_IOMMU_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/pci/msi.h"
 #include "qom/object.h"
 

diff --git a/include/hw/ide/ahci-sysbus.h b/include/hw/ide/ahci-sysbus.h
index 06eaac8cb6081825d63479b848e7bc038aba85d9..34d0c8f55add4c2d85a7073d3c225a4708b63565 100644 (file)
--- a/include/hw/ide/ahci-sysbus.h
+++ b/include/hw/ide/ahci-sysbus.h
@@ -7,7 +7,7 @@
 #define HW_IDE_AHCI_SYSBUS_H
 
 #include "qom/object.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/ide/ahci.h"
 
 #define TYPE_SYSBUS_AHCI "sysbus-ahci"

diff --git a/include/hw/input/i8042.h b/include/hw/input/i8042.h
index e90f008b667deb7fc2ccd8dafafd68c79078ef14..07d749b3d04ed816feec2a13b875408b2dd074ea 100644 (file)
--- a/include/hw/input/i8042.h
+++ b/include/hw/input/i8042.h
@@ -9,7 +9,7 @@
 #define HW_INPUT_I8042_H
 
 #include "hw/isa/isa.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/input/ps2.h"
 #include "qom/object.h"
 

diff --git a/include/hw/input/lasips2.h b/include/hw/input/lasips2.h
index fd74883073bceacb79edff07d1fd896a7e3edc1d..2739f752c8e6ef9bf3eae15a0e1a1f129e06429a 100644 (file)
--- a/include/hw/input/lasips2.h
+++ b/include/hw/input/lasips2.h
@@ -20,7 +20,7 @@
 #define HW_INPUT_LASIPS2_H
 
 #include "exec/hwaddr.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/input/ps2.h"
 
 #define TYPE_LASIPS2_PORT "lasips2-port"

diff --git a/include/hw/input/pl050.h b/include/hw/input/pl050.h
index db662654c58165e6dfa028ceb7011706076e04e7..2cdfa74f73c73dc3125a77f1e946c1cb90f6a87a 100644 (file)
--- a/include/hw/input/pl050.h
+++ b/include/hw/input/pl050.h
@@ -10,7 +10,7 @@
 #ifndef HW_PL050_H
 #define HW_PL050_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/input/ps2.h"
 #include "hw/core/irq.h"

diff --git a/include/hw/input/ps2.h b/include/hw/input/ps2.h
index cd61a634c395f9ceac1c567af92bc57e5e9997c5..058db3e0890939c96dfb417022322ec657170b83 100644 (file)
--- a/include/hw/input/ps2.h
+++ b/include/hw/input/ps2.h
@@ -25,7 +25,7 @@
 #ifndef HW_PS2_H
 #define HW_PS2_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #define PS2_MOUSE_BUTTON_LEFT   0x01
 #define PS2_MOUSE_BUTTON_RIGHT  0x02

diff --git a/include/hw/input/stellaris_gamepad.h b/include/hw/input/stellaris_gamepad.h
index 51085e166ca50d5797848078eb3e648c72d02d18..e011482646f26963a94acf6dc524eb69ae7aa1d0 100644 (file)
--- a/include/hw/input/stellaris_gamepad.h
+++ b/include/hw/input/stellaris_gamepad.h
@@ -11,7 +11,7 @@
 #ifndef HW_INPUT_STELLARIS_GAMEPAD_H
 #define HW_INPUT_STELLARIS_GAMEPAD_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 /*

diff --git a/include/hw/intc/allwinner-a10-pic.h b/include/hw/intc/allwinner-a10-pic.h
index b8364d3ed40aa505e620a3fcb4ee31bcd5a72732..f22059ed85ba694daa441451934521ddd043e8cc 100644 (file)
--- a/include/hw/intc/allwinner-a10-pic.h
+++ b/include/hw/intc/allwinner-a10-pic.h
@@ -1,7 +1,7 @@
 #ifndef ALLWINNER_A10_PIC_H
 #define ALLWINNER_A10_PIC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_AW_A10_PIC  "allwinner-a10-pic"

diff --git a/include/hw/intc/arm_gic_common.h b/include/hw/intc/arm_gic_common.h
index 93a3cc2bf812880b4200bd0d3df4e2247ffb81f9..b169394e6ca28d787d70e9c103ebbe5b12202ecc 100644 (file)
--- a/include/hw/intc/arm_gic_common.h
+++ b/include/hw/intc/arm_gic_common.h
@@ -21,7 +21,7 @@
 #ifndef HW_ARM_GIC_COMMON_H
 #define HW_ARM_GIC_COMMON_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 /* Maximum number of possible interrupts, determined by the GIC architecture */

diff --git a/include/hw/intc/arm_gicv3_common.h b/include/hw/intc/arm_gicv3_common.h
index 61d51915e079e8ceb9cbda6909b53b97afe5d324..3d24ad22d2810385fe0eea567035771f3ebc9766 100644 (file)
--- a/include/hw/intc/arm_gicv3_common.h
+++ b/include/hw/intc/arm_gicv3_common.h
@@ -24,7 +24,7 @@
 #ifndef HW_ARM_GICV3_COMMON_H
 #define HW_ARM_GICV3_COMMON_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/intc/arm_gic_common.h"
 #include "qom/object.h"
 #include "qemu/notify.h"

diff --git a/include/hw/intc/arm_gicv3_its_common.h b/include/hw/intc/arm_gicv3_its_common.h
index 3c7b543b0180990f1f8fa761c6a624693ff66960..05b438aa7ad4514855b0da84de4ce35c223d662e 100644 (file)
--- a/include/hw/intc/arm_gicv3_its_common.h
+++ b/include/hw/intc/arm_gicv3_its_common.h
@@ -21,7 +21,7 @@
 #ifndef QEMU_ARM_GICV3_ITS_COMMON_H
 #define QEMU_ARM_GICV3_ITS_COMMON_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/intc/arm_gicv3_common.h"
 #include "qom/object.h"
 

diff --git a/include/hw/intc/armv7m_nvic.h b/include/hw/intc/armv7m_nvic.h
index 7b9964fe7e4f5789dba08f270ccfc5864e67606e..e699546f6a653cbe1a5fa1e6cee1aace1e3506d3 100644 (file)
--- a/include/hw/intc/armv7m_nvic.h
+++ b/include/hw/intc/armv7m_nvic.h
@@ -11,7 +11,7 @@
 #define HW_ARM_ARMV7M_NVIC_H
 
 #include "target/arm/cpu-qom.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/timer/armv7m_systick.h"
 #include "qom/object.h"
 

diff --git a/include/hw/intc/aspeed_intc.h b/include/hw/intc/aspeed_intc.h
index 6dd8effcd89e4c5425d3cbcab8a948c20421161e..5d10268fff32ad5b1fb96d3ea19e47c355f3f00f 100644 (file)
--- a/include/hw/intc/aspeed_intc.h
+++ b/include/hw/intc/aspeed_intc.h
@@ -8,7 +8,7 @@
 #ifndef ASPEED_INTC_H
 #define ASPEED_INTC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 #include "hw/core/or-irq.h"
 

diff --git a/include/hw/intc/aspeed_vic.h b/include/hw/intc/aspeed_vic.h
index 68d6ab997a142fb855596b2e680fc33bd841cc59..5172f5c91377c9bb2d0692017773cc2efcaebeda 100644 (file)
--- a/include/hw/intc/aspeed_vic.h
+++ b/include/hw/intc/aspeed_vic.h
@@ -13,7 +13,7 @@
 #ifndef ASPEED_VIC_H
 #define ASPEED_VIC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_ASPEED_VIC "aspeed.vic"

diff --git a/include/hw/intc/bcm2835_ic.h b/include/hw/intc/bcm2835_ic.h
index 588eb76c5cbfd6266bfb8909f3efc9ac6593c882..f9ebaac8f9bc5aa11791433d50f0e63114a41569 100644 (file)
--- a/include/hw/intc/bcm2835_ic.h
+++ b/include/hw/intc/bcm2835_ic.h
@@ -8,7 +8,7 @@
 #ifndef BCM2835_IC_H
 #define BCM2835_IC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_BCM2835_IC "bcm2835-ic"

diff --git a/include/hw/intc/bcm2836_control.h b/include/hw/intc/bcm2836_control.h
index a410c817e8face3ec748c9fcf146a2cca2cf1512..05380f1b855dedb8f40697f9009fee700012c903 100644 (file)
--- a/include/hw/intc/bcm2836_control.h
+++ b/include/hw/intc/bcm2836_control.h
@@ -15,7 +15,7 @@
 #ifndef BCM2836_CONTROL_H
 #define BCM2836_CONTROL_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/timer.h"
 #include "qom/object.h"
 

diff --git a/include/hw/intc/exynos4210_combiner.h b/include/hw/intc/exynos4210_combiner.h
index bd207a7e6e47e689dd6b2683fb330bbe0e5fe136..b1db48cb88057bd44bf5c684e162aa701f5b96a3 100644 (file)
--- a/include/hw/intc/exynos4210_combiner.h
+++ b/include/hw/intc/exynos4210_combiner.h
@@ -23,7 +23,7 @@
 #ifndef HW_INTC_EXYNOS4210_COMBINER_H
 #define HW_INTC_EXYNOS4210_COMBINER_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 /*
  * State for each output signal of internal combiner

diff --git a/include/hw/intc/exynos4210_gic.h b/include/hw/intc/exynos4210_gic.h
index f64c4069c6dc0cdcd6c9bf08cec098b4ca425044..6ffe57c23061c1a9ccab05ba2c479bd418f5ae08 100644 (file)
--- a/include/hw/intc/exynos4210_gic.h
+++ b/include/hw/intc/exynos4210_gic.h
@@ -22,7 +22,7 @@
 #ifndef HW_INTC_EXYNOS4210_GIC_H
 #define HW_INTC_EXYNOS4210_GIC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #define TYPE_EXYNOS4210_GIC "exynos4210.gic"
 OBJECT_DECLARE_SIMPLE_TYPE(Exynos4210GicState, EXYNOS4210_GIC)

diff --git a/include/hw/intc/goldfish_pic.h b/include/hw/intc/goldfish_pic.h
index 3e795803672432c6916310b1e7f77f1fd122ef06..e61df599b0d4337e1a8d1c264d1405d30250d5be 100644 (file)
--- a/include/hw/intc/goldfish_pic.h
+++ b/include/hw/intc/goldfish_pic.h
@@ -10,7 +10,7 @@
 #ifndef HW_INTC_GOLDFISH_PIC_H
 #define HW_INTC_GOLDFISH_PIC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #define TYPE_GOLDFISH_PIC "goldfish_pic"
 OBJECT_DECLARE_SIMPLE_TYPE(GoldfishPICState, GOLDFISH_PIC)

diff --git a/include/hw/intc/grlib_irqmp.h b/include/hw/intc/grlib_irqmp.h
index a76acbf940305fb87d418637fd2bc9e1f80f3d37..e39496ca5dfe87c1b77494accc1f20fbc38ae2c9 100644 (file)
--- a/include/hw/intc/grlib_irqmp.h
+++ b/include/hw/intc/grlib_irqmp.h
@@ -27,7 +27,7 @@
 #ifndef GRLIB_IRQMP_H
 #define GRLIB_IRQMP_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 /* Emulation of GrLib device is base on the GRLIB IP Core User's Manual:
  * http://www.gaisler.com/products/grlib/grip.pdf

diff --git a/include/hw/intc/heathrow_pic.h b/include/hw/intc/heathrow_pic.h
index c0a7f6f5460cb8765abd9cb786ecccbe5eca9c2a..cfd8a8df2b21d8e094e4bf3ca56f30bbacc4f0bf 100644 (file)
--- a/include/hw/intc/heathrow_pic.h
+++ b/include/hw/intc/heathrow_pic.h
@@ -26,7 +26,7 @@
 #ifndef HW_INTC_HEATHROW_PIC_H
 #define HW_INTC_HEATHROW_PIC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_HEATHROW "heathrow"

diff --git a/include/hw/intc/imx_avic.h b/include/hw/intc/imx_avic.h
index 75fbd1a89c7193121ce1b3bcddbb27a6866f5d67..82ce9037edab31c23327887e69efd6532ba88d60 100644 (file)
--- a/include/hw/intc/imx_avic.h
+++ b/include/hw/intc/imx_avic.h
@@ -17,7 +17,7 @@
 #ifndef IMX_AVIC_H
 #define IMX_AVIC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_IMX_AVIC "imx.avic"

diff --git a/include/hw/intc/imx_gpcv2.h b/include/hw/intc/imx_gpcv2.h
index 7bdee7e80a12dabc7458ac20e28ede910b54bfb5..7a3441ac657d077f8503ad33b4935faa5e7b3192 100644 (file)
--- a/include/hw/intc/imx_gpcv2.h
+++ b/include/hw/intc/imx_gpcv2.h
@@ -1,7 +1,7 @@
 #ifndef IMX_GPCV2_H
 #define IMX_GPCV2_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 enum IMXGPCv2Registers {

diff --git a/include/hw/intc/loongarch_dintc.h b/include/hw/intc/loongarch_dintc.h
index 01bb1e465cb709e37261532dd9d59deff0e8a7db..1f4f65705a714d740c2b66d1585cf8adc7128376 100644 (file)
--- a/include/hw/intc/loongarch_dintc.h
+++ b/include/hw/intc/loongarch_dintc.h
@@ -6,7 +6,7 @@
  */
 
 #include "qom/object.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/loongarch/virt.h"
 #include "system/memory.h"
 

diff --git a/include/hw/intc/loongarch_extioi_common.h b/include/hw/intc/loongarch_extioi_common.h
index 1bd2bfa07fcaec92297f6c4767a58a6f55f4ec31..2dbc2563eb0ea390e1b0e7c07caef2ea747250d9 100644 (file)
--- a/include/hw/intc/loongarch_extioi_common.h
+++ b/include/hw/intc/loongarch_extioi_common.h
@@ -8,7 +8,7 @@
 #define LOONGARCH_EXTIOI_COMMON_H
 
 #include "qom/object.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/loongarch/virt.h"
 #include "system/memory.h"
 

diff --git a/include/hw/intc/loongarch_pch_msi.h b/include/hw/intc/loongarch_pch_msi.h
index ef4ec4fdeb89e4dc625ac6e4e0793c11c7d16fc2..fec51187c21c3cbfcccea6c73a4174123eb0c4f0 100644 (file)
--- a/include/hw/intc/loongarch_pch_msi.h
+++ b/include/hw/intc/loongarch_pch_msi.h
@@ -5,7 +5,7 @@
  * Copyright (C) 2021 Loongson Technology Corporation Limited
  */
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "system/memory.h"
 
 #define TYPE_LOONGARCH_PCH_MSI "loongarch_pch_msi"

diff --git a/include/hw/intc/loongarch_pic_common.h b/include/hw/intc/loongarch_pic_common.h
index 179361eb567270fe2bd11bd3ab11912739b7fd8c..1627ec0899d07751894e86f13a1d7f4a37b13652 100644 (file)
--- a/include/hw/intc/loongarch_pic_common.h
+++ b/include/hw/intc/loongarch_pic_common.h
@@ -8,7 +8,7 @@
 #define HW_LOONGARCH_PIC_COMMON_H
 
 #include "hw/loongarch/virt.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "system/memory.h"
 
 #define PCH_PIC_INT_ID                  0x00

diff --git a/include/hw/intc/loongson_ipi.h b/include/hw/intc/loongson_ipi.h
index 4e517cc8dc4273db1799a0e9a1ce1e1a0ffc4a42..afb8488725b12a0801e23502a1764e5547fec526 100644 (file)
--- a/include/hw/intc/loongson_ipi.h
+++ b/include/hw/intc/loongson_ipi.h
@@ -10,7 +10,7 @@
 
 #include "qom/object.h"
 #include "hw/intc/loongson_ipi_common.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #define TYPE_LOONGSON_IPI "loongson_ipi"
 OBJECT_DECLARE_TYPE(LoongsonIPIState, LoongsonIPIClass, LOONGSON_IPI)

diff --git a/include/hw/intc/loongson_ipi_common.h b/include/hw/intc/loongson_ipi_common.h
index 4fa03bc351f096c03a50e6b4769cb4c4af8a461e..feb858780a9c9618e01f18c20ebd73e1ad2b5740 100644 (file)
--- a/include/hw/intc/loongson_ipi_common.h
+++ b/include/hw/intc/loongson_ipi_common.h
@@ -9,7 +9,7 @@
 #define HW_LOONGSON_IPI_COMMON_H
 
 #include "qom/object.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "exec/memattrs.h"
 #include "system/memory.h"
 

diff --git a/include/hw/intc/loongson_liointc.h b/include/hw/intc/loongson_liointc.h
index 848e65eb35908f80be2b28cf96237980a5c05fc3..f400f691b0753c9d89d4f91a71f269995b6dc97c 100644 (file)
--- a/include/hw/intc/loongson_liointc.h
+++ b/include/hw/intc/loongson_liointc.h
@@ -12,7 +12,7 @@
 #define LOONGSON_LIOINTC_H
 
 #include "qemu/units.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_LOONGSON_LIOINTC "loongson.liointc"

diff --git a/include/hw/intc/m68k_irqc.h b/include/hw/intc/m68k_irqc.h
index 693e33b0aa5ee073459dbeaf3f823f7de5f13859..b2b184dbc98a898477fe300b12d46df03e9ba583 100644 (file)
--- a/include/hw/intc/m68k_irqc.h
+++ b/include/hw/intc/m68k_irqc.h
@@ -10,7 +10,7 @@
 #ifndef M68K_IRQC_H
 #define M68K_IRQC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #define TYPE_M68K_IRQC "m68k-irq-controller"
 #define M68K_IRQC(obj) OBJECT_CHECK(M68KIRQCState, (obj), \

diff --git a/include/hw/intc/mips_gic.h b/include/hw/intc/mips_gic.h
index 5e4c71edd47d4fa0df96b43cb6159e4fe437a5c8..e2e6f0a168c15a706d4f17e85cae276cd6df2199 100644 (file)
--- a/include/hw/intc/mips_gic.h
+++ b/include/hw/intc/mips_gic.h
@@ -13,7 +13,7 @@
 
 #include "qemu/units.h"
 #include "hw/timer/mips_gictimer.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "cpu.h"
 #include "qom/object.h"
 /*

diff --git a/include/hw/intc/realview_gic.h b/include/hw/intc/realview_gic.h
index f37339dc0b190641aefdc4d5596485d19e3c0ffb..6feaf1a605b45e9d673f613e7b5e6f6a7b726472 100644 (file)
--- a/include/hw/intc/realview_gic.h
+++ b/include/hw/intc/realview_gic.h
@@ -10,7 +10,7 @@
 #ifndef HW_INTC_REALVIEW_GIC_H
 #define HW_INTC_REALVIEW_GIC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/intc/arm_gic.h"
 #include "qom/object.h"
 

diff --git a/include/hw/intc/riscv_aclint.h b/include/hw/intc/riscv_aclint.h
index 4b7406eec005a06b7c040d8483a8790866a39297..5310615cbf6a25d0609b3ec2df414fda7fca4b66 100644 (file)
--- a/include/hw/intc/riscv_aclint.h
+++ b/include/hw/intc/riscv_aclint.h
@@ -21,7 +21,7 @@
 #ifndef HW_RISCV_ACLINT_H
 #define HW_RISCV_ACLINT_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #define TYPE_RISCV_ACLINT_MTIMER "riscv.aclint.mtimer"
 

diff --git a/include/hw/intc/riscv_aplic.h b/include/hw/intc/riscv_aplic.h
index 489b9133c26e6b5771d1f708369e2af476be9269..c7a4d4ad0172cc8db5287f82a7ba339792c08dd8 100644 (file)
--- a/include/hw/intc/riscv_aplic.h
+++ b/include/hw/intc/riscv_aplic.h
@@ -19,7 +19,7 @@
 #ifndef HW_RISCV_APLIC_H
 #define HW_RISCV_APLIC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_RISCV_APLIC "riscv.aplic"

diff --git a/include/hw/intc/riscv_imsic.h b/include/hw/intc/riscv_imsic.h
index 58c2aaa8dc60c12b4790c7ab1c2034fc12ae9240..fae999731dff1928cc17c5697ae22e7a79e6794f 100644 (file)
--- a/include/hw/intc/riscv_imsic.h
+++ b/include/hw/intc/riscv_imsic.h
@@ -19,7 +19,7 @@
 #ifndef HW_RISCV_IMSIC_H
 #define HW_RISCV_IMSIC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_RISCV_IMSIC "riscv.imsic"

diff --git a/include/hw/intc/rx_icu.h b/include/hw/intc/rx_icu.h
index b23504f3dd19ee9935647c6055a98c812b5a191d..2f2746b86815c67017910a66957e3f5018ab556a 100644 (file)
--- a/include/hw/intc/rx_icu.h
+++ b/include/hw/intc/rx_icu.h
@@ -21,7 +21,7 @@
 #ifndef HW_INTC_RX_ICU_H
 #define HW_INTC_RX_ICU_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 enum TRG_MODE {

diff --git a/include/hw/intc/sifive_plic.h b/include/hw/intc/sifive_plic.h
index d3f45ec248167262880c8121bb8908b8fa2eedf7..32973dbf281e196934f6e59b48882e631a616c86 100644 (file)
--- a/include/hw/intc/sifive_plic.h
+++ b/include/hw/intc/sifive_plic.h
@@ -21,7 +21,7 @@
 #ifndef HW_SIFIVE_PLIC_H
 #define HW_SIFIVE_PLIC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_SIFIVE_PLIC "riscv.sifive.plic"

diff --git a/include/hw/intc/xlnx-pmu-iomod-intc.h b/include/hw/intc/xlnx-pmu-iomod-intc.h
index e36b5e1762936771547ce34a469d657a0ff37916..1a1b0e813d097abf3396dc847240416510fd219a 100644 (file)
--- a/include/hw/intc/xlnx-pmu-iomod-intc.h
+++ b/include/hw/intc/xlnx-pmu-iomod-intc.h
@@ -25,7 +25,7 @@
 #ifndef HW_INTC_XLNX_PMU_IOMOD_INTC_H
 #define HW_INTC_XLNX_PMU_IOMOD_INTC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/register.h"
 #include "qom/object.h"
 

diff --git a/include/hw/intc/xlnx-zynqmp-ipi.h b/include/hw/intc/xlnx-zynqmp-ipi.h
index 53fc89084afeeb5749921a9dcc910237ccc653a1..57ac6e68524a713688a39e7c0682af6f9ab60af0 100644 (file)
--- a/include/hw/intc/xlnx-zynqmp-ipi.h
+++ b/include/hw/intc/xlnx-zynqmp-ipi.h
@@ -25,7 +25,7 @@
 #ifndef XLNX_ZYNQMP_IPI_H
 #define XLNX_ZYNQMP_IPI_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/register.h"
 #include "qom/object.h"
 

diff --git a/include/hw/m68k/q800-glue.h b/include/hw/m68k/q800-glue.h
index 04fac25f6c2c56655f17b79856ece259d631dec0..ac3404d6db81c7c647285d78c1234445e0a25908 100644 (file)
--- a/include/hw/m68k/q800-glue.h
+++ b/include/hw/m68k/q800-glue.h
@@ -23,7 +23,7 @@
 #ifndef HW_Q800_GLUE_H
 #define HW_Q800_GLUE_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #define TYPE_GLUE "q800-glue"
 OBJECT_DECLARE_SIMPLE_TYPE(GLUEState, GLUE)

diff --git a/include/hw/mem/npcm7xx_mc.h b/include/hw/mem/npcm7xx_mc.h
index 568cc35fdd7d71d87fa502326d95cc28e5795a22..9c724e83fd200f27d5a1807fa3037066203c2c73 100644 (file)
--- a/include/hw/mem/npcm7xx_mc.h
+++ b/include/hw/mem/npcm7xx_mc.h
@@ -17,7 +17,7 @@
 #define NPCM7XX_MC_H
 
 #include "system/memory.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 /**
  * struct NPCM7xxMCState - Device state for the memory controller.

diff --git a/include/hw/mips/cps.h b/include/hw/mips/cps.h
index e7309841d084316d98aaa9821bef5f8e11e6e880..878b4d819f4f8eb706a4100d2f8af14cf0d8eb43 100644 (file)
--- a/include/hw/mips/cps.h
+++ b/include/hw/mips/cps.h
@@ -20,7 +20,7 @@
 #ifndef MIPS_CPS_H
 #define MIPS_CPS_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/clock.h"
 #include "hw/misc/mips_cmgcr.h"
 #include "hw/intc/mips_gic.h"

diff --git a/include/hw/misc/a9scu.h b/include/hw/misc/a9scu.h
index c3759fb8c8c0dbdc0ce517e15e61c136d8c304c7..312fb29434b05b8b97d67660d27315dd8a831368 100644 (file)
--- a/include/hw/misc/a9scu.h
+++ b/include/hw/misc/a9scu.h
@@ -10,7 +10,7 @@
 #ifndef HW_MISC_A9SCU_H
 #define HW_MISC_A9SCU_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 /* A9MP private memory region.  */

diff --git a/include/hw/misc/allwinner-a10-ccm.h b/include/hw/misc/allwinner-a10-ccm.h
index 7f22532efaaa2a4e2f77836e99e889c090e3ca89..109b83f4df6b360514e0d507b7d531be18d760ea 100644 (file)
--- a/include/hw/misc/allwinner-a10-ccm.h
+++ b/include/hw/misc/allwinner-a10-ccm.h
@@ -24,7 +24,7 @@
 #define HW_MISC_ALLWINNER_A10_CCM_H
 
 #include "qom/object.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 /**
  * @name Constants

diff --git a/include/hw/misc/allwinner-a10-dramc.h b/include/hw/misc/allwinner-a10-dramc.h
index a1ae621e217ab4c768a1c2db7fbd50cfcea3e262..44663dee44ae616afe6274523c3d3cfe869920bb 100644 (file)
--- a/include/hw/misc/allwinner-a10-dramc.h
+++ b/include/hw/misc/allwinner-a10-dramc.h
@@ -24,7 +24,7 @@
 #define HW_MISC_ALLWINNER_A10_DRAMC_H
 
 #include "qom/object.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/register.h"
 
 /**

diff --git a/include/hw/misc/allwinner-cpucfg.h b/include/hw/misc/allwinner-cpucfg.h
index a717b47299a9e4e5c1ec9964f111e8959e3a72be..0214f1fb770fbe3e17d25d1eeca38f473fe75549 100644 (file)
--- a/include/hw/misc/allwinner-cpucfg.h
+++ b/include/hw/misc/allwinner-cpucfg.h
@@ -21,7 +21,7 @@
 #define HW_MISC_ALLWINNER_CPUCFG_H
 
 #include "qom/object.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 /**
  * Object model

diff --git a/include/hw/misc/allwinner-h3-ccu.h b/include/hw/misc/allwinner-h3-ccu.h
index a04875bfca38f6f7acf36141431efd4145f2ca5b..b8a1721686590ab64b2408faa1ec45827af498ca 100644 (file)
--- a/include/hw/misc/allwinner-h3-ccu.h
+++ b/include/hw/misc/allwinner-h3-ccu.h
@@ -21,7 +21,7 @@
 #define HW_MISC_ALLWINNER_H3_CCU_H
 
 #include "qom/object.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 /**
  * @name Constants

diff --git a/include/hw/misc/allwinner-h3-dramc.h b/include/hw/misc/allwinner-h3-dramc.h
index 0b6c877ef74788f126d8e2e22683542a21164490..0435120ff92166beab8304ae6ac4bac76a8febc3 100644 (file)
--- a/include/hw/misc/allwinner-h3-dramc.h
+++ b/include/hw/misc/allwinner-h3-dramc.h
@@ -21,7 +21,7 @@
 #define HW_MISC_ALLWINNER_H3_DRAMC_H
 
 #include "qom/object.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "exec/hwaddr.h"
 
 /**

diff --git a/include/hw/misc/allwinner-h3-sysctrl.h b/include/hw/misc/allwinner-h3-sysctrl.h
index ec1c220535eb0cfa275b83422b2f47385d882e94..ff886450f3a43ccc5aabde966f2b02104726613d 100644 (file)
--- a/include/hw/misc/allwinner-h3-sysctrl.h
+++ b/include/hw/misc/allwinner-h3-sysctrl.h
@@ -21,7 +21,7 @@
 #define HW_MISC_ALLWINNER_H3_SYSCTRL_H
 
 #include "qom/object.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 /**
  * @name Constants

diff --git a/include/hw/misc/allwinner-r40-ccu.h b/include/hw/misc/allwinner-r40-ccu.h
index ceb74eff92343ccf56eeec31f0198f418520e420..4f1cc4fe115b9e57def515104f4ab72d4bd21a95 100644 (file)
--- a/include/hw/misc/allwinner-r40-ccu.h
+++ b/include/hw/misc/allwinner-r40-ccu.h
@@ -21,7 +21,7 @@
 #define HW_MISC_ALLWINNER_R40_CCU_H
 
 #include "qom/object.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 /**
  * @name Constants

diff --git a/include/hw/misc/allwinner-r40-dramc.h b/include/hw/misc/allwinner-r40-dramc.h
index 6a1a3a789351d0c6f24a0c0f0201617157cd2cd2..b823e9eb5245be8bf58a970f0e7fd5c8c47f13ec 100644 (file)
--- a/include/hw/misc/allwinner-r40-dramc.h
+++ b/include/hw/misc/allwinner-r40-dramc.h
@@ -21,7 +21,7 @@
 #define HW_MISC_ALLWINNER_R40_DRAMC_H
 
 #include "qom/object.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "exec/hwaddr.h"
 
 /**

diff --git a/include/hw/misc/allwinner-sid.h b/include/hw/misc/allwinner-sid.h
index 3bfa887a9691ad40aaf5ad992a235a31d8cc5a18..cfa22a4d7f36a3ff16efd64e3499661059a6474a 100644 (file)
--- a/include/hw/misc/allwinner-sid.h
+++ b/include/hw/misc/allwinner-sid.h
@@ -21,7 +21,7 @@
 #define HW_MISC_ALLWINNER_SID_H
 
 #include "qom/object.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/uuid.h"
 
 /**

diff --git a/include/hw/misc/allwinner-sramc.h b/include/hw/misc/allwinner-sramc.h
index 66b01b8d044b47143c9fd462be7136c598bf8f82..43fc338a5895ece6afe1bdb88f7b1495b453d264 100644 (file)
--- a/include/hw/misc/allwinner-sramc.h
+++ b/include/hw/misc/allwinner-sramc.h
@@ -21,7 +21,7 @@
 #define HW_MISC_ALLWINNER_SRAMC_H
 
 #include "qom/object.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/uuid.h"
 
 /**

diff --git a/include/hw/misc/arm11scu.h b/include/hw/misc/arm11scu.h
index e5c0282aecfd29d245fdf0812eb4f8e3eb3ef73f..d7ce0446a93e1bdffd44f41664e899b2c68f1e03 100644 (file)
--- a/include/hw/misc/arm11scu.h
+++ b/include/hw/misc/arm11scu.h
@@ -11,7 +11,7 @@
 #ifndef HW_MISC_ARM11SCU_H
 #define HW_MISC_ARM11SCU_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_ARM11_SCU "arm11-scu"

diff --git a/include/hw/misc/armsse-cpu-pwrctrl.h b/include/hw/misc/armsse-cpu-pwrctrl.h
index 51d45ede7db0a856e0ec142af5131bbbb197ccd5..1d9c50825bff5835a3c26742a11e0924ca478e36 100644 (file)
--- a/include/hw/misc/armsse-cpu-pwrctrl.h
+++ b/include/hw/misc/armsse-cpu-pwrctrl.h
@@ -21,7 +21,7 @@
 #ifndef HW_MISC_ARMSSE_CPU_PWRCTRL_H
 #define HW_MISC_ARMSSE_CPU_PWRCTRL_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_ARMSSE_CPU_PWRCTRL "armsse-cpu-pwrctrl"

diff --git a/include/hw/misc/armsse-cpuid.h b/include/hw/misc/armsse-cpuid.h
index 9c0926322cb58499ba02b26d2ed75e492cba4760..0daf466972a97e213c5248e221ac892a87427ea3 100644 (file)
--- a/include/hw/misc/armsse-cpuid.h
+++ b/include/hw/misc/armsse-cpuid.h
@@ -22,7 +22,7 @@
 #ifndef HW_MISC_ARMSSE_CPUID_H
 #define HW_MISC_ARMSSE_CPUID_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_ARMSSE_CPUID "armsse-cpuid"

diff --git a/include/hw/misc/armsse-mhu.h b/include/hw/misc/armsse-mhu.h
index 41925ded89b71a845ac3f9c7329a455e4512d48e..e34d6c100bf0afb915028434f2919cc0ef065541 100644 (file)
--- a/include/hw/misc/armsse-mhu.h
+++ b/include/hw/misc/armsse-mhu.h
@@ -23,7 +23,7 @@
 #ifndef HW_MISC_ARMSSE_MHU_H
 #define HW_MISC_ARMSSE_MHU_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_ARMSSE_MHU "armsse-mhu"

diff --git a/include/hw/misc/armv7m_ras.h b/include/hw/misc/armv7m_ras.h
index ba6daccf3fc8dc6568ed6a0cb8d0c27c6e97424b..2b692fa5f9efdbe0c8f1506dda4e3ba5d9cf1e11 100644 (file)
--- a/include/hw/misc/armv7m_ras.h
+++ b/include/hw/misc/armv7m_ras.h
@@ -21,7 +21,7 @@
 #ifndef HW_MISC_ARMV7M_RAS_H
 #define HW_MISC_ARMV7M_RAS_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #define TYPE_ARMV7M_RAS "armv7m-ras"
 OBJECT_DECLARE_SIMPLE_TYPE(ARMv7MRAS, ARMV7M_RAS)

diff --git a/include/hw/misc/aspeed_hace.h b/include/hw/misc/aspeed_hace.h
index d5d07c6c021dc7d075ff6edc7ddcc7a3a5180b07..b5416b0cb5d3f2d6f9129446119ffe460b2f0b7c 100644 (file)
--- a/include/hw/misc/aspeed_hace.h
+++ b/include/hw/misc/aspeed_hace.h
@@ -10,7 +10,7 @@
 #ifndef ASPEED_HACE_H
 #define ASPEED_HACE_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "crypto/hash.h"
 
 #define TYPE_ASPEED_HACE "aspeed.hace"

diff --git a/include/hw/misc/aspeed_i3c.h b/include/hw/misc/aspeed_i3c.h
index 39679dfa1ae1675511e959f16bce56443e7b0631..7a984e1f01abd210f20728d171ffeb60db288988 100644 (file)
--- a/include/hw/misc/aspeed_i3c.h
+++ b/include/hw/misc/aspeed_i3c.h
@@ -10,7 +10,7 @@
 #ifndef ASPEED_I3C_H
 #define ASPEED_I3C_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #define TYPE_ASPEED_I3C "aspeed.i3c"
 #define TYPE_ASPEED_I3C_DEVICE "aspeed.i3c.device"

diff --git a/include/hw/misc/aspeed_lpc.h b/include/hw/misc/aspeed_lpc.h
index fa398959af214c012b8862af9270ffd908ead878..64c1039f9ce47990fa960c93ca158378622ef579 100644 (file)
--- a/include/hw/misc/aspeed_lpc.h
+++ b/include/hw/misc/aspeed_lpc.h
@@ -10,7 +10,7 @@
 #ifndef ASPEED_LPC_H
 #define ASPEED_LPC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #define TYPE_ASPEED_LPC "aspeed.lpc"
 #define ASPEED_LPC(obj) OBJECT_CHECK(AspeedLPCState, (obj), TYPE_ASPEED_LPC)

diff --git a/include/hw/misc/aspeed_peci.h b/include/hw/misc/aspeed_peci.h
index 8382707d9fd28713a460c0d289dd505dd758b6a2..7680e5befb317f760b768443bfa78b1b51074b20 100644 (file)
--- a/include/hw/misc/aspeed_peci.h
+++ b/include/hw/misc/aspeed_peci.h
@@ -10,7 +10,7 @@
 #ifndef ASPEED_PECI_H
 #define ASPEED_PECI_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #define ASPEED_PECI_NR_REGS ((0xFC + 4) >> 2)
 #define TYPE_ASPEED_PECI "aspeed.peci"

diff --git a/include/hw/misc/aspeed_sbc.h b/include/hw/misc/aspeed_sbc.h
index 7d640a022e4d25b189855668e17d754de868198f..07c7c22a86ab91cfecace6e84f067f62c2e27ceb 100644 (file)
--- a/include/hw/misc/aspeed_sbc.h
+++ b/include/hw/misc/aspeed_sbc.h
@@ -9,7 +9,7 @@
 #ifndef ASPEED_SBC_H
 #define ASPEED_SBC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/nvram/aspeed_otp.h"
 
 #define TYPE_ASPEED_SBC "aspeed.sbc"

diff --git a/include/hw/misc/aspeed_scu.h b/include/hw/misc/aspeed_scu.h
index 684b48b7222aabff000a4e235513170ca7931461..35b841960af0860d9c1d1dfc598ed0f076e0d7af 100644 (file)
--- a/include/hw/misc/aspeed_scu.h
+++ b/include/hw/misc/aspeed_scu.h
@@ -11,7 +11,7 @@
 #ifndef ASPEED_SCU_H
 #define ASPEED_SCU_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_ASPEED_SCU "aspeed.scu"

diff --git a/include/hw/misc/aspeed_sdmc.h b/include/hw/misc/aspeed_sdmc.h
index 61c979583ae1454410564face066208ef4c5def4..806b1cbc58fe78afca2a0fda59afbaf5100b49ac 100644 (file)
--- a/include/hw/misc/aspeed_sdmc.h
+++ b/include/hw/misc/aspeed_sdmc.h
@@ -9,7 +9,7 @@
 #ifndef ASPEED_SDMC_H
 #define ASPEED_SDMC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_ASPEED_SDMC "aspeed.sdmc"

diff --git a/include/hw/misc/aspeed_sli.h b/include/hw/misc/aspeed_sli.h
index 23f346ab934b1d728e9360a8e9fdb5b653811e69..fa8d9fbc53136a6bce781bf1a497ae3507d19fb7 100644 (file)
--- a/include/hw/misc/aspeed_sli.h
+++ b/include/hw/misc/aspeed_sli.h
@@ -8,7 +8,7 @@
 #ifndef ASPEED_SLI_H
 #define ASPEED_SLI_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #define TYPE_ASPEED_SLI "aspeed.sli"
 #define TYPE_ASPEED_2700_SLI TYPE_ASPEED_SLI "-ast2700"

diff --git a/include/hw/misc/aspeed_xdma.h b/include/hw/misc/aspeed_xdma.h
index b1478fd1c681df6e5283570dd88170b51486539f..0089da9f1fd390a7a46c1e9390779df727b96beb 100644 (file)
--- a/include/hw/misc/aspeed_xdma.h
+++ b/include/hw/misc/aspeed_xdma.h
@@ -9,7 +9,7 @@
 #ifndef ASPEED_XDMA_H
 #define ASPEED_XDMA_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_ASPEED_XDMA "aspeed.xdma"

diff --git a/include/hw/misc/avr_power.h b/include/hw/misc/avr_power.h
index 388e421aa7bacd336b7a81fdadf9c2720417da97..5de78c5125f00f969bf3c87ddd4527f19566b6a0 100644 (file)
--- a/include/hw/misc/avr_power.h
+++ b/include/hw/misc/avr_power.h
@@ -25,7 +25,7 @@
 #ifndef HW_MISC_AVR_POWER_H
 #define HW_MISC_AVR_POWER_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 

diff --git a/include/hw/misc/bcm2835_cprman.h b/include/hw/misc/bcm2835_cprman.h
index 7b2c0a5464247da75e199426c459890401a7cf5b..8146bca3ae9751dc9bcda5f66879de99bb9e5b8a 100644 (file)
--- a/include/hw/misc/bcm2835_cprman.h
+++ b/include/hw/misc/bcm2835_cprman.h
@@ -9,7 +9,7 @@
 #ifndef HW_MISC_BCM2835_CPRMAN_H
 #define HW_MISC_BCM2835_CPRMAN_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/qdev-clock.h"
 
 #define TYPE_BCM2835_CPRMAN "bcm2835-cprman"

diff --git a/include/hw/misc/bcm2835_mbox.h b/include/hw/misc/bcm2835_mbox.h
index ade27af25d02d3c5fe3e914d53771f71f10ee0fb..571741c06e2403b0cbd2fda82b56d72efc8f3b9e 100644 (file)
--- a/include/hw/misc/bcm2835_mbox.h
+++ b/include/hw/misc/bcm2835_mbox.h
@@ -9,7 +9,7 @@
 #define BCM2835_MBOX_H
 
 #include "bcm2835_mbox_defs.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_BCM2835_MBOX "bcm2835-mbox"

diff --git a/include/hw/misc/bcm2835_mphi.h b/include/hw/misc/bcm2835_mphi.h
index 1a451685e8edcdf54f875a2e35aba6c0890075e5..4ddf8ba65210ae5be09fd144d167fc4e76b8091e 100644 (file)
--- a/include/hw/misc/bcm2835_mphi.h
+++ b/include/hw/misc/bcm2835_mphi.h
@@ -18,7 +18,7 @@
 #define HW_MISC_BCM2835_MPHI_H
 
 #include "hw/core/irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define MPHI_MMIO_SIZE      0x1000

diff --git a/include/hw/misc/bcm2835_powermgt.h b/include/hw/misc/bcm2835_powermgt.h
index 303b9a6f6847abfdeff001fcaa8aac7adb6e6385..fb0740c01ec1bc17957654e46c422cac1b8c2919 100644 (file)
--- a/include/hw/misc/bcm2835_powermgt.h
+++ b/include/hw/misc/bcm2835_powermgt.h
@@ -11,7 +11,7 @@
 #ifndef BCM2835_POWERMGT_H
 #define BCM2835_POWERMGT_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_BCM2835_POWERMGT "bcm2835-powermgt"

diff --git a/include/hw/misc/bcm2835_property.h b/include/hw/misc/bcm2835_property.h
index 2f93fd0c757c366dca6fae1cdc9ef3dc47d11e2f..53d2a92d173581e7ec20eea1e8eca9ba512ab390 100644 (file)
--- a/include/hw/misc/bcm2835_property.h
+++ b/include/hw/misc/bcm2835_property.h
@@ -8,7 +8,7 @@
 #ifndef BCM2835_PROPERTY_H
 #define BCM2835_PROPERTY_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "net/net.h"
 #include "hw/display/bcm2835_fb.h"
 #include "hw/nvram/bcm2835_otp.h"

diff --git a/include/hw/misc/bcm2835_rng.h b/include/hw/misc/bcm2835_rng.h
index 7c1fb3ef405df7c830ca2c05191157e69edc4493..eaf77f5103d6643703cd08986b097e85db65e35b 100644 (file)
--- a/include/hw/misc/bcm2835_rng.h
+++ b/include/hw/misc/bcm2835_rng.h
@@ -10,7 +10,7 @@
 #ifndef BCM2835_RNG_H
 #define BCM2835_RNG_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_BCM2835_RNG "bcm2835-rng"

diff --git a/include/hw/misc/bcm2835_thermal.h b/include/hw/misc/bcm2835_thermal.h
index f90f9e487cecf56b6abc61cc5f9f914364a1ed95..13ffc61c1a7324014e1a29fc6a663dabe72f581d 100644 (file)
--- a/include/hw/misc/bcm2835_thermal.h
+++ b/include/hw/misc/bcm2835_thermal.h
@@ -9,7 +9,7 @@
 #ifndef HW_MISC_BCM2835_THERMAL_H
 #define HW_MISC_BCM2835_THERMAL_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_BCM2835_THERMAL "bcm2835-thermal"

diff --git a/include/hw/misc/djmemc.h b/include/hw/misc/djmemc.h
index 82d4e4a2fee248b8d18f3c8f97e4eba55f745424..76d6b366ff3eff32fa125c07024e867d8570f23c 100644 (file)
--- a/include/hw/misc/djmemc.h
+++ b/include/hw/misc/djmemc.h
@@ -8,7 +8,7 @@
 #ifndef HW_MISC_DJMEMC_H
 #define HW_MISC_DJMEMC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #define DJMEMC_SIZE        0x2000
 #define DJMEMC_NUM_REGS    (0x38 / sizeof(uint32_t))

diff --git a/include/hw/misc/imx6_src.h b/include/hw/misc/imx6_src.h
index f380da3810f8097687c5ac5c9e311a9b4a581f42..801b5b6a660b8973c7f02f9524a25e899065ea73 100644 (file)
--- a/include/hw/misc/imx6_src.h
+++ b/include/hw/misc/imx6_src.h
@@ -11,7 +11,7 @@
 #ifndef IMX6_SRC_H
 #define IMX6_SRC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/bitops.h"
 #include "qom/object.h"
 

diff --git a/include/hw/misc/imx7_gpr.h b/include/hw/misc/imx7_gpr.h
index df364bd8f09309e6d260447cb07f08d9fca3e5d7..5cb7d50a694d5a8b568b14b5b2e00f5e500a8c58 100644 (file)
--- a/include/hw/misc/imx7_gpr.h
+++ b/include/hw/misc/imx7_gpr.h
@@ -13,7 +13,7 @@
 #define IMX7_GPR_H
 
 #include "qemu/bitops.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_IMX7_GPR "imx7.gpr"

diff --git a/include/hw/misc/imx7_snvs.h b/include/hw/misc/imx7_snvs.h
index 1272076086a7277ade897c1789fcc18b9912b34e..90f69a6dd67a5ebd28b5b92ab4baa7962bb4c073 100644 (file)
--- a/include/hw/misc/imx7_snvs.h
+++ b/include/hw/misc/imx7_snvs.h
@@ -13,7 +13,7 @@
 #define IMX7_SNVS_H
 
 #include "qemu/bitops.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 

diff --git a/include/hw/misc/imx7_src.h b/include/hw/misc/imx7_src.h
index b4b97dcb1c18a63069a177be788493197d7ad76a..55b58a03bf337f97e089d6b6acfcc8bb61fac2b4 100644 (file)
--- a/include/hw/misc/imx7_src.h
+++ b/include/hw/misc/imx7_src.h
@@ -10,7 +10,7 @@
 #ifndef IMX7_SRC_H
 #define IMX7_SRC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/bitops.h"
 #include "qom/object.h"
 

diff --git a/include/hw/misc/imx8mp_analog.h b/include/hw/misc/imx8mp_analog.h
index 955f03215a03a00f9f9b4bf82ef0fb9fb0947fc1..6996e537718c0906afa01b0aefac2f0378bb35a5 100644 (file)
--- a/include/hw/misc/imx8mp_analog.h
+++ b/include/hw/misc/imx8mp_analog.h
@@ -10,7 +10,7 @@
 #define IMX8MP_ANALOG_H
 
 #include "qom/object.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 enum IMX8MPAnalogRegisters {
     ANALOG_AUDIO_PLL1_GEN_CTRL = 0x000 / 4,

diff --git a/include/hw/misc/imx_ccm.h b/include/hw/misc/imx_ccm.h
index 7e5678e9726045e39de5f4b0e35de131f7eeeff6..c4212d04ea6d8f68244455d710b4edfbd6419074 100644 (file)
--- a/include/hw/misc/imx_ccm.h
+++ b/include/hw/misc/imx_ccm.h
@@ -11,7 +11,7 @@
 #ifndef IMX_CCM_H
 #define IMX_CCM_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define CKIL_FREQ 32768 /* nominal 32khz clock */

diff --git a/include/hw/misc/imx_rngc.h b/include/hw/misc/imx_rngc.h
index 34ad699225966e31e3d070ad969f55bbedb44263..5fb17551b00e16ab727ac4031f97cb8a90a6dcbd 100644 (file)
--- a/include/hw/misc/imx_rngc.h
+++ b/include/hw/misc/imx_rngc.h
@@ -10,7 +10,7 @@
 #ifndef IMX_RNGC_H
 #define IMX_RNGC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_IMX_RNGC "imx.rngc"

diff --git a/include/hw/misc/iotkit-secctl.h b/include/hw/misc/iotkit-secctl.h
index 79a36283201ac1c3638271b02a830376d09cbb40..1c189eb72149339ed9b5c9cdab3b6cc22e016d18 100644 (file)
--- a/include/hw/misc/iotkit-secctl.h
+++ b/include/hw/misc/iotkit-secctl.h
@@ -55,7 +55,7 @@
 #ifndef IOTKIT_SECCTL_H
 #define IOTKIT_SECCTL_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_IOTKIT_SECCTL "iotkit-secctl"

diff --git a/include/hw/misc/iotkit-sysctl.h b/include/hw/misc/iotkit-sysctl.h
index 481e27f4db1acb835a20a61225691a18296cd0f6..ce72258a847b1f52d25799ab4c620554493074dd 100644 (file)
--- a/include/hw/misc/iotkit-sysctl.h
+++ b/include/hw/misc/iotkit-sysctl.h
@@ -26,7 +26,7 @@
 #ifndef HW_MISC_IOTKIT_SYSCTL_H
 #define HW_MISC_IOTKIT_SYSCTL_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_IOTKIT_SYSCTL "iotkit-sysctl"

diff --git a/include/hw/misc/iotkit-sysinfo.h b/include/hw/misc/iotkit-sysinfo.h
index 91c23f90d23d80951883dafdd45ace3d1d652b59..36dc702c53dc96320d7f6c98d0a0b2a5f7c68c01 100644 (file)
--- a/include/hw/misc/iotkit-sysinfo.h
+++ b/include/hw/misc/iotkit-sysinfo.h
@@ -22,7 +22,7 @@
 #ifndef HW_MISC_IOTKIT_SYSINFO_H
 #define HW_MISC_IOTKIT_SYSINFO_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_IOTKIT_SYSINFO "iotkit-sysinfo"

diff --git a/include/hw/misc/ivshmem-flat.h b/include/hw/misc/ivshmem-flat.h
index d656e5780853e8f43851a33aeb4c18ae6bccd1b7..4e7277f386c40f12e1a8f4027ed8c56bab981ff7 100644 (file)
--- a/include/hw/misc/ivshmem-flat.h
+++ b/include/hw/misc/ivshmem-flat.h
@@ -16,7 +16,7 @@
 #include "chardev/char-fe.h"
 #include "system/memory.h"
 #include "qom/object.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #define IVSHMEM_MAX_VECTOR_NUM 64
 

diff --git a/include/hw/misc/lasi.h b/include/hw/misc/lasi.h
index 5e40c6aebdf4d0fe5b821f49eca8cf1816ee4628..8bf72404037a35ffe801144c023fdc0cd7a523f2 100644 (file)
--- a/include/hw/misc/lasi.h
+++ b/include/hw/misc/lasi.h
@@ -14,7 +14,7 @@
 
 #include "system/address-spaces.h"
 #include "hw/core/boards.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #define TYPE_LASI_CHIP "lasi-chip"
 OBJECT_DECLARE_SIMPLE_TYPE(LasiState, LASI_CHIP)

diff --git a/include/hw/misc/mac_via.h b/include/hw/misc/mac_via.h
index 6a152281505eaa13fb9147c992d38a275e38ccfd..114f41db4c75f84e0b7e4603a2e635b302f12bc2 100644 (file)
--- a/include/hw/misc/mac_via.h
+++ b/include/hw/misc/mac_via.h
@@ -10,7 +10,7 @@
 #define HW_MISC_MAC_VIA_H
 
 #include "system/memory.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/misc/mos6522.h"
 #include "hw/input/adb.h"
 #include "qom/object.h"

diff --git a/include/hw/misc/macio/gpio.h b/include/hw/misc/macio/gpio.h
index 7d2aa886c24e045ae600210cf3ba3af66f3a6b32..157ea0659b3d9145b36c01806d56f6d45dcb6d98 100644 (file)
--- a/include/hw/misc/macio/gpio.h
+++ b/include/hw/misc/macio/gpio.h
@@ -27,7 +27,7 @@
 #define MACIO_GPIO_H
 
 #include "hw/ppc/openpic.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_MACIO_GPIO "macio-gpio"

diff --git a/include/hw/misc/max78000_aes.h b/include/hw/misc/max78000_aes.h
index 407c45ef61ea2f3be0bd2f3ef08a26793161966c..f68ab07696028879cd7fd4b50380667f5add47a2 100644 (file)
--- a/include/hw/misc/max78000_aes.h
+++ b/include/hw/misc/max78000_aes.h
@@ -8,7 +8,7 @@
 #ifndef HW_MAX78000_AES_H
 #define HW_MAX78000_AES_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "crypto/aes.h"
 #include "qom/object.h"
 

diff --git a/include/hw/misc/max78000_gcr.h b/include/hw/misc/max78000_gcr.h
index d5858a40f3bb22ac136e84fb5bd5a0e42a9662ec..c209766fa98a893de177ab6f14db449f7138a89d 100644 (file)
--- a/include/hw/misc/max78000_gcr.h
+++ b/include/hw/misc/max78000_gcr.h
@@ -8,7 +8,7 @@
 #ifndef HW_MAX78000_GCR_H
 #define HW_MAX78000_GCR_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_MAX78000_GCR "max78000-gcr"

diff --git a/include/hw/misc/max78000_icc.h b/include/hw/misc/max78000_icc.h
index 6fe2bb7a1566f83ff55828e9783268c2650612c5..a8f1d451bd67246c759e878efca469e114bd470b 100644 (file)
--- a/include/hw/misc/max78000_icc.h
+++ b/include/hw/misc/max78000_icc.h
@@ -9,7 +9,7 @@
 #ifndef HW_MAX78000_ICC_H
 #define HW_MAX78000_ICC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_MAX78000_ICC "max78000-icc"

diff --git a/include/hw/misc/max78000_trng.h b/include/hw/misc/max78000_trng.h
index c5a8129b6a0fdefb916b3c29e764412d8f64598f..a027f4b62c7cab496efb4712fbf6a6721c278403 100644 (file)
--- a/include/hw/misc/max78000_trng.h
+++ b/include/hw/misc/max78000_trng.h
@@ -8,7 +8,7 @@
 #ifndef HW_MAX78000_TRNG_H
 #define HW_MAX78000_TRNG_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_MAX78000_TRNG "max78000-trng"

diff --git a/include/hw/misc/mchp_pfsoc_dmc.h b/include/hw/misc/mchp_pfsoc_dmc.h
index 3bc1581e0f29fc388a39bd090b0bd47544dfb1fc..2ed582fb8ce4ebb132260ebfc2d0fe9f508d58b4 100644 (file)
--- a/include/hw/misc/mchp_pfsoc_dmc.h
+++ b/include/hw/misc/mchp_pfsoc_dmc.h
@@ -23,7 +23,7 @@
 #ifndef MCHP_PFSOC_DMC_H
 #define MCHP_PFSOC_DMC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 /* DDR SGMII PHY module */
 

diff --git a/include/hw/misc/mchp_pfsoc_ioscb.h b/include/hw/misc/mchp_pfsoc_ioscb.h
index 3fd3e74966525e05a9b267d05db75be5674d82cf..eaaa2ac5d98385f3a8fab8e4daf066b93603cdbc 100644 (file)
--- a/include/hw/misc/mchp_pfsoc_ioscb.h
+++ b/include/hw/misc/mchp_pfsoc_ioscb.h
@@ -23,7 +23,7 @@
 #ifndef MCHP_PFSOC_IOSCB_H
 #define MCHP_PFSOC_IOSCB_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 typedef struct MchpPfSoCIoscbState {
     SysBusDevice parent;

diff --git a/include/hw/misc/mchp_pfsoc_sysreg.h b/include/hw/misc/mchp_pfsoc_sysreg.h
index c2232bd28d0386141f79ff86dad0ad5cd19ce507..c2b3688a94b5e40fa6014882d8504cf0b9c83237 100644 (file)
--- a/include/hw/misc/mchp_pfsoc_sysreg.h
+++ b/include/hw/misc/mchp_pfsoc_sysreg.h
@@ -23,7 +23,7 @@
 #ifndef MCHP_PFSOC_SYSREG_H
 #define MCHP_PFSOC_SYSREG_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #define MCHP_PFSOC_SYSREG_REG_SIZE  0x2000
 

diff --git a/include/hw/misc/mips_cmgcr.h b/include/hw/misc/mips_cmgcr.h
index db4bf5f44991deb5866905b959879f976c0eb401..cec0edd6205a03d40e15ce71d48a2d0dd94a937e 100644 (file)
--- a/include/hw/misc/mips_cmgcr.h
+++ b/include/hw/misc/mips_cmgcr.h
@@ -10,7 +10,7 @@
 #ifndef MIPS_CMGCR_H
 #define MIPS_CMGCR_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_MIPS_GCR "mips-gcr"

diff --git a/include/hw/misc/mips_cpc.h b/include/hw/misc/mips_cpc.h
index fcafbd5e002367787bc5f6802bbfe5d1d6975947..73ed7597e8292e511dd289f7f9b58068cf13f5cd 100644 (file)
--- a/include/hw/misc/mips_cpc.h
+++ b/include/hw/misc/mips_cpc.h
@@ -20,7 +20,7 @@
 #ifndef MIPS_CPC_H
 #define MIPS_CPC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define CPC_ADDRSPACE_SZ    0x6000

diff --git a/include/hw/misc/mips_itu.h b/include/hw/misc/mips_itu.h
index 27c9a1090d53abf2c2865cfcf2143b73d00edff8..0d1c9c419c4168dd7a76dbdfea634fcc34dd4bad 100644 (file)
--- a/include/hw/misc/mips_itu.h
+++ b/include/hw/misc/mips_itu.h
@@ -20,7 +20,7 @@
 #ifndef MIPS_ITU_H
 #define MIPS_ITU_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_MIPS_ITU "mips-itu"

diff --git a/include/hw/misc/mos6522.h b/include/hw/misc/mos6522.h
index 920871a598bc68254f6116e15424cd23b5ebcd0d..150e30a2c11cc7e510a71c3f329538dae12c6126 100644 (file)
--- a/include/hw/misc/mos6522.h
+++ b/include/hw/misc/mos6522.h
@@ -28,7 +28,7 @@
 #define MOS6522_H
 
 #include "exec/hwaddr.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define MOS6522_NUM_REGS 16

diff --git a/include/hw/misc/mps2-fpgaio.h b/include/hw/misc/mps2-fpgaio.h
index 7b8bd604de0b13819b7b2555af1609633676385f..edd9f2312120a24baf2f06df2da9bad7aecfe783 100644 (file)
--- a/include/hw/misc/mps2-fpgaio.h
+++ b/include/hw/misc/mps2-fpgaio.h
@@ -21,7 +21,7 @@
 #ifndef MPS2_FPGAIO_H
 #define MPS2_FPGAIO_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/misc/led.h"
 #include "qom/object.h"
 

diff --git a/include/hw/misc/mps2-scc.h b/include/hw/misc/mps2-scc.h
index 8ff188c06b1a76ec2c7bc6f4cc4d01277de28161..989b2e057dce0cd04b4a52d83ec6afd629461b77 100644 (file)
--- a/include/hw/misc/mps2-scc.h
+++ b/include/hw/misc/mps2-scc.h
@@ -30,7 +30,7 @@
 #ifndef MPS2_SCC_H
 #define MPS2_SCC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/misc/led.h"
 #include "qom/object.h"
 

diff --git a/include/hw/misc/msf2-sysreg.h b/include/hw/misc/msf2-sysreg.h
index fc1890e710df58378a99604477b67965fbbeb463..e213aedfb7317824a58baee18ed4de31956dc686 100644 (file)
--- a/include/hw/misc/msf2-sysreg.h
+++ b/include/hw/misc/msf2-sysreg.h
@@ -25,7 +25,7 @@
 #ifndef HW_MSF2_SYSREG_H
 #define HW_MSF2_SYSREG_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 enum {

diff --git a/include/hw/misc/npcm7xx_mft.h b/include/hw/misc/npcm7xx_mft.h
index 79855b6f25d7cdb24407d33de570468f0c2bee8a..406ec94443450564fd0ecc17040607d107c2dc7b 100644 (file)
--- a/include/hw/misc/npcm7xx_mft.h
+++ b/include/hw/misc/npcm7xx_mft.h
@@ -19,7 +19,7 @@
 #include "system/memory.h"
 #include "hw/core/clock.h"
 #include "hw/core/irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 /* Max Fan input number. */

diff --git a/include/hw/misc/npcm7xx_pwm.h b/include/hw/misc/npcm7xx_pwm.h
index 6a54b40005d719eff8575ed5c7b8ed46e6cedf78..b5ae93380491241a13fbbc31b517beb20bfdc6c6 100644 (file)
--- a/include/hw/misc/npcm7xx_pwm.h
+++ b/include/hw/misc/npcm7xx_pwm.h
@@ -17,7 +17,7 @@
 #define NPCM7XX_PWM_H
 
 #include "hw/core/clock.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/irq.h"
 
 /* Each PWM module holds 4 PWM channels. */

diff --git a/include/hw/misc/npcm7xx_rng.h b/include/hw/misc/npcm7xx_rng.h
index 650375dc2cd6f59319ff476467e7296328d452d2..90858a71f5ca3edb5a62afe46adacbb4345cf917 100644 (file)
--- a/include/hw/misc/npcm7xx_rng.h
+++ b/include/hw/misc/npcm7xx_rng.h
@@ -16,7 +16,7 @@
 #ifndef NPCM7XX_RNG_H
 #define NPCM7XX_RNG_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 struct NPCM7xxRNGState {
     SysBusDevice parent;

diff --git a/include/hw/misc/npcm_clk.h b/include/hw/misc/npcm_clk.h
index 50b93a0094d98bef83bd6732539f8ebfcc0685fa..74c5c1634a97963923142b337036261a8f3cb7bb 100644 (file)
--- a/include/hw/misc/npcm_clk.h
+++ b/include/hw/misc/npcm_clk.h
@@ -18,7 +18,7 @@
 
 #include "system/memory.h"
 #include "hw/core/clock.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #define NPCM7XX_CLK_NR_REGS             (0x70 / sizeof(uint32_t))
 #define NPCM8XX_CLK_NR_REGS             (0xc4 / sizeof(uint32_t))

diff --git a/include/hw/misc/npcm_gcr.h b/include/hw/misc/npcm_gcr.h
index 702e7fddb1f8f3fd3ebf728aa006b93953be7304..97a6e531b89d60c7af9cc6fce92d99972c7fba71 100644 (file)
--- a/include/hw/misc/npcm_gcr.h
+++ b/include/hw/misc/npcm_gcr.h
@@ -17,7 +17,7 @@
 #define NPCM_GCR_H
 
 #include "system/memory.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 /*

diff --git a/include/hw/misc/nrf51_rng.h b/include/hw/misc/nrf51_rng.h
index 9aff9a76f891e7801c23f981b0e7106b16fa9e52..0c2f6d2257b808ae3f45bafa83014b9854be104b 100644 (file)
--- a/include/hw/misc/nrf51_rng.h
+++ b/include/hw/misc/nrf51_rng.h
@@ -34,7 +34,7 @@
 #ifndef NRF51_RNG_H
 #define NRF51_RNG_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/timer.h"
 #include "qom/object.h"
 #define TYPE_NRF51_RNG "nrf51_soc.rng"

diff --git a/include/hw/misc/sifive_e_aon.h b/include/hw/misc/sifive_e_aon.h
index 2ae1c4139ca35dfb6c8558ee9fbc726efc972728..efa2c3023f66327f0a303b198c4b1fe281b3a2e6 100644 (file)
--- a/include/hw/misc/sifive_e_aon.h
+++ b/include/hw/misc/sifive_e_aon.h
@@ -19,7 +19,7 @@
 #ifndef HW_SIFIVE_AON_H
 #define HW_SIFIVE_AON_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_SIFIVE_E_AON "riscv.sifive.e.aon"

diff --git a/include/hw/misc/sifive_e_prci.h b/include/hw/misc/sifive_e_prci.h
index 6aa949e910d03ac45dec2debd1b7614566988154..d0abd59f4b7b75d9fa95c448656b70bb19b97b60 100644 (file)
--- a/include/hw/misc/sifive_e_prci.h
+++ b/include/hw/misc/sifive_e_prci.h
@@ -19,7 +19,7 @@
 #ifndef HW_SIFIVE_E_PRCI_H
 #define HW_SIFIVE_E_PRCI_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 enum {
     SIFIVE_E_PRCI_HFROSCCFG = 0x0,

diff --git a/include/hw/misc/sifive_test.h b/include/hw/misc/sifive_test.h
index 88a38d00c59149e32180aa4e9e7309c7e686ca5f..85afd35263199b70bbe8a7413d05e55428e3b877 100644 (file)
--- a/include/hw/misc/sifive_test.h
+++ b/include/hw/misc/sifive_test.h
@@ -19,7 +19,7 @@
 #ifndef HW_SIFIVE_TEST_H
 #define HW_SIFIVE_TEST_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_SIFIVE_TEST "riscv.sifive.test"

diff --git a/include/hw/misc/sifive_u_otp.h b/include/hw/misc/sifive_u_otp.h
index 170d2148f25070d03fb039b379267588b2f3282d..b3d2091a58aaff12104d548d9588176ae9cf8883 100644 (file)
--- a/include/hw/misc/sifive_u_otp.h
+++ b/include/hw/misc/sifive_u_otp.h
@@ -19,7 +19,7 @@
 #ifndef HW_SIFIVE_U_OTP_H
 #define HW_SIFIVE_U_OTP_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #define SIFIVE_U_OTP_PA         0x00
 #define SIFIVE_U_OTP_PAIO       0x04

diff --git a/include/hw/misc/sifive_u_prci.h b/include/hw/misc/sifive_u_prci.h
index 4d2491ad46dd1a0be548f187efe8527d55b97fbf..c0cc755a26cb332643c349cf62447b8a2672c129 100644 (file)
--- a/include/hw/misc/sifive_u_prci.h
+++ b/include/hw/misc/sifive_u_prci.h
@@ -19,7 +19,7 @@
 #ifndef HW_SIFIVE_U_PRCI_H
 #define HW_SIFIVE_U_PRCI_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #define SIFIVE_U_PRCI_HFXOSCCFG     0x00
 #define SIFIVE_U_PRCI_COREPLLCFG0   0x04

diff --git a/include/hw/misc/stm32_rcc.h b/include/hw/misc/stm32_rcc.h
index ffbdf202ea548dcaa352590e42c404d715883e0d..4dccacc2db532e947efa7bea4d214d9b84993c94 100644 (file)
--- a/include/hw/misc/stm32_rcc.h
+++ b/include/hw/misc/stm32_rcc.h
@@ -25,7 +25,7 @@
 #ifndef HW_STM32_RCC_H
 #define HW_STM32_RCC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define STM32_RCC_CR 0x00

diff --git a/include/hw/misc/stm32f2xx_syscfg.h b/include/hw/misc/stm32f2xx_syscfg.h
index 8595a3b31b068d5bacc094e0b48042ec28d4b1ba..89e47aa091fab4d64cfe689f4986a638144e1f20 100644 (file)
--- a/include/hw/misc/stm32f2xx_syscfg.h
+++ b/include/hw/misc/stm32f2xx_syscfg.h
@@ -25,7 +25,7 @@
 #ifndef HW_STM32F2XX_SYSCFG_H
 #define HW_STM32F2XX_SYSCFG_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define SYSCFG_MEMRMP  0x00

diff --git a/include/hw/misc/stm32f4xx_exti.h b/include/hw/misc/stm32f4xx_exti.h
index fc11c595fa46066028e92680089e333b47d09322..a2d57ee3459f043f31eaba951bb878ad5c3b69ac 100644 (file)
--- a/include/hw/misc/stm32f4xx_exti.h
+++ b/include/hw/misc/stm32f4xx_exti.h
@@ -25,7 +25,7 @@
 #ifndef HW_STM32F4XX_EXTI_H
 #define HW_STM32F4XX_EXTI_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define EXTI_IMR   0x00

diff --git a/include/hw/misc/stm32f4xx_syscfg.h b/include/hw/misc/stm32f4xx_syscfg.h
index 9fce67f4b481987066c8c280a9bd748d2b8b4f3c..e6d2bc1ff3b0d0ac1b7dd639bd612edfe24b807c 100644 (file)
--- a/include/hw/misc/stm32f4xx_syscfg.h
+++ b/include/hw/misc/stm32f4xx_syscfg.h
@@ -25,7 +25,7 @@
 #ifndef HW_STM32F4XX_SYSCFG_H
 #define HW_STM32F4XX_SYSCFG_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define SYSCFG_MEMRMP  0x00

diff --git a/include/hw/misc/stm32l4x5_exti.h b/include/hw/misc/stm32l4x5_exti.h
index 62f79362f28d158c72284054c94b17f37dadd427..543662c7b9094fa9ba7ff03d351957ceaf646969 100644 (file)
--- a/include/hw/misc/stm32l4x5_exti.h
+++ b/include/hw/misc/stm32l4x5_exti.h
@@ -24,7 +24,7 @@
 #ifndef HW_STM32L4X5_EXTI_H
 #define HW_STM32L4X5_EXTI_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_STM32L4X5_EXTI "stm32l4x5-exti"

diff --git a/include/hw/misc/stm32l4x5_rcc.h b/include/hw/misc/stm32l4x5_rcc.h
index 0fbfba5c40bac0f4308ac38cb50d1a633a62ca06..64ead11b3d4704947d183e114eec441eed045a38 100644 (file)
--- a/include/hw/misc/stm32l4x5_rcc.h
+++ b/include/hw/misc/stm32l4x5_rcc.h
@@ -18,7 +18,7 @@
 #ifndef HW_STM32L4X5_RCC_H
 #define HW_STM32L4X5_RCC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_STM32L4X5_RCC "stm32l4x5-rcc"

diff --git a/include/hw/misc/stm32l4x5_syscfg.h b/include/hw/misc/stm32l4x5_syscfg.h
index c450df2b9eacfa2904bb93af4f5851b714fa6c9c..d83b4c072392e940a8a9ea95ac2e55c880df685a 100644 (file)
--- a/include/hw/misc/stm32l4x5_syscfg.h
+++ b/include/hw/misc/stm32l4x5_syscfg.h
@@ -24,7 +24,7 @@
 #ifndef HW_STM32L4X5_SYSCFG_H
 #define HW_STM32L4X5_SYSCFG_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 #include "hw/gpio/stm32l4x5_gpio.h"
 

diff --git a/include/hw/misc/tz-mpc.h b/include/hw/misc/tz-mpc.h
index 74d5d822cf336f6912cddd1c0ba28f23d188c3f0..bda4bc2ae3cb56d18d1567ea11548a99c2c7cdb5 100644 (file)
--- a/include/hw/misc/tz-mpc.h
+++ b/include/hw/misc/tz-mpc.h
@@ -31,7 +31,7 @@
 #ifndef TZ_MPC_H
 #define TZ_MPC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_TZ_MPC "tz-mpc"

diff --git a/include/hw/misc/tz-msc.h b/include/hw/misc/tz-msc.h
index 77cc7f240483652002acb42abe7b03d2076aeb7c..07112d8caa32c87eafbc5736dc88606a130f0ebb 100644 (file)
--- a/include/hw/misc/tz-msc.h
+++ b/include/hw/misc/tz-msc.h
@@ -50,7 +50,7 @@
 #ifndef TZ_MSC_H
 #define TZ_MSC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "target/arm/idau.h"
 #include "qom/object.h"
 

diff --git a/include/hw/misc/tz-ppc.h b/include/hw/misc/tz-ppc.h
index 021d671b29b66888d5eabfca26b25d41ff281c66..3fb9401160fbf95e3f2bc74e6e4d1a7a5cd5e9d8 100644 (file)
--- a/include/hw/misc/tz-ppc.h
+++ b/include/hw/misc/tz-ppc.h
@@ -65,7 +65,7 @@
 #ifndef TZ_PPC_H
 #define TZ_PPC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_TZ_PPC "tz-ppc"

diff --git a/include/hw/misc/unimp.h b/include/hw/misc/unimp.h
index 904f502fab179015b27e5459317e26ef3d023397..77a5077511f2e07183b6cce0cd091697716b1d33 100644 (file)
--- a/include/hw/misc/unimp.h
+++ b/include/hw/misc/unimp.h
@@ -9,7 +9,7 @@
 #define HW_MISC_UNIMP_H
 
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qapi/error.h"
 #include "qom/object.h"
 

diff --git a/include/hw/misc/virt_ctrl.h b/include/hw/misc/virt_ctrl.h
index 81346cf017ea69f0a343d54651471a1e40d56f59..ddce36f3b7e8ac3a54f088c0b1f7fc424ae2a036 100644 (file)
--- a/include/hw/misc/virt_ctrl.h
+++ b/include/hw/misc/virt_ctrl.h
@@ -7,7 +7,7 @@
 #ifndef VIRT_CTRL_H
 #define VIRT_CTRL_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #define TYPE_VIRT_CTRL "virt-ctrl"
 OBJECT_DECLARE_SIMPLE_TYPE(VirtCtrlState, VIRT_CTRL)

diff --git a/include/hw/misc/xlnx-versal-cframe-reg.h b/include/hw/misc/xlnx-versal-cframe-reg.h
index fe8788a74538db0af2aee4d77ee1191e5eb2143c..8f5c2959a828a6b8137c9ff8a0ce049515ed76a6 100644 (file)
--- a/include/hw/misc/xlnx-versal-cframe-reg.h
+++ b/include/hw/misc/xlnx-versal-cframe-reg.h
@@ -17,7 +17,7 @@
 #ifndef HW_MISC_XLNX_VERSAL_CFRAME_REG_H
 #define HW_MISC_XLNX_VERSAL_CFRAME_REG_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/register.h"
 #include "hw/misc/xlnx-cfi-if.h"
 #include "hw/misc/xlnx-versal-cfu.h"

diff --git a/include/hw/misc/xlnx-versal-cfu.h b/include/hw/misc/xlnx-versal-cfu.h
index 3d7ca506de14e59980cc7eabda745154e9fa2442..e4fefe43c00a8758bbd612ab6ce64f3565133aa7 100644 (file)
--- a/include/hw/misc/xlnx-versal-cfu.h
+++ b/include/hw/misc/xlnx-versal-cfu.h
@@ -17,7 +17,7 @@
 #ifndef HW_MISC_XLNX_VERSAL_CFU_APB_H
 #define HW_MISC_XLNX_VERSAL_CFU_APB_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/register.h"
 #include "hw/misc/xlnx-cfi-if.h"
 #include "qemu/fifo32.h"

diff --git a/include/hw/misc/xlnx-versal-crl.h b/include/hw/misc/xlnx-versal-crl.h
index ace3d198bde076f3f9eaa893a4d66c073d304fe3..fea7768642ffe86fdb37a8222e6eb266f22d1b90 100644 (file)
--- a/include/hw/misc/xlnx-versal-crl.h
+++ b/include/hw/misc/xlnx-versal-crl.h
@@ -10,7 +10,7 @@
 #ifndef HW_MISC_XLNX_VERSAL_CRL_H
 #define HW_MISC_XLNX_VERSAL_CRL_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/register.h"
 #include "target/arm/cpu-qom.h"
 #include "hw/arm/xlnx-versal-version.h"

diff --git a/include/hw/misc/xlnx-versal-pmc-iou-slcr.h b/include/hw/misc/xlnx-versal-pmc-iou-slcr.h
index d8f45bd94b2ddf775b4a484bd5cc39d7be09db78..046f3e525c24878325a43236766ad2640bb99b48 100644 (file)
--- a/include/hw/misc/xlnx-versal-pmc-iou-slcr.h
+++ b/include/hw/misc/xlnx-versal-pmc-iou-slcr.h
@@ -54,7 +54,7 @@
 #ifndef XLNX_VERSAL_PMC_IOU_SLCR_H
 #define XLNX_VERSAL_PMC_IOU_SLCR_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/register.h"
 
 #define TYPE_XILINX_VERSAL_PMC_IOU_SLCR "xlnx.versal-pmc-iou-slcr"

diff --git a/include/hw/misc/xlnx-versal-trng.h b/include/hw/misc/xlnx-versal-trng.h
index 8de29104048a0e9032829f90b2a3d74bea82f376..ea6e4cb2e1aaf00d9fbbf690d6f57819f02b1a0d 100644 (file)
--- a/include/hw/misc/xlnx-versal-trng.h
+++ b/include/hw/misc/xlnx-versal-trng.h
@@ -27,7 +27,7 @@
 #define XLNX_VERSAL_TRNG_H
 
 #include "hw/core/irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/register.h"
 
 #define TYPE_XLNX_VERSAL_TRNG "xlnx.versal-trng"

diff --git a/include/hw/misc/xlnx-versal-xramc.h b/include/hw/misc/xlnx-versal-xramc.h
index e79941d8865fcf4a8151aa676df45eb2e0727566..e888a9f03de2ef4033adebb98d6ac4ff64545c0c 100644 (file)
--- a/include/hw/misc/xlnx-versal-xramc.h
+++ b/include/hw/misc/xlnx-versal-xramc.h
@@ -9,7 +9,7 @@
 #ifndef XLNX_VERSAL_XRAMC_H
 #define XLNX_VERSAL_XRAMC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/register.h"
 
 #define TYPE_XLNX_XRAM_CTRL "xlnx.versal-xramc"

diff --git a/include/hw/misc/xlnx-zynqmp-apu-ctrl.h b/include/hw/misc/xlnx-zynqmp-apu-ctrl.h
index c03157200539f66e811c273d32bf172c6d64ef4e..cc0a531c244ef51e90fa3e0a582674277d4c15f1 100644 (file)
--- a/include/hw/misc/xlnx-zynqmp-apu-ctrl.h
+++ b/include/hw/misc/xlnx-zynqmp-apu-ctrl.h
@@ -11,7 +11,7 @@
 #ifndef HW_MISC_XLNX_ZYNQMP_APU_CTRL_H
 #define HW_MISC_XLNX_ZYNQMP_APU_CTRL_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/register.h"
 #include "target/arm/cpu-qom.h"
 

diff --git a/include/hw/misc/xlnx-zynqmp-crf.h b/include/hw/misc/xlnx-zynqmp-crf.h
index df83034a988c793ed86206536c88b5823abfd0bf..933867a6e5463adf93813403ee3d5646a3ef5680 100644 (file)
--- a/include/hw/misc/xlnx-zynqmp-crf.h
+++ b/include/hw/misc/xlnx-zynqmp-crf.h
@@ -8,7 +8,7 @@
 #ifndef HW_MISC_XLNX_ZYNQMP_CRF_H
 #define HW_MISC_XLNX_ZYNQMP_CRF_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/register.h"
 
 #define TYPE_XLNX_ZYNQMP_CRF "xlnx.zynqmp_crf"

diff --git a/include/hw/net/allwinner-sun8i-emac.h b/include/hw/net/allwinner-sun8i-emac.h
index 185895f4e131ebca3025e986d31d2a0042c987e7..24662a24ac0bf95f4776f653638b83e3479bac13 100644 (file)
--- a/include/hw/net/allwinner-sun8i-emac.h
+++ b/include/hw/net/allwinner-sun8i-emac.h
@@ -22,7 +22,7 @@
 
 #include "qom/object.h"
 #include "net/net.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 /**
  * Object model

diff --git a/include/hw/net/allwinner_emac.h b/include/hw/net/allwinner_emac.h
index 534e748982f876e1b479565555e12e197b1c5e0e..b3482e137ee2843135cf20e40857bad317780922 100644 (file)
--- a/include/hw/net/allwinner_emac.h
+++ b/include/hw/net/allwinner_emac.h
@@ -27,7 +27,7 @@
 #include "net/net.h"
 #include "qemu/fifo8.h"
 #include "hw/net/mii.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_AW_EMAC "allwinner-emac"

diff --git a/include/hw/net/cadence_gem.h b/include/hw/net/cadence_gem.h
index e63941f18fca6f241b428a540ca6a77c3ba9f9a9..f5f1fa47c16e55f39497d416092459ad66354a34 100644 (file)
--- a/include/hw/net/cadence_gem.h
+++ b/include/hw/net/cadence_gem.h
@@ -30,7 +30,7 @@
 OBJECT_DECLARE_SIMPLE_TYPE(CadenceGEMState, CADENCE_GEM)
 
 #include "net/net.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #define CADENCE_GEM_MAXREG        (0x00000800 / 4) /* Last valid GEM address */
 

diff --git a/include/hw/net/dp8393x.h b/include/hw/net/dp8393x.h
index 24273dc1f437cb3e9761feda5b565f40663f2163..5fe02d5a3c5aa9baae02b145b325f7b92c128d20 100644 (file)
--- a/include/hw/net/dp8393x.h
+++ b/include/hw/net/dp8393x.h
@@ -20,7 +20,7 @@
 #ifndef HW_NET_DP8393X_H
 #define HW_NET_DP8393X_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "net/net.h"
 #include "system/memory.h"
 

diff --git a/include/hw/net/ftgmac100.h b/include/hw/net/ftgmac100.h
index 24ccdf0260a9d26adde7489ea31e63c27b44aed1..414963c5fbdb348c5919254cf01aecbf9c974070 100644 (file)
--- a/include/hw/net/ftgmac100.h
+++ b/include/hw/net/ftgmac100.h
@@ -19,7 +19,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(FTGMAC100State, FTGMAC100)
 #define FTGMAC100_REG_HIGH_MEM_SIZE 0x100
 #define FTGMAC100_REG_HIGH_OFFSET 0x100
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "net/net.h"
 
 /*

diff --git a/include/hw/net/imx_fec.h b/include/hw/net/imx_fec.h
index 99fc285402cf39c90872084a69cd810c4cba9cc7..f0ac7d60e14984dd5c861df929e39e0a95d46d0b 100644 (file)
--- a/include/hw/net/imx_fec.h
+++ b/include/hw/net/imx_fec.h
@@ -30,7 +30,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(IMXFECState, IMX_FEC)
 
 #define TYPE_IMX_ENET "imx.enet"
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/net/lan9118_phy.h"
 #include "hw/core/irq.h"
 #include "net/net.h"

diff --git a/include/hw/net/lan9118_phy.h b/include/hw/net/lan9118_phy.h
index af12fc33d5fb54f302de89edcfdcab92e91913a2..1f9ad643c7bc39464fdd2c7b449c3584e61ea844 100644 (file)
--- a/include/hw/net/lan9118_phy.h
+++ b/include/hw/net/lan9118_phy.h
@@ -12,7 +12,7 @@
 #define HW_NET_LAN9118_PHY_H
 
 #include "qom/object.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #define TYPE_LAN9118_PHY "lan9118-phy"
 OBJECT_DECLARE_SIMPLE_TYPE(Lan9118PhyState, LAN9118_PHY)

diff --git a/include/hw/net/lance.h b/include/hw/net/lance.h
index f645d6af67fd82a7daff4a180fdb02ac0b42c9e0..be473e2eedb30742febb01d17ca4fb6bfdba62b0 100644 (file)
--- a/include/hw/net/lance.h
+++ b/include/hw/net/lance.h
@@ -31,7 +31,7 @@
 
 #include "net/net.h"
 #include "hw/net/pcnet.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_LANCE "lance"

diff --git a/include/hw/net/lasi_82596.h b/include/hw/net/lasi_82596.h
index c46a4a137e237e80353da2088c43a9e8da6b22ee..ab31874a7c538f9b14f04f0d75542c4c4c5826ee 100644 (file)
--- a/include/hw/net/lasi_82596.h
+++ b/include/hw/net/lasi_82596.h
@@ -10,7 +10,7 @@
 
 #include "net/net.h"
 #include "hw/net/i82596.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #define TYPE_LASI_82596 "lasi_82596"
 typedef struct SysBusI82596State SysBusI82596State;

diff --git a/include/hw/net/msf2-emac.h b/include/hw/net/msf2-emac.h
index b5d9127e46cf04df7fe422fe08b71fc49eaa7535..f018ab3ff38aa3027230237b5c073d277d65436e 100644 (file)
--- a/include/hw/net/msf2-emac.h
+++ b/include/hw/net/msf2-emac.h
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "system/memory.h"
 #include "net/net.h"
 #include "net/eth.h"

diff --git a/include/hw/net/npcm7xx_emc.h b/include/hw/net/npcm7xx_emc.h
index 03c9941d82d46fac63ba895ca8f563d40b3f99e1..238507cadce0c04d8ff55dca00780267630058e2 100644 (file)
--- a/include/hw/net/npcm7xx_emc.h
+++ b/include/hw/net/npcm7xx_emc.h
@@ -18,7 +18,7 @@
 #define NPCM7XX_EMC_H
 
 #include "hw/core/irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "net/net.h"
 
 /* 32-bit register indices. */

diff --git a/include/hw/net/npcm_gmac.h b/include/hw/net/npcm_gmac.h
index 44ee7b1bcbadb127606d939bbc341b2e51f84e76..d4fe49ada573cf985260b6ef3ad53305b42182a3 100644 (file)
--- a/include/hw/net/npcm_gmac.h
+++ b/include/hw/net/npcm_gmac.h
@@ -21,7 +21,7 @@
 #define NPCM_GMAC_H
 
 #include "hw/core/irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "net/net.h"
 
 #define NPCM_GMAC_NR_REGS (0x1060 / sizeof(uint32_t))

diff --git a/include/hw/net/npcm_pcs.h b/include/hw/net/npcm_pcs.h
index d5c481ad70d20e01fcca0f1175423b03e9f54014..7f5aa76353c61380ea5db402b95be303ca1848c2 100644 (file)
--- a/include/hw/net/npcm_pcs.h
+++ b/include/hw/net/npcm_pcs.h
@@ -17,7 +17,7 @@
 #ifndef NPCM_PCS_H
 #define NPCM_PCS_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #define NPCM_PCS_NR_SR_CTLS     (0x12 / sizeof(uint16_t))
 #define NPCM_PCS_NR_SR_MIIS     (0x20 / sizeof(uint16_t))

diff --git a/include/hw/net/xlnx-zynqmp-can.h b/include/hw/net/xlnx-zynqmp-can.h
index d23c1523caffee6340ac2f7dfd51f3d0213af38a..b43384a09838369fef22e123e5376ad1ad2ae789 100644 (file)
--- a/include/hw/net/xlnx-zynqmp-can.h
+++ b/include/hw/net/xlnx-zynqmp-can.h
@@ -30,7 +30,7 @@
 #ifndef XLNX_ZYNQMP_CAN_H
 #define XLNX_ZYNQMP_CAN_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/register.h"
 #include "net/can_emu.h"
 #include "net/can_host.h"

diff --git a/include/hw/nubus/nubus.h b/include/hw/nubus/nubus.h
index 105ddddd0d8bd167c7f1acb331fe3853188e7ecb..52d8797053e9d7317ac12cb4a37d295f35919f37 100644 (file)
--- a/include/hw/nubus/nubus.h
+++ b/include/hw/nubus/nubus.h
@@ -10,7 +10,7 @@
 #define HW_NUBUS_NUBUS_H
 
 #include "hw/core/qdev-properties.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "system/address-spaces.h"
 #include "qom/object.h"
 #include "qemu/units.h"

diff --git a/include/hw/nvram/bcm2835_otp.h b/include/hw/nvram/bcm2835_otp.h
index 1df33700bdef2256fd30c9d4095dd65140ee59d2..dba92a41e870eed7566b68dcfd8667b343557bcb 100644 (file)
--- a/include/hw/nvram/bcm2835_otp.h
+++ b/include/hw/nvram/bcm2835_otp.h
@@ -9,7 +9,7 @@
 #ifndef BCM2835_OTP_H
 #define BCM2835_OTP_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_BCM2835_OTP "bcm2835-otp"

diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h
index d41b9328fd1343589049f3a836d79b9c347d0099..a29a5d55eab509df67188a15bb458fea1e553ba6 100644 (file)
--- a/include/hw/nvram/fw_cfg.h
+++ b/include/hw/nvram/fw_cfg.h
@@ -3,7 +3,7 @@
 
 #include "exec/hwaddr.h"
 #include "standard-headers/linux/qemu_fw_cfg.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "system/dma.h"
 #include "qom/object.h"
 

diff --git a/include/hw/nvram/mac_nvram.h b/include/hw/nvram/mac_nvram.h
index e9d8398f8499f2a12b62abc62f8e19b7003f213e..e0237328225205b54bea816c72e737e91f516285 100644 (file)
--- a/include/hw/nvram/mac_nvram.h
+++ b/include/hw/nvram/mac_nvram.h
@@ -27,7 +27,7 @@
 #define MAC_NVRAM_H
 
 #include "system/memory.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #define MACIO_NVRAM_SIZE 0x2000
 

diff --git a/include/hw/nvram/npcm7xx_otp.h b/include/hw/nvram/npcm7xx_otp.h
index 77b05f8b82cd8310f4b82492758780db7884395e..95118c64a747ac8fd5ec01bc5d5539f1016ea492 100644 (file)
--- a/include/hw/nvram/npcm7xx_otp.h
+++ b/include/hw/nvram/npcm7xx_otp.h
@@ -17,7 +17,7 @@
 #define NPCM7XX_OTP_H
 
 #include "system/memory.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 /* Each OTP module holds 8192 bits of one-time programmable storage */
 #define NPCM7XX_OTP_ARRAY_BITS (8192)

diff --git a/include/hw/nvram/nrf51_nvm.h b/include/hw/nvram/nrf51_nvm.h
index d85e788df5d93dc5196a3eec22414fc5eb9b86f2..172e344a5d52440e9276813917231ce36f719797 100644 (file)
--- a/include/hw/nvram/nrf51_nvm.h
+++ b/include/hw/nvram/nrf51_nvm.h
@@ -22,7 +22,7 @@
 #ifndef NRF51_NVM_H
 #define NRF51_NVM_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 #define TYPE_NRF51_NVM "nrf51_soc.nvm"
 OBJECT_DECLARE_SIMPLE_TYPE(NRF51NVMState, NRF51_NVM)

diff --git a/include/hw/nvram/xlnx-bbram.h b/include/hw/nvram/xlnx-bbram.h
index 27423035d406445f119cd04662f4892322e6469c..7a8dd85effd4b8c97e1c258aec6e2ba5eec3445e 100644 (file)
--- a/include/hw/nvram/xlnx-bbram.h
+++ b/include/hw/nvram/xlnx-bbram.h
@@ -29,7 +29,7 @@
 #include "system/block-backend.h"
 #include "hw/core/qdev.h"
 #include "hw/core/irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/register.h"
 
 #define RMAX_XLNX_BBRAM ((0x4c / 4) + 1)

diff --git a/include/hw/nvram/xlnx-versal-efuse.h b/include/hw/nvram/xlnx-versal-efuse.h
index 07f1000a851f65b97a66a527cc2ddf7143cd8f7f..b10d7483171a1ed8ce148db8d245a176a546bf87 100644 (file)
--- a/include/hw/nvram/xlnx-versal-efuse.h
+++ b/include/hw/nvram/xlnx-versal-efuse.h
@@ -23,7 +23,7 @@
 #define XLNX_VERSAL_EFUSE_H
 
 #include "hw/core/irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/register.h"
 #include "hw/nvram/xlnx-efuse.h"
 

diff --git a/include/hw/nvram/xlnx-zynqmp-efuse.h b/include/hw/nvram/xlnx-zynqmp-efuse.h
index d48869438609813f28e2795e0b7fd712d13a0f1e..b62f8181fd91a719f4e995b76c1ac870f85122cf 100644 (file)
--- a/include/hw/nvram/xlnx-zynqmp-efuse.h
+++ b/include/hw/nvram/xlnx-zynqmp-efuse.h
@@ -23,7 +23,7 @@
 #define XLNX_ZYNQMP_EFUSE_H
 
 #include "hw/core/irq.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/register.h"
 #include "hw/nvram/xlnx-efuse.h"
 

diff --git a/include/hw/pci-host/aspeed_pcie.h b/include/hw/pci-host/aspeed_pcie.h
index be53ea96b9078c1205b56c824961593c49efd958..e660119a455efcc4b10c1f9b96f17e4c3d10c9c5 100644 (file)
--- a/include/hw/pci-host/aspeed_pcie.h
+++ b/include/hw/pci-host/aspeed_pcie.h
@@ -17,7 +17,7 @@
 #ifndef ASPEED_PCIE_H
 #define ASPEED_PCIE_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/pci/pci_bridge.h"
 #include "hw/pci/pcie_host.h"
 #include "hw/pci/pcie_port.h"

diff --git a/include/hw/pci-host/designware.h b/include/hw/pci-host/designware.h
index a35a3bd06c88f944f5676be3ffa32f193730c04c..e82fdc5fe744ef234f5907aceac63310db5badbc 100644 (file)
--- a/include/hw/pci-host/designware.h
+++ b/include/hw/pci-host/designware.h
@@ -21,7 +21,7 @@
 #ifndef DESIGNWARE_H
 #define DESIGNWARE_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/pci/pci_bridge.h"
 #include "qom/object.h"
 

diff --git a/include/hw/pci-host/fsl_imx8m_phy.h b/include/hw/pci-host/fsl_imx8m_phy.h
index 5f1b212fd9787fffde30bdd770386764e81ed89d..5786534b0ef427ed223a31a4aa0cc9342d5c9f0c 100644 (file)
--- a/include/hw/pci-host/fsl_imx8m_phy.h
+++ b/include/hw/pci-host/fsl_imx8m_phy.h
@@ -9,7 +9,7 @@
 #ifndef HW_PCIHOST_FSLIMX8MPCIEPHY_H
 #define HW_PCIHOST_FSLIMX8MPCIEPHY_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 #include "system/memory.h"
 

diff --git a/include/hw/pci-host/gpex.h b/include/hw/pci-host/gpex.h
index feaf827474003756531417b40420ecf1de2ee11b..695886dedde361dbbeda7eb4461a790e8ae56f66 100644 (file)
--- a/include/hw/pci-host/gpex.h
+++ b/include/hw/pci-host/gpex.h
@@ -21,7 +21,7 @@
 #define HW_GPEX_H
 
 #include "exec/hwaddr.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/pci/pci_device.h"
 #include "hw/pci/pcie_host.h"
 #include "qom/object.h"

diff --git a/include/hw/pci-host/xilinx-pcie.h b/include/hw/pci-host/xilinx-pcie.h
index e1b3c1c280466fbd72933dfda374c39b58d9d01d..b7bab77c2470db3ea138cec3edc9f008f65c8303 100644 (file)
--- a/include/hw/pci-host/xilinx-pcie.h
+++ b/include/hw/pci-host/xilinx-pcie.h
@@ -20,7 +20,7 @@
 #ifndef HW_XILINX_PCIE_H
 #define HW_XILINX_PCIE_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/pci/pci_bridge.h"
 #include "hw/pci/pcie_host.h"
 #include "qom/object.h"

diff --git a/include/hw/pci/pci_host.h b/include/hw/pci/pci_host.h
index 954dd446fa4dea2f3e737f5a2782af45bdac35d7..d8dec0ee049c48663b024150f82c642df22d7c24 100644 (file)
--- a/include/hw/pci/pci_host.h
+++ b/include/hw/pci/pci_host.h
@@ -28,7 +28,7 @@
 #ifndef PCI_HOST_H
 #define PCI_HOST_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define PCI_HOST_BYPASS_IOMMU "bypass-iommu"

diff --git a/include/hw/ppc/mac_dbdma.h b/include/hw/ppc/mac_dbdma.h
index 76764882453177d07da60292d7c0406b81198979..e42805144effd73cb9a7c200f8ac506ededd7b4b 100644 (file)
--- a/include/hw/ppc/mac_dbdma.h
+++ b/include/hw/ppc/mac_dbdma.h
@@ -26,7 +26,7 @@
 #include "system/memory.h"
 #include "qemu/iov.h"
 #include "system/dma.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 typedef struct DBDMA_io DBDMA_io;

diff --git a/include/hw/ppc/openpic.h b/include/hw/ppc/openpic.h
index 9c6af8e2076ae3efbc7f91e2f1022676021e6de8..5856955af9a1efdf8f88270f6a4ec30dba5858f7 100644 (file)
--- a/include/hw/ppc/openpic.h
+++ b/include/hw/ppc/openpic.h
@@ -1,7 +1,7 @@
 #ifndef OPENPIC_H
 #define OPENPIC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/cpu.h"
 #include "qom/object.h"
 

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

diff --git a/include/hw/ppc/pnv_chip.h b/include/hw/ppc/pnv_chip.h
index a5b8c49680d3742121b266e3978ad1cf250628f6..ea47c97dd3895fb76f2d10fbf9a3c3e5210d56c2 100644 (file)
--- a/include/hw/ppc/pnv_chip.h
+++ b/include/hw/ppc/pnv_chip.h
@@ -14,7 +14,7 @@
 #include "hw/ppc/pnv_sbe.h"
 #include "hw/ppc/pnv_xive.h"
 #include "hw/ppc/pnv_i2c.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 OBJECT_DECLARE_TYPE(PnvChip, PnvChipClass,
                     PNV_CHIP)

diff --git a/include/hw/ppc/pnv_pnor.h b/include/hw/ppc/pnv_pnor.h
index b44cafe918d489c4d9bcb84591a64c0d9ef23cd0..7bf737d33b4937c4ef45647d26e4ee54990cde71 100644 (file)
--- a/include/hw/ppc/pnv_pnor.h
+++ b/include/hw/ppc/pnv_pnor.h
@@ -10,7 +10,7 @@
 #ifndef PPC_PNV_PNOR_H
 #define PPC_PNV_PNOR_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 /*
  * PNOR offset on the LPC FW address space. For now this should be 0 because

diff --git a/include/hw/ppc/pnv_psi.h b/include/hw/ppc/pnv_psi.h
index 8a04860aa8b3638131a9752cbd9843a66d89eb28..e1e1ade0ce71dfd8c15acbbc01aa0d38ea7892d3 100644 (file)
--- a/include/hw/ppc/pnv_psi.h
+++ b/include/hw/ppc/pnv_psi.h
@@ -20,7 +20,7 @@
 #ifndef PPC_PNV_PSI_H
 #define PPC_PNV_PSI_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/ppc/xics.h"
 #include "hw/ppc/xive.h"
 #include "hw/core/qdev.h"

diff --git a/include/hw/ppc/ppc4xx.h b/include/hw/ppc/ppc4xx.h
index 2e94b0067302778a24bc597cd86c827e6aa97a40..b76bf091cfa0fb84abe35d0b5501fbf9f0659498 100644 (file)
--- a/include/hw/ppc/ppc4xx.h
+++ b/include/hw/ppc/ppc4xx.h
@@ -27,7 +27,7 @@
 
 #include "hw/ppc/ppc.h"
 #include "system/memory.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 /*
  * Generic DCR device

diff --git a/include/hw/ppc/xive.h b/include/hw/ppc/xive.h
index b7ca8544e43149c63014443ae5e1244735fc47b9..e98d011998f8be2e20b2c8c1bf875031666d2db9 100644 (file)
--- a/include/hw/ppc/xive.h
+++ b/include/hw/ppc/xive.h
@@ -139,7 +139,7 @@
 #define PPC_XIVE_H
 
 #include "system/kvm.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/ppc/xive_regs.h"
 #include "qom/object.h"
 

diff --git a/include/hw/ppc/xive2.h b/include/hw/ppc/xive2.h
index f4437e2c79a72b30bd3390534c8d1b1573037f5f..9e2af8d8b1766d3590511321cb35d68c78987a4f 100644 (file)
--- a/include/hw/ppc/xive2.h
+++ b/include/hw/ppc/xive2.h
@@ -11,7 +11,7 @@
 
 #include "hw/ppc/xive.h"
 #include "hw/ppc/xive2_regs.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 /*
  * XIVE2 Router (POWER10)

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

diff --git a/include/hw/riscv/riscv_hart.h b/include/hw/riscv/riscv_hart.h
index a6ed73a1956e82201bd3e20d5ae299e152b5f6aa..197fa1623115a842bb1f5677c5215b8014a505ff 100644 (file)
--- a/include/hw/riscv/riscv_hart.h
+++ b/include/hw/riscv/riscv_hart.h
@@ -21,7 +21,7 @@
 #ifndef HW_RISCV_HART_H
 #define HW_RISCV_HART_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "target/riscv/cpu.h"
 #include "qom/object.h"
 

diff --git a/include/hw/riscv/spike.h b/include/hw/riscv/spike.h
index acd41e90583ed197f68bdc9bc5c0c4eea607879d..6868976884100afe8c7233b01d12a1f9a369e48b 100644 (file)
--- a/include/hw/riscv/spike.h
+++ b/include/hw/riscv/spike.h
@@ -21,7 +21,7 @@
 
 #include "hw/core/boards.h"
 #include "hw/riscv/riscv_hart.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #define SPIKE_CPUS_MAX 8
 #define SPIKE_SOCKETS_MAX 8

diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h
index 806b78cc639207ed37bd39f6e553b6fe5d412159..18a2a323a34440ab44a4821f7888ffe09f9252c9 100644 (file)
--- a/include/hw/riscv/virt.h
+++ b/include/hw/riscv/virt.h
@@ -21,7 +21,7 @@
 
 #include "hw/core/boards.h"
 #include "hw/riscv/riscv_hart.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/block/flash.h"
 #include "hw/intc/riscv_imsic.h"
 

diff --git a/include/hw/rtc/allwinner-rtc.h b/include/hw/rtc/allwinner-rtc.h
index bf415431cd79250ef87f7ef445994aa9c1e901e6..2b5ff0656653cd569d1932b57f50a7fca05498db 100644 (file)
--- a/include/hw/rtc/allwinner-rtc.h
+++ b/include/hw/rtc/allwinner-rtc.h
@@ -21,7 +21,7 @@
 #define HW_MISC_ALLWINNER_RTC_H
 
 #include "qom/object.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 /**
  * Constants

diff --git a/include/hw/rtc/aspeed_rtc.h b/include/hw/rtc/aspeed_rtc.h
index 596dfebb46c21088d15647d236e0057f942daa58..ef37dd3d69f6f05c523e4ac7af03ab297dadb4de 100644 (file)
--- a/include/hw/rtc/aspeed_rtc.h
+++ b/include/hw/rtc/aspeed_rtc.h
@@ -8,7 +8,7 @@
 #ifndef HW_RTC_ASPEED_RTC_H
 #define HW_RTC_ASPEED_RTC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 struct AspeedRtcState {

diff --git a/include/hw/rtc/goldfish_rtc.h b/include/hw/rtc/goldfish_rtc.h
index 162be3386362d7e0001a3ffb208e73ffc746d64b..55ed9c4085ccfdce70ea6e8f07718719f702e550 100644 (file)
--- a/include/hw/rtc/goldfish_rtc.h
+++ b/include/hw/rtc/goldfish_rtc.h
@@ -22,7 +22,7 @@
 #ifndef HW_RTC_GOLDFISH_RTC_H
 #define HW_RTC_GOLDFISH_RTC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_GOLDFISH_RTC "goldfish_rtc"

diff --git a/include/hw/rtc/pl031.h b/include/hw/rtc/pl031.h
index 9fd4be1abba06dcfc5666fbb618c481f14d6ff70..c8b26c2f00e40ba24d33995b3c1ed1b69f88943c 100644 (file)
--- a/include/hw/rtc/pl031.h
+++ b/include/hw/rtc/pl031.h
@@ -14,7 +14,7 @@
 #ifndef HW_RTC_PL031_H
 #define HW_RTC_PL031_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/timer.h"
 #include "qom/object.h"
 

diff --git a/include/hw/rtc/xlnx-zynqmp-rtc.h b/include/hw/rtc/xlnx-zynqmp-rtc.h
index a542b87cb8904571f3e2d20ffc5639bd2d082270..7d8505ce3991650aa389325ce241c773357e9aea 100644 (file)
--- a/include/hw/rtc/xlnx-zynqmp-rtc.h
+++ b/include/hw/rtc/xlnx-zynqmp-rtc.h
@@ -28,7 +28,7 @@
 #define HW_RTC_XLNX_ZYNQMP_RTC_H
 
 #include "hw/core/register.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_XLNX_ZYNQMP_RTC "xlnx-zynmp.rtc"

diff --git a/include/hw/s390x/3270-ccw.h b/include/hw/s390x/3270-ccw.h
index 14398822944213b04a3f45f51276afe8604aee10..6b73c8b51f8a0eef311e3c3490cb97257374a36e 100644 (file)
--- a/include/hw/s390x/3270-ccw.h
+++ b/include/hw/s390x/3270-ccw.h
@@ -13,7 +13,7 @@
 #ifndef HW_S390X_3270_CCW_H
 #define HW_S390X_3270_CCW_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/s390x/css.h"
 #include "hw/s390x/ccw-device.h"
 #include "qom/object.h"

diff --git a/include/hw/s390x/css-bridge.h b/include/hw/s390x/css-bridge.h
index 4f874ed781b216bae82ed0dbe95ef092ca2ffaab..1a29d3a542d3fe6708e136a608d1b1e3804e9727 100644 (file)
--- a/include/hw/s390x/css-bridge.h
+++ b/include/hw/s390x/css-bridge.h
@@ -14,7 +14,7 @@
 #define HW_S390X_CSS_BRIDGE_H
 
 #include "qom/object.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 /* virtual css bridge */
 struct VirtualCssBridge {

diff --git a/include/hw/s390x/s390_flic.h b/include/hw/s390x/s390_flic.h
index 91edaaca409125fc98c222c9a658bfe2b1fdcc2e..c9db5279e3a6a036f7d87964c80c493c3fc19833 100644 (file)
--- a/include/hw/s390x/s390_flic.h
+++ b/include/hw/s390x/s390_flic.h
@@ -13,7 +13,7 @@
 #ifndef HW_S390_FLIC_H
 #define HW_S390_FLIC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/s390x/adapter.h"
 #include "hw/virtio/virtio.h"
 #include "qemu/queue.h"

diff --git a/include/hw/s390x/sclp.h b/include/hw/s390x/sclp.h
index 33f01f85bb168160a6719e55bf34b7b35edadc0c..ddc61f1c21480824971888207c4ffbfb381b464b 100644 (file)
--- a/include/hw/s390x/sclp.h
+++ b/include/hw/s390x/sclp.h
@@ -14,7 +14,7 @@
 #ifndef HW_S390_SCLP_H
 #define HW_S390_SCLP_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "target/s390x/cpu-qom.h"
 #include "qom/object.h"
 

diff --git a/include/hw/scsi/esp.h b/include/hw/scsi/esp.h
index 3526bad7464bc3dedba6c0652c273002cce1b541..8887ba85124779244bbb7527a05877b02af04ed9 100644 (file)
--- a/include/hw/scsi/esp.h
+++ b/include/hw/scsi/esp.h
@@ -2,7 +2,7 @@
 #define QEMU_HW_ESP_H
 
 #include "hw/scsi/scsi.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/fifo8.h"
 #include "qom/object.h"
 

diff --git a/include/hw/sd/allwinner-sdhost.h b/include/hw/sd/allwinner-sdhost.h
index 1b951177ddaf01fc1a61ba377a163e86511aeee6..d154d81d24c4c8be75575227a81943167479bb5d 100644 (file)
--- a/include/hw/sd/allwinner-sdhost.h
+++ b/include/hw/sd/allwinner-sdhost.h
@@ -21,7 +21,7 @@
 #define HW_SD_ALLWINNER_SDHOST_H
 
 #include "qom/object.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/sd/sd.h"
 
 /**

diff --git a/include/hw/sd/bcm2835_sdhost.h b/include/hw/sd/bcm2835_sdhost.h
index f6bca5c3979fd86bb977129ee8d134ec70fcc98e..8ba220d89e945f4eeb95aaa9bded6a8d3c17ae47 100644 (file)
--- a/include/hw/sd/bcm2835_sdhost.h
+++ b/include/hw/sd/bcm2835_sdhost.h
@@ -14,7 +14,7 @@
 #ifndef BCM2835_SDHOST_H
 #define BCM2835_SDHOST_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/sd/sd.h"
 #include "qom/object.h"
 

diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h
index 51fb30ea528b85a018c83a54d8db178539767b72..32962c210d72fe217742bbd42e16600eaa2bea43 100644 (file)
--- a/include/hw/sd/sdhci.h
+++ b/include/hw/sd/sdhci.h
@@ -26,7 +26,7 @@
 #define SDHCI_H
 
 #include "hw/pci/pci_device.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/sd/sd.h"
 #include "qom/object.h"
 

diff --git a/include/hw/sparc/sparc32_dma.h b/include/hw/sparc/sparc32_dma.h
index cde8ec02cb6543afa131788588ee5258412bd8a6..3181c17043a0b0b820259d3781189fd891a1dd77 100644 (file)
--- a/include/hw/sparc/sparc32_dma.h
+++ b/include/hw/sparc/sparc32_dma.h
@@ -1,7 +1,7 @@
 #ifndef SPARC32_DMA_H
 #define SPARC32_DMA_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/scsi/esp.h"
 #include "hw/net/lance.h"
 #include "qom/object.h"

diff --git a/include/hw/sparc/sun4m_iommu.h b/include/hw/sparc/sun4m_iommu.h
index 4e2ab34cdef33b40dcae7c11fa9f3cb5695345e9..ccefafedbc4242c03d5f162cd8a767397dcf3c7f 100644 (file)
--- a/include/hw/sparc/sun4m_iommu.h
+++ b/include/hw/sparc/sun4m_iommu.h
@@ -25,7 +25,7 @@
 #ifndef SUN4M_IOMMU_H
 #define SUN4M_IOMMU_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define IOMMU_NREGS         (4 * 4096 / 4)

diff --git a/include/hw/sparc/sun4u_iommu.h b/include/hw/sparc/sun4u_iommu.h
index f94566a72c9cd1493e9a4ebe9a783a73c31338fa..3ae81a2406acf26e4192c57680ace1976238b914 100644 (file)
--- a/include/hw/sparc/sun4u_iommu.h
+++ b/include/hw/sparc/sun4u_iommu.h
@@ -27,7 +27,7 @@
 #ifndef SUN4U_IOMMU_H
 #define SUN4U_IOMMU_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define IOMMU_NREGS             3

diff --git a/include/hw/ssi/allwinner-a10-spi.h b/include/hw/ssi/allwinner-a10-spi.h
index da46e29a278c5635c124c90223f97213d4cc6d0e..6e0e29936156680065d93805763de36ae18df118 100644 (file)
--- a/include/hw/ssi/allwinner-a10-spi.h
+++ b/include/hw/ssi/allwinner-a10-spi.h
@@ -23,7 +23,7 @@
 #define ALLWINNER_A10_SPI_H
 
 #include "hw/ssi/ssi.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/fifo8.h"
 #include "qom/object.h"
 

diff --git a/include/hw/ssi/aspeed_smc.h b/include/hw/ssi/aspeed_smc.h
index 25b95e740608d99fdf9f71599b0835c7f9ff01a7..76831422c6f5dc6be34bcefe90888c760fee4254 100644 (file)
--- a/include/hw/ssi/aspeed_smc.h
+++ b/include/hw/ssi/aspeed_smc.h
@@ -26,7 +26,7 @@
 #define ASPEED_SMC_H
 
 #include "hw/ssi/ssi.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 struct AspeedSMCState;

diff --git a/include/hw/ssi/bcm2835_spi.h b/include/hw/ssi/bcm2835_spi.h
index d3f8cec111952e26d385106fd7914a275697c298..d5891fd92578d3ce19d5393edacf683ca88019b4 100644 (file)
--- a/include/hw/ssi/bcm2835_spi.h
+++ b/include/hw/ssi/bcm2835_spi.h
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/ssi/ssi.h"
 #include "qom/object.h"
 #include "qemu/fifo8.h"

diff --git a/include/hw/ssi/ibex_spi_host.h b/include/hw/ssi/ibex_spi_host.h
index 5bd5557b9a1bd1a41f9ebeafdd1be96a9f75713c..2aac6ee920c0348a9f580fcce4a3fe165a40e4bc 100644 (file)
--- a/include/hw/ssi/ibex_spi_host.h
+++ b/include/hw/ssi/ibex_spi_host.h
@@ -27,7 +27,7 @@
 #ifndef IBEX_SPI_HOST_H
 #define IBEX_SPI_HOST_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/ssi/ssi.h"
 #include "qemu/fifo8.h"
 #include "qom/object.h"

diff --git a/include/hw/ssi/imx_spi.h b/include/hw/ssi/imx_spi.h
index eeaf49bbac3162cf40b7b65d229b83f313654869..9a95127755fcde379a04371643ed893088051258 100644 (file)
--- a/include/hw/ssi/imx_spi.h
+++ b/include/hw/ssi/imx_spi.h
@@ -10,7 +10,7 @@
 #ifndef IMX_SPI_H
 #define IMX_SPI_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/ssi/ssi.h"
 #include "qemu/bitops.h"
 #include "qemu/fifo32.h"

diff --git a/include/hw/ssi/mss-spi.h b/include/hw/ssi/mss-spi.h
index ce6279c431014b0f9aabed07a895725864b89e0d..85e11f726694462ad6f4f8ad401a99f6fee18e43 100644 (file)
--- a/include/hw/ssi/mss-spi.h
+++ b/include/hw/ssi/mss-spi.h
@@ -25,7 +25,7 @@
 #ifndef HW_MSS_SPI_H
 #define HW_MSS_SPI_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/ssi/ssi.h"
 #include "qemu/fifo32.h"
 #include "qom/object.h"

diff --git a/include/hw/ssi/npcm7xx_fiu.h b/include/hw/ssi/npcm7xx_fiu.h
index 7ebd422ca6c0a0643de258fa5161f88f038fdbab..530d8e2f44ace022de5d1f87268b14b8de82dd6b 100644 (file)
--- a/include/hw/ssi/npcm7xx_fiu.h
+++ b/include/hw/ssi/npcm7xx_fiu.h
@@ -17,7 +17,7 @@
 #define NPCM7XX_FIU_H
 
 #include "hw/ssi/ssi.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 /*
  * Number of registers in our device state structure. Don't change this without

diff --git a/include/hw/ssi/npcm_pspi.h b/include/hw/ssi/npcm_pspi.h
index 37cc784d96235254f24a9f03248a26a48937c121..dbf40710f32057519990864273d405d8eb8242e6 100644 (file)
--- a/include/hw/ssi/npcm_pspi.h
+++ b/include/hw/ssi/npcm_pspi.h
@@ -17,7 +17,7 @@
 #define NPCM_PSPI_H
 
 #include "hw/ssi/ssi.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 /*
  * Number of registers in our device state structure. Don't change this without

diff --git a/include/hw/ssi/pl022.h b/include/hw/ssi/pl022.h
index 25d58db5f32607b0bd62d8ed783c96f634e54e18..afddc314c79f70942b57f24ed537dbc97ef03156 100644 (file)
--- a/include/hw/ssi/pl022.h
+++ b/include/hw/ssi/pl022.h
@@ -22,7 +22,7 @@
 #ifndef HW_SSI_PL022_H
 #define HW_SSI_PL022_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_PL022 "pl022"

diff --git a/include/hw/ssi/pnv_spi.h b/include/hw/ssi/pnv_spi.h
index c591a0663da6073a4577d5983484e5c39f6ad710..31a690854ba1c8c17ae19f6715b609c4721c7948 100644 (file)
--- a/include/hw/ssi/pnv_spi.h
+++ b/include/hw/ssi/pnv_spi.h
@@ -22,7 +22,7 @@
 #define PPC_PNV_SPI_H
 
 #include "hw/ssi/ssi.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/fifo8.h"
 
 #define TYPE_PNV_SPI "pnv-spi"

diff --git a/include/hw/ssi/sifive_spi.h b/include/hw/ssi/sifive_spi.h
index d0c40cdb11be73737910649c2a8e547e7db19621..e45becb8c59d84f1b1cbbe5fee34033f5079c523 100644 (file)
--- a/include/hw/ssi/sifive_spi.h
+++ b/include/hw/ssi/sifive_spi.h
@@ -23,7 +23,7 @@
 #define HW_SIFIVE_SPI_H
 
 #include "qemu/fifo8.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #define SIFIVE_SPI_REG_NUM  (0x78 / 4)
 

diff --git a/include/hw/ssi/stm32f2xx_spi.h b/include/hw/ssi/stm32f2xx_spi.h
index 3683b4ad3293536f0a03ae35e62e678835a09fd0..26b02429aaaf4ca486c1747f6b8447a1099a0295 100644 (file)
--- a/include/hw/ssi/stm32f2xx_spi.h
+++ b/include/hw/ssi/stm32f2xx_spi.h
@@ -25,7 +25,7 @@
 #ifndef HW_STM32F2XX_SPI_H
 #define HW_STM32F2XX_SPI_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/ssi/ssi.h"
 #include "qom/object.h"
 

diff --git a/include/hw/ssi/xilinx_spips.h b/include/hw/ssi/xilinx_spips.h
index 56cf69a37d2a9fdee11ca4e786bdc1cad7221144..c8f6c5053c4cd486d5ca38916bd35578e371db8a 100644 (file)
--- a/include/hw/ssi/xilinx_spips.h
+++ b/include/hw/ssi/xilinx_spips.h
@@ -28,7 +28,7 @@
 #include "hw/ssi/ssi.h"
 #include "qemu/fifo32.h"
 #include "hw/core/stream.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 typedef struct XilinxSPIPS XilinxSPIPS;

diff --git a/include/hw/timer/a9gtimer.h b/include/hw/timer/a9gtimer.h
index 6ae9122e4b69b5761314e5576da53b2d47fb52b1..5c9b048b95455a97f76e9f392da33355fa577d16 100644 (file)
--- a/include/hw/timer/a9gtimer.h
+++ b/include/hw/timer/a9gtimer.h
@@ -23,7 +23,7 @@
 #ifndef A9GTIMER_H
 #define A9GTIMER_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define A9_GTIMER_MAX_CPUS 4

diff --git a/include/hw/timer/allwinner-a10-pit.h b/include/hw/timer/allwinner-a10-pit.h
index 623a1fec21961a0af39c7a521b81310fd9cce59c..fe6a408022e9e9397e30fe1aa1ce2b289dc725c1 100644 (file)
--- a/include/hw/timer/allwinner-a10-pit.h
+++ b/include/hw/timer/allwinner-a10-pit.h
@@ -2,7 +2,7 @@
 #define ALLWINNER_A10_PIT_H
 
 #include "hw/core/ptimer.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_AW_A10_PIT "allwinner-A10-timer"

diff --git a/include/hw/timer/arm_mptimer.h b/include/hw/timer/arm_mptimer.h
index 65a96e2a0dc8a4001e0cd69959b4207f4a81bf89..4c6f5696319c0f522f302250824da2be687ed0fc 100644 (file)
--- a/include/hw/timer/arm_mptimer.h
+++ b/include/hw/timer/arm_mptimer.h
@@ -21,7 +21,7 @@
 #ifndef HW_TIMER_ARM_MPTIMER_H
 #define HW_TIMER_ARM_MPTIMER_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define ARM_MPTIMER_MAX_CPUS 4

diff --git a/include/hw/timer/armv7m_systick.h b/include/hw/timer/armv7m_systick.h
index fb73f78a7b83f33c4ee99bc5941addf3c9aca712..637dbf35c5cf3d640eb638e9cfe6e1d10ea65b5a 100644 (file)
--- a/include/hw/timer/armv7m_systick.h
+++ b/include/hw/timer/armv7m_systick.h
@@ -12,7 +12,7 @@
 #ifndef HW_TIMER_ARMV7M_SYSTICK_H
 #define HW_TIMER_ARMV7M_SYSTICK_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 #include "hw/core/ptimer.h"
 #include "hw/core/clock.h"

diff --git a/include/hw/timer/avr_timer16.h b/include/hw/timer/avr_timer16.h
index a1a032a24dc8587a0b918493a8f414137f5ea44e..5c9dca134a0ecd001a6054575ca7a17bac956d6a 100644 (file)
--- a/include/hw/timer/avr_timer16.h
+++ b/include/hw/timer/avr_timer16.h
@@ -28,7 +28,7 @@
 #ifndef HW_TIMER_AVR_TIMER16_H
 #define HW_TIMER_AVR_TIMER16_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/timer.h"
 #include "qom/object.h"
 

diff --git a/include/hw/timer/bcm2835_systmr.h b/include/hw/timer/bcm2835_systmr.h
index 93cb3415a68fb13bf20fe23eb86451a3eb476275..0674a18f12db5f2bbff8ca75287f8691c3aed5ba 100644 (file)
--- a/include/hw/timer/bcm2835_systmr.h
+++ b/include/hw/timer/bcm2835_systmr.h
@@ -9,7 +9,7 @@
 #ifndef BCM2835_SYSTMR_H
 #define BCM2835_SYSTMR_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/irq.h"
 #include "qemu/timer.h"
 #include "qom/object.h"

diff --git a/include/hw/timer/cadence_ttc.h b/include/hw/timer/cadence_ttc.h
index e1251383f2ac985f7c6cfdbf03b72c9731bbade1..27b555e96a4e72747beda6b7a03546a00ae06e93 100644 (file)
--- a/include/hw/timer/cadence_ttc.h
+++ b/include/hw/timer/cadence_ttc.h
@@ -18,7 +18,7 @@
 #ifndef HW_TIMER_CADENCE_TTC_H
 #define HW_TIMER_CADENCE_TTC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/timer.h"
 
 typedef struct {

diff --git a/include/hw/timer/cmsdk-apb-dualtimer.h b/include/hw/timer/cmsdk-apb-dualtimer.h
index 103ac228815b582b40fce312b44bf2c23e0f7321..7e238f04dfe0e35b8b0b74f533bf4ec1b0a9111e 100644 (file)
--- a/include/hw/timer/cmsdk-apb-dualtimer.h
+++ b/include/hw/timer/cmsdk-apb-dualtimer.h
@@ -26,7 +26,7 @@
 #ifndef CMSDK_APB_DUALTIMER_H
 #define CMSDK_APB_DUALTIMER_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/ptimer.h"
 #include "hw/core/clock.h"
 #include "qom/object.h"

diff --git a/include/hw/timer/cmsdk-apb-timer.h b/include/hw/timer/cmsdk-apb-timer.h
index f8c8fb8ce55d8d6219b3f6912ed70363377089eb..5ecda01776e1c470e3ee155bcef369e1f64be00a 100644 (file)
--- a/include/hw/timer/cmsdk-apb-timer.h
+++ b/include/hw/timer/cmsdk-apb-timer.h
@@ -12,7 +12,7 @@
 #ifndef CMSDK_APB_TIMER_H
 #define CMSDK_APB_TIMER_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/ptimer.h"
 #include "hw/core/clock.h"
 #include "qom/object.h"

diff --git a/include/hw/timer/digic-timer.h b/include/hw/timer/digic-timer.h
index f62242eaad35bf3438a109e065f5d740d96c80bf..bcd80108a2b072ad7d89be2277e04b4e38349a7b 100644 (file)
--- a/include/hw/timer/digic-timer.h
+++ b/include/hw/timer/digic-timer.h
@@ -18,7 +18,7 @@
 #ifndef HW_TIMER_DIGIC_TIMER_H
 #define HW_TIMER_DIGIC_TIMER_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/ptimer.h"
 #include "qom/object.h"
 

diff --git a/include/hw/timer/ibex_timer.h b/include/hw/timer/ibex_timer.h
index 41f5c82a920b7e86ecb97c0567b60bf78e6e06bf..53055f3351b67e7965cee0d32f257fe20ebd1d80 100644 (file)
--- a/include/hw/timer/ibex_timer.h
+++ b/include/hw/timer/ibex_timer.h
@@ -25,7 +25,7 @@
 #ifndef HW_IBEX_TIMER_H
 #define HW_IBEX_TIMER_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #define TYPE_IBEX_TIMER "ibex-timer"
 OBJECT_DECLARE_SIMPLE_TYPE(IbexTimerState, IBEX_TIMER)

diff --git a/include/hw/timer/imx_epit.h b/include/hw/timer/imx_epit.h
index 2947fad1069c27d0e6470b4699bdac2ec42d6cc7..18d41ec139374f2aed40865011226f5a1100351e 100644 (file)
--- a/include/hw/timer/imx_epit.h
+++ b/include/hw/timer/imx_epit.h
@@ -29,7 +29,7 @@
 #ifndef IMX_EPIT_H
 #define IMX_EPIT_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/ptimer.h"
 #include "hw/misc/imx_ccm.h"
 #include "qom/object.h"

diff --git a/include/hw/timer/imx_gpt.h b/include/hw/timer/imx_gpt.h
index 5c12f686e1b4cf0ae5d2cfc075ef6f72406eeb6a..7f0d55b34995fa714b78bc6801cbb4d20fa95d46 100644 (file)
--- a/include/hw/timer/imx_gpt.h
+++ b/include/hw/timer/imx_gpt.h
@@ -29,7 +29,7 @@
 #ifndef IMX_GPT_H
 #define IMX_GPT_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/ptimer.h"
 #include "hw/misc/imx_ccm.h"
 #include "qom/object.h"

diff --git a/include/hw/timer/mss-timer.h b/include/hw/timer/mss-timer.h
index 0cc376f945fe2f8fce02afbc254d9342b10b2beb..93a73fae72ad49b7080f17a2c44e671b055c02e1 100644 (file)
--- a/include/hw/timer/mss-timer.h
+++ b/include/hw/timer/mss-timer.h
@@ -25,7 +25,7 @@
 #ifndef HW_MSS_TIMER_H
 #define HW_MSS_TIMER_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/ptimer.h"
 #include "qom/object.h"
 

diff --git a/include/hw/timer/npcm7xx_timer.h b/include/hw/timer/npcm7xx_timer.h
index e287375dce62a4dc01ecf4a611c331f7e8278516..9ad42c65a8a1756d7078c98ca06b5c4d475d1141 100644 (file)
--- a/include/hw/timer/npcm7xx_timer.h
+++ b/include/hw/timer/npcm7xx_timer.h
@@ -17,7 +17,7 @@
 #define NPCM7XX_TIMER_H
 
 #include "system/memory.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/timer.h"
 
 /* Each Timer Module (TIM) instance holds five 25 MHz timers. */

diff --git a/include/hw/timer/nrf51_timer.h b/include/hw/timer/nrf51_timer.h
index 76827c11dc790ee8f879488ad55346c5ca0cfa56..fe282ff78fda72b0f294edb3444f78fedb1614a4 100644 (file)
--- a/include/hw/timer/nrf51_timer.h
+++ b/include/hw/timer/nrf51_timer.h
@@ -13,7 +13,7 @@
 #ifndef NRF51_TIMER_H
 #define NRF51_TIMER_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/timer.h"
 #include "qom/object.h"
 #define TYPE_NRF51_TIMER "nrf51_soc.timer"

diff --git a/include/hw/timer/renesas_cmt.h b/include/hw/timer/renesas_cmt.h
index 1c0b65c1d5a702c4c18b48a5f37dd6c20f1db56b..e2aa6d47af5ab88bf9340c8c049fc39df1de8baf 100644 (file)
--- a/include/hw/timer/renesas_cmt.h
+++ b/include/hw/timer/renesas_cmt.h
@@ -10,7 +10,7 @@
 #define HW_TIMER_RENESAS_CMT_H
 
 #include "qemu/timer.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_RENESAS_CMT "renesas-cmt"

diff --git a/include/hw/timer/renesas_tmr.h b/include/hw/timer/renesas_tmr.h
index caf7eec0dca527ecd97dc03600f91ef8ac02b363..061b8f2900a333d28998039ed969704887f70c2d 100644 (file)
--- a/include/hw/timer/renesas_tmr.h
+++ b/include/hw/timer/renesas_tmr.h
@@ -10,7 +10,7 @@
 #define HW_TIMER_RENESAS_TMR_H
 
 #include "qemu/timer.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_RENESAS_TMR "renesas-tmr"

diff --git a/include/hw/timer/sifive_pwm.h b/include/hw/timer/sifive_pwm.h
index 6a8cf7b29e4a2b640ac54726f9cad5e9daf86c4f..d3a49be6b6a2cdbc8f8b310a4fc37f9a55cbb7a2 100644 (file)
--- a/include/hw/timer/sifive_pwm.h
+++ b/include/hw/timer/sifive_pwm.h
@@ -27,7 +27,7 @@
 #ifndef HW_SIFIVE_PWM_H
 #define HW_SIFIVE_PWM_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/timer.h"
 #include "qom/object.h"
 

diff --git a/include/hw/timer/sse-counter.h b/include/hw/timer/sse-counter.h
index b433e58d3701b69b68cd46adeddce896ab3c759e..15bd1a5104788520774bf568fc5206e2fab9f0fa 100644 (file)
--- a/include/hw/timer/sse-counter.h
+++ b/include/hw/timer/sse-counter.h
@@ -30,7 +30,7 @@
 #ifndef SSE_COUNTER_H
 #define SSE_COUNTER_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 #include "qemu/notify.h"
 

diff --git a/include/hw/timer/sse-timer.h b/include/hw/timer/sse-timer.h
index 265ad32400dcd3e20df6d89e6b6b32febd4b1bc5..c9ad2225a63e4b195621a71dea9ebc67b94b8214 100644 (file)
--- a/include/hw/timer/sse-timer.h
+++ b/include/hw/timer/sse-timer.h
@@ -24,7 +24,7 @@
 #ifndef SSE_TIMER_H
 #define SSE_TIMER_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/timer.h"
 #include "qom/object.h"
 #include "hw/timer/sse-counter.h"

diff --git a/include/hw/timer/stellaris-gptm.h b/include/hw/timer/stellaris-gptm.h
index 9d663b58dfa35931148778af62866cc598d83460..824723b2730599bc54bb1b6d7bd0372ea0f7945d 100644 (file)
--- a/include/hw/timer/stellaris-gptm.h
+++ b/include/hw/timer/stellaris-gptm.h
@@ -11,7 +11,7 @@
 #define HW_TIMER_STELLARIS_GPTM_H
 
 #include "qom/object.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/irq.h"
 #include "hw/core/clock.h"
 

diff --git a/include/hw/timer/stm32f2xx_timer.h b/include/hw/timer/stm32f2xx_timer.h
index 90f40f1746f935d2657ca1ffc4c93615a64d3d71..040e64d49922f59597c0fdaa3a5cd1e61b039f56 100644 (file)
--- a/include/hw/timer/stm32f2xx_timer.h
+++ b/include/hw/timer/stm32f2xx_timer.h
@@ -25,7 +25,7 @@
 #ifndef HW_STM32F2XX_TIMER_H
 #define HW_STM32F2XX_TIMER_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/timer.h"
 #include "qom/object.h"
 

diff --git a/include/hw/tricore/tc27x_soc.h b/include/hw/tricore/tc27x_soc.h
index dd3a7485c85a2bf1380cef64666b7f1637d9f1e9..2d2bdca3fd2d9ecd18bdc8c961ede74b20423043 100644 (file)
--- a/include/hw/tricore/tc27x_soc.h
+++ b/include/hw/tricore/tc27x_soc.h
@@ -21,7 +21,7 @@
 #ifndef TC27X_SOC_H
 #define TC27X_SOC_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "target/tricore/cpu.h"
 #include "qom/object.h"
 

diff --git a/include/hw/tricore/tricore_testdevice.h b/include/hw/tricore/tricore_testdevice.h
index 2c57b62f222679e6560847493060f40f6b2e8ebe..98c87ba76be52babc924fd4e97add324474715a2 100644 (file)
--- a/include/hw/tricore/tricore_testdevice.h
+++ b/include/hw/tricore/tricore_testdevice.h
@@ -18,7 +18,7 @@
 #ifndef HW_TRICORE_TESTDEVICE_H
 #define HW_TRICORE_TESTDEVICE_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #define TYPE_TRICORE_TESTDEVICE "tricore_testdevice"
 #define TRICORE_TESTDEVICE(obj) \

diff --git a/include/hw/usb/imx-usb-phy.h b/include/hw/usb/imx-usb-phy.h
index d1e867b77a3b95ffc1072aa803b6a156cfd5a412..1b45b6e62a5356ee94738398436aa62c8dee6ea2 100644 (file)
--- a/include/hw/usb/imx-usb-phy.h
+++ b/include/hw/usb/imx-usb-phy.h
@@ -1,7 +1,7 @@
 #ifndef IMX_USB_PHY_H
 #define IMX_USB_PHY_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qemu/bitops.h"
 #include "qom/object.h"
 

diff --git a/include/hw/usb/xlnx-usb-subsystem.h b/include/hw/usb/xlnx-usb-subsystem.h
index b22e5d065be7936d87551f12ccaae54c7f44ad0e..e78ca743d34b5d13b62cf860cec42e03f7d781e4 100644 (file)
--- a/include/hw/usb/xlnx-usb-subsystem.h
+++ b/include/hw/usb/xlnx-usb-subsystem.h
@@ -26,7 +26,7 @@
 #define XLNX_USB_SUBSYSTEM_H
 
 #include "hw/core/register.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/usb/xlnx-versal-usb2-ctrl-regs.h"
 #include "hw/usb/hcd-dwc3.h"
 

diff --git a/include/hw/usb/xlnx-versal-usb2-ctrl-regs.h b/include/hw/usb/xlnx-versal-usb2-ctrl-regs.h
index c1470da47585c2befb1785329f84f421d2c3e694..a8575ad66968a6cc96ee62784787f18ddaeed2e8 100644 (file)
--- a/include/hw/usb/xlnx-versal-usb2-ctrl-regs.h
+++ b/include/hw/usb/xlnx-versal-usb2-ctrl-regs.h
@@ -27,7 +27,7 @@
 #define XLNX_VERSAL_USB2_CTRL_REGS_H
 
 #include "hw/core/register.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 #define TYPE_XILINX_VERSAL_USB2_CTRL_REGS "xlnx.versal-usb2-ctrl-regs"
 

diff --git a/include/hw/virtio/virtio-mmio.h b/include/hw/virtio/virtio-mmio.h
index aa492620228d38ab0adbe90d00f2cb7b30e4de25..1eab3c0decef6c5e39480812a72722cbb20cae7a 100644 (file)
--- a/include/hw/virtio/virtio-mmio.h
+++ b/include/hw/virtio/virtio-mmio.h
@@ -22,7 +22,7 @@
 #ifndef HW_VIRTIO_MMIO_H
 #define HW_VIRTIO_MMIO_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/virtio/virtio-bus.h"
 
 /* QOM macros */

diff --git a/include/hw/watchdog/allwinner-wdt.h b/include/hw/watchdog/allwinner-wdt.h
index 6f84dbd1a7224cc5573f3909c994a471882f7851..e6da42a9f7814bab6723da48af0da9a4bc586e17 100644 (file)
--- a/include/hw/watchdog/allwinner-wdt.h
+++ b/include/hw/watchdog/allwinner-wdt.h
@@ -25,7 +25,7 @@
 
 #include "qom/object.h"
 #include "hw/core/ptimer.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 
 /*
  * This is a model of the Allwinner watchdog.

diff --git a/include/hw/watchdog/cmsdk-apb-watchdog.h b/include/hw/watchdog/cmsdk-apb-watchdog.h
index 9bf95ba06d5955aaad923e2357783c7843d54468..1c7de639993a60be2796548c3f0d74da7ac40578 100644 (file)
--- a/include/hw/watchdog/cmsdk-apb-watchdog.h
+++ b/include/hw/watchdog/cmsdk-apb-watchdog.h
@@ -31,7 +31,7 @@
 #ifndef CMSDK_APB_WATCHDOG_H
 #define CMSDK_APB_WATCHDOG_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/ptimer.h"
 #include "hw/core/clock.h"
 #include "qom/object.h"

diff --git a/include/hw/watchdog/sbsa_gwdt.h b/include/hw/watchdog/sbsa_gwdt.h
index ace8fe04c8731633a02206dc45e5e38330b992ac..307a4f291a3d78f52b6da176535cc675b5697e10 100644 (file)
--- a/include/hw/watchdog/sbsa_gwdt.h
+++ b/include/hw/watchdog/sbsa_gwdt.h
@@ -13,7 +13,7 @@
 #define WDT_SBSA_GWDT_H
 
 #include "qemu/bitops.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/irq.h"
 
 #define TYPE_WDT_SBSA "sbsa_gwdt"

diff --git a/include/hw/watchdog/wdt_aspeed.h b/include/hw/watchdog/wdt_aspeed.h
index 830b0a79368ac37bb8efb671257aacc48a2dd4df..ecf20fbb4eac63ecb0dda4acfdcc9e4d8cd02880 100644 (file)
--- a/include/hw/watchdog/wdt_aspeed.h
+++ b/include/hw/watchdog/wdt_aspeed.h
@@ -11,7 +11,7 @@
 #define WDT_ASPEED_H
 
 #include "hw/misc/aspeed_scu.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "qom/object.h"
 
 #define TYPE_ASPEED_WDT "aspeed.wdt"

diff --git a/include/hw/watchdog/wdt_imx2.h b/include/hw/watchdog/wdt_imx2.h
index 53a8360e90611a67eca291dc3b72f949843b7d49..ad36b8820d84b19e5ebcb3749c48436c88fe86e3 100644 (file)
--- a/include/hw/watchdog/wdt_imx2.h
+++ b/include/hw/watchdog/wdt_imx2.h
@@ -13,7 +13,7 @@
 #define WDT_IMX2_H
 
 #include "qemu/bitops.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/irq.h"
 #include "hw/core/ptimer.h"
 #include "qom/object.h"

diff --git a/include/hw/xen/xen_pvdev.h b/include/hw/xen/xen_pvdev.h
index 629bec90d09296d1018f71e7a77397f315b7d58e..232c496008c498ee25fc6f8d063c1be5106399c0 100644 (file)
--- a/include/hw/xen/xen_pvdev.h
+++ b/include/hw/xen/xen_pvdev.h
@@ -1,7 +1,7 @@
 #ifndef QEMU_HW_XEN_PVDEV_H
 #define QEMU_HW_XEN_PVDEV_H
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/xen/xen_backend_ops.h"
 
 /* ------------------------------------------------------------- */

diff --git a/rust/hw/core/wrapper.h b/rust/hw/core/wrapper.h
index f6b34161a680adde7b4cb66755b0d990864f4a1a..8278738f3d8b7789e7fc369040186b6203ee8732 100644 (file)
--- a/rust/hw/core/wrapper.h
+++ b/rust/hw/core/wrapper.h
@@ -24,7 +24,7 @@ typedef enum memory_order {
 
 #include "qemu/osdep.h"
 
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "hw/core/clock.h"
 #include "hw/core/qdev-clock.h"
 #include "hw/core/qdev-properties.h"

diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c
index 8e74e24c1909afecae475e6d31f5451a897d401c..0bf514cb096551b9f7548d9c613fef6d9c0d1cf5 100644 (file)
--- a/system/qdev-monitor.c
+++ b/system/qdev-monitor.c
@@ -18,7 +18,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/sysbus.h"
+#include "hw/core/sysbus.h"
 #include "monitor/hmp.h"
 #include "monitor/monitor.h"
 #include "monitor/qdev.h"