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

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

diff --git a/hw/acpi/utils.c b/hw/acpi/utils.c
index 0c486ea29fadb57af670a170cc168f17f1ba6572..b7cab6f5ca12c885708a0862a743446848117eb2 100644 (file)
--- a/hw/acpi/utils.c
+++ b/hw/acpi/utils.c
@@ -24,7 +24,7 @@
 #include "qemu/osdep.h"
 #include "hw/acpi/aml-build.h"
 #include "hw/acpi/utils.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 
 MemoryRegion *acpi_add_rom_blob(FWCfgCallback update, void *opaque,
                                 GArray *blob, const char *name)

diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c
index b6155646ef723cf3f39e5217f39d312f7906ce98..cddd94fec82db7b8d39c856e0c1cdcd4b1f7cd48 100644 (file)
--- a/hw/alpha/dp264.c
+++ b/hw/alpha/dp264.c
@@ -10,7 +10,7 @@
 #include "cpu.h"
 #include "exec/target_page.h"
 #include "elf.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "alpha_sys.h"
 #include "qemu/error-report.h"
 #include "hw/rtc/mc146818rtc.h"

diff --git a/hw/arm/allwinner-a10.c b/hw/arm/allwinner-a10.c
index 1886df03839a9d88259180750ba3e1c30595f742..d7508ee0ecd30aee32be66c51ec6611c7f885258 100644 (file)
--- a/hw/arm/allwinner-a10.c
+++ b/hw/arm/allwinner-a10.c
@@ -26,7 +26,7 @@
 #include "system/system.h"
 #include "hw/core/boards.h"
 #include "hw/usb/hcd-ohci.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "target/arm/cpu-qom.h"
 
 #define AW_A10_SRAM_A_BASE      0x00000000

diff --git a/hw/arm/allwinner-h3.c b/hw/arm/allwinner-h3.c
index edffc21dd88f1f3d13f7519eff4cb4f461c4d392..6c4c369e991af16a47c66bfe8ba0d0563d7e4b2a 100644 (file)
--- a/hw/arm/allwinner-h3.c
+++ b/hw/arm/allwinner-h3.c
@@ -27,7 +27,7 @@
 #include "hw/char/serial-mm.h"
 #include "hw/misc/unimp.h"
 #include "hw/usb/hcd-ehci.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "system/system.h"
 #include "hw/arm/allwinner-h3.h"
 #include "target/arm/cpu-qom.h"

diff --git a/hw/arm/allwinner-r40.c b/hw/arm/allwinner-r40.c
index 313bd21fad8dea338834c04a58749e0fd902612e..f6d4117a0685654419b641612a6f8aa5bbf04b36 100644 (file)
--- a/hw/arm/allwinner-r40.c
+++ b/hw/arm/allwinner-r40.c
@@ -28,7 +28,7 @@
 #include "hw/char/serial-mm.h"
 #include "hw/misc/unimp.h"
 #include "hw/usb/hcd-ehci.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "system/system.h"
 #include "hw/arm/allwinner-r40.h"
 #include "hw/misc/allwinner-r40-dramc.h"

diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
index 7fa1b37630e8d428da02bd6b647e44f00f79dc7d..8198a83d15c8d9f90969ab8df2549a25d4a755eb 100644 (file)
--- a/hw/arm/armv7m.c
+++ b/hw/arm/armv7m.c
@@ -12,7 +12,7 @@
 #include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "hw/arm/boot.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-clock.h"
 #include "elf.h"

diff --git a/hw/arm/aspeed_ast27x0-fc.c b/hw/arm/aspeed_ast27x0-fc.c
index a0cbe50d78d57195b229292cec11939b17a5d4da..1678cce416b647a44ab998cb002eaded8f4492d0 100644 (file)
--- a/hw/arm/aspeed_ast27x0-fc.c
+++ b/hw/arm/aspeed_ast27x0-fc.c
@@ -18,7 +18,7 @@
 #include "hw/core/boards.h"
 #include "hw/qdev-clock.h"
 #include "hw/arm/aspeed_soc.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/arm/boot.h"
 #include "hw/block/flash.h"
 #include "hw/arm/aspeed_coprocessor.h"

diff --git a/hw/arm/aspeed_soc_common.c b/hw/arm/aspeed_soc_common.c
index 78b6ae18f87ec43c97b6fe57fbf0a3472f40b030..84e6458e80a6193c3899034d3f3278edf362362e 100644 (file)
--- a/hw/arm/aspeed_soc_common.c
+++ b/hw/arm/aspeed_soc_common.c
@@ -18,7 +18,7 @@
 #include "hw/char/serial-mm.h"
 #include "system/blockdev.h"
 #include "system/block-backend.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "qemu/datadir.h"
 
 

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

diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c
index d986e8f7a24725009f4647b7ea184100d6cda801..ed12f54200100adcd9936fe2b6a44eb7867e1c1f 100644 (file)
--- a/hw/arm/digic_boards.c
+++ b/hw/arm/digic_boards.c
@@ -31,7 +31,7 @@
 #include "hw/arm/digic.h"
 #include "hw/arm/machines-qom.h"
 #include "hw/block/flash.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "system/qtest.h"
 #include "qemu/units.h"
 #include "qemu/cutils.h"

diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c
index 2d8e257ca2a45ff4eabaea22a8c16a1bb19a015c..992edd3ba89867a95afaec2beacae81f16e97e25 100644 (file)
--- a/hw/arm/exynos4210.c
+++ b/hw/arm/exynos4210.c
@@ -31,7 +31,7 @@
 #include "system/system.h"
 #include "hw/sysbus.h"
 #include "hw/arm/boot.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/qdev-properties.h"
 #include "hw/arm/exynos4210.h"
 #include "hw/sd/sdhci.h"

diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c
index 82fa964711933c9feec8246f50862ed507eca5a3..b8c1256328d9b78c452a407c2522ed2d01b5f8f6 100644 (file)
--- a/hw/arm/highbank.c
+++ b/hw/arm/highbank.c
@@ -24,7 +24,7 @@
 #include "migration/vmstate.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/machines-qom.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "net/net.h"
 #include "system/runstate.h"
 #include "system/system.h"

diff --git a/hw/arm/npcm7xx.c b/hw/arm/npcm7xx.c
index ecfae328a96a49c82beaa53a5d803469c8f02d91..6d6f67448690363ec6a723b94c1161e2def4a37f 100644 (file)
--- a/hw/arm/npcm7xx.c
+++ b/hw/arm/npcm7xx.c
@@ -19,7 +19,7 @@
 #include "hw/arm/boot.h"
 #include "hw/arm/npcm7xx.h"
 #include "hw/char/serial-mm.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/misc/unimp.h"
 #include "hw/qdev-clock.h"
 #include "hw/qdev-properties.h"

diff --git a/hw/arm/npcm7xx_boards.c b/hw/arm/npcm7xx_boards.c
index c1e100b1e48400df88d35f0898c5df13f0730810..fda375eb4c3451d47b5d83003a919bd81920c7b6 100644 (file)
--- a/hw/arm/npcm7xx_boards.c
+++ b/hw/arm/npcm7xx_boards.c
@@ -21,7 +21,7 @@
 #include "hw/core/cpu.h"
 #include "hw/i2c/i2c_mux_pca954x.h"
 #include "hw/i2c/smbus_eeprom.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/nvram/eeprom_at24c.h"
 #include "hw/qdev-core.h"
 #include "hw/qdev-properties.h"

diff --git a/hw/arm/npcm8xx.c b/hw/arm/npcm8xx.c
index 3ad7643b4bd851eb04c1a90c3a206f53156e0a35..2bf5e132bb5366d6651f91d9379987868a0f0e4f 100644 (file)
--- a/hw/arm/npcm8xx.c
+++ b/hw/arm/npcm8xx.c
@@ -22,7 +22,7 @@
 #include "hw/arm/npcm8xx.h"
 #include "hw/char/serial-mm.h"
 #include "hw/intc/arm_gic.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/misc/unimp.h"
 #include "hw/qdev-clock.h"
 #include "hw/qdev-properties.h"

diff --git a/hw/arm/npcm8xx_boards.c b/hw/arm/npcm8xx_boards.c
index f775b324027f1984c86b08b88859a53253f732ff..292f44d807c8b2b2aba0b2edfbed34c4077f0109 100644 (file)
--- a/hw/arm/npcm8xx_boards.c
+++ b/hw/arm/npcm8xx_boards.c
@@ -21,7 +21,7 @@
 #include "hw/arm/npcm8xx.h"
 #include "hw/arm/machines-qom.h"
 #include "hw/core/cpu.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/qdev-core.h"
 #include "hw/qdev-properties.h"
 #include "qapi/error.h"

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

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

diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c
index 32d4c52bf5024a96f11dfacabb771a545a342470..5f0fb16a54c97784c5953b4369a04a7163aad8e8 100644 (file)
--- a/hw/arm/sbsa-ref.c
+++ b/hw/arm/sbsa-ref.c
@@ -42,7 +42,7 @@
 #include "hw/ide/ahci-sysbus.h"
 #include "hw/intc/arm_gicv3_common.h"
 #include "hw/intc/arm_gicv3_its_common.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/pci-host/gpex.h"
 #include "hw/qdev-properties.h"
 #include "hw/usb/usb.h"

diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
index 2f61ad0dd62b0f3ba74b6b4b34c3464eca2176ab..75cb77da828b614ba5136f583fa63b0b0b161fdc 100644 (file)
--- a/hw/arm/vexpress.c
+++ b/hw/arm/vexpress.c
@@ -33,7 +33,7 @@
 #include "net/net.h"
 #include "system/system.h"
 #include "hw/core/boards.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/block/flash.h"
 #include "system/device_tree.h"
 #include "qemu/error-report.h"

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 6155db2b0935ec41265455d9854fe19807fd984f..c005eb914cb9e8b11af7214c3b61b02ae1950554 100644 (file)
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -51,7 +51,7 @@
 #include "system/hvf.h"
 #include "system/qtest.h"
 #include "system/system.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "qapi/error.h"
 #include "qemu/bitops.h"
 #include "qemu/cutils.h"

diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c
index a6dc644d0bdd9ebaa550d334ff243bb9c5a35009..e127b232d75cc09d562d2543e45c3f2e0449e79d 100644 (file)
--- a/hw/arm/xilinx_zynq.c
+++ b/hw/arm/xilinx_zynq.c
@@ -25,7 +25,7 @@
 #include "system/system.h"
 #include "hw/core/boards.h"
 #include "hw/block/flash.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/adc/zynq-xadc.h"
 #include "hw/ssi/ssi.h"
 #include "hw/usb/chipidea.h"

diff --git a/hw/avr/boot.c b/hw/avr/boot.c
index e5a29c7218e790eee1524f0110525354f6f605d0..838378fb2525fe4db83717718899fb81147696dd 100644 (file)
--- a/hw/avr/boot.c
+++ b/hw/avr/boot.c
@@ -10,7 +10,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/datadir.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "elf.h"
 #include "boot.h"
 #include "qemu/error-report.h"

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

diff --git a/hw/core/guest-loader.c b/hw/core/guest-loader.c
index 07c36464047108f32acfa793d5ac567d598ce982..e46897c4974c71dad49624145976b8cb27fad118 100644 (file)
--- a/hw/core/guest-loader.c
+++ b/hw/core/guest-loader.c
@@ -27,7 +27,7 @@
 #include "qemu/osdep.h"
 #include "hw/core/cpu.h"
 #include "system/dma.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/qdev-properties.h"
 #include "qapi/error.h"
 #include "qemu/module.h"

diff --git a/hw/core/loader-fit.c b/hw/core/loader-fit.c
index 59a625ea57dee025d2b28cf3d62f31fb3897e6d7..233a7f78c24827ffbb0081bfa81be3949eff5cb4 100644 (file)
--- a/hw/core/loader-fit.c
+++ b/hw/core/loader-fit.c
@@ -21,7 +21,7 @@
 #include "qapi/error.h"
 #include "qemu/units.h"
 #include "system/memory.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/core/loader-fit.h"
 #include "qemu/cutils.h"
 #include "qemu/error-report.h"

diff --git a/hw/core/loader.c b/hw/core/loader.c
index 385730e8ef5b2458bb9bd488b0cfc7864fc0b15e..40cb187a113e5d9fc8eeafb633b635650ebb0fab 100644 (file)
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -58,7 +58,7 @@
 #include "system/reset.h"
 #include "system/system.h"
 #include "uboot_image.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/nvram/fw_cfg.h"
 #include "system/memory.h"
 #include "hw/core/boards.h"

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

diff --git a/hw/display/artist.c b/hw/display/artist.c
index 3c884c92437c97c21446a3c4a3486b5006ab32a5..5efa9e45ffd0ae70da3e50a51d1ee434ecad1593 100644 (file)
--- a/hw/display/artist.c
+++ b/hw/display/artist.c
@@ -15,7 +15,7 @@
 #include "qemu/bswap.h"
 #include "qapi/error.h"
 #include "hw/sysbus.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/qdev-core.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"

diff --git a/hw/display/cg3.c b/hw/display/cg3.c
index 8191237124e94d0625c51389411d476358a25da8..5ec09b6324765982262e2e7a89257ba6ace44607 100644 (file)
--- a/hw/display/cg3.c
+++ b/hw/display/cg3.c
@@ -31,7 +31,7 @@
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/core/irq.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/qdev-properties.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/display/cirrus_vga_isa.c b/hw/display/cirrus_vga_isa.c
index 4b55c48eff85ce4c6ab88ed65c17524da9d20b5d..5cacf4fc12730b118d530068a07ec0a7ba20704c 100644 (file)
--- a/hw/display/cirrus_vga_isa.c
+++ b/hw/display/cirrus_vga_isa.c
@@ -26,7 +26,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/module.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/qdev-properties.h"
 #include "hw/isa/isa.h"
 #include "cirrus_vga_internal.h"

diff --git a/hw/display/next-fb.c b/hw/display/next-fb.c
index ec81b766a7e4870cb48035de35d653a6949cf8b5..3d97702fce52169cbf2a5aeac4b8562c341d96ba 100644 (file)
--- a/hw/display/next-fb.c
+++ b/hw/display/next-fb.c
@@ -24,7 +24,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "ui/console.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "framebuffer.h"
 #include "ui/pixel_ops.h"
 #include "hw/m68k/next-cube.h"

diff --git a/hw/display/ramfb-standalone.c b/hw/display/ramfb-standalone.c
index 72b2071aed01321f2157f2a70b185abee43a9d4e..130f4e01df07ecdd527679151fc8ab1ec912f49e 100644 (file)
--- a/hw/display/ramfb-standalone.c
+++ b/hw/display/ramfb-standalone.c
@@ -2,7 +2,7 @@
 #include "migration/vmstate.h"
 #include "qapi/error.h"
 #include "qemu/module.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/qdev-properties.h"
 #include "hw/display/ramfb.h"
 #include "ui/console.h"

diff --git a/hw/display/ramfb.c b/hw/display/ramfb.c
index 9a17d97d076fb5683b1aeb953b2c1f5ba92f89bd..ad12fb1782e37da96311c9a1f42ae74eabc1af98 100644 (file)
--- a/hw/display/ramfb.c
+++ b/hw/display/ramfb.c
@@ -13,7 +13,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/display/ramfb.h"
 #include "hw/display/bochs-vbe.h" /* for limits */
 #include "ui/console.h"

diff --git a/hw/display/tcx.c b/hw/display/tcx.c
index 4853c5e14244a8a6cd62435506192c08f4dbd673..dfe234e3354c611e9b541fd2cfc77248f9feab44 100644 (file)
--- a/hw/display/tcx.c
+++ b/hw/display/tcx.c
@@ -27,7 +27,7 @@
 #include "qapi/error.h"
 #include "ui/console.h"
 #include "ui/pixel_ops.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"

diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c
index 3618913b3b74dd9ec774b9c14f6638f9821eb828..d2213b0f3e61e5e1dd377c9b85e9264feab92089 100644 (file)
--- a/hw/display/vga-isa.c
+++ b/hw/display/vga-isa.c
@@ -30,7 +30,7 @@
 #include "ui/pixel_ops.h"
 #include "qemu/module.h"
 #include "qemu/timer.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/qdev-properties.h"
 #include "ui/console.h"
 #include "qom/object.h"

diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c
index b81f7fd2d0fd11913e6b132897028ca490e74b95..7a39bb9b213aa152a5b1d5fa015ee75538ab740b 100644 (file)
--- a/hw/display/vga-pci.c
+++ b/hw/display/vga-pci.c
@@ -33,7 +33,7 @@
 #include "ui/console.h"
 #include "qemu/module.h"
 #include "qemu/timer.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/display/edid.h"
 #include "qom/object.h"
 #include "hw/acpi/acpi_aml_interface.h"

diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c
index bc1a8ed4665aff984cbac80f145801db9c05683e..7ca5a55142621d05690b71d422b43727a4defa0a 100644 (file)
--- a/hw/display/vmware_vga.c
+++ b/hw/display/vmware_vga.c
@@ -27,7 +27,7 @@
 #include "qemu/units.h"
 #include "qapi/error.h"
 #include "qemu/log.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "trace.h"
 #include "hw/pci/pci_device.h"
 #include "hw/qdev-properties.h"

diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index acd1c3f005b578b5d3787c11c86f5cd9f40f60d8..e877e6c40185b3e3b6523364319da4e858cba12b 100644 (file)
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -9,7 +9,7 @@
 #include "qemu/datadir.h"
 #include "cpu.h"
 #include "elf.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "qemu/error-report.h"
 #include "exec/target_page.h"
 #include "system/reset.h"

diff --git a/hw/hyperv/syndbg.c b/hw/hyperv/syndbg.c
index bcdfdf6af75d3557a679205b839aab6ab2883247..29908e886b4a0a90f837413801a63ee5e25c1cfe 100644 (file)
--- a/hw/hyperv/syndbg.c
+++ b/hw/hyperv/syndbg.c
@@ -14,7 +14,7 @@
 #include "qapi/error.h"
 #include "migration/vmstate.h"
 #include "hw/qdev-properties.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "exec/target_page.h"
 #include "hw/hyperv/hyperv.h"
 #include "hw/hyperv/vmbus-bridge.h"

diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c
index e3bafb83af94e7f3cd19506129816e82d32159f1..8cf99ad662373cbb191939a78c765cc92dadbdd2 100644 (file)
--- a/hw/i386/microvm.c
+++ b/hw/i386/microvm.c
@@ -30,7 +30,7 @@
 #include "acpi-microvm.h"
 #include "microvm-dt.h"
 
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/core/irq.h"
 #include "hw/i386/kvm/clock.h"
 #include "hw/i386/microvm.h"

diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c
index 78690781b74cd494ddb337f5a108485062e4a1c6..8b6acfee9ba8f6d93f4ceb0e6463c43e3b61edfa 100644 (file)
--- a/hw/i386/multiboot.c
+++ b/hw/i386/multiboot.c
@@ -27,7 +27,7 @@
 #include "cpu.h"
 #include "hw/nvram/fw_cfg.h"
 #include "multiboot.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "elf.h"
 #include "exec/target_page.h"
 #include "system/system.h"

diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 0f2a5889022e880a2ec3ff63544d069868e7ab15..1478a26f11b7d3d7105b7eb98d248258f320068f 100644 (file)
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -34,7 +34,7 @@
 #include "system/cpus.h"
 #include "hw/ide/ide-bus.h"
 #include "hw/timer/hpet.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/rtc/mc146818rtc.h"
 #include "hw/intc/i8259.h"
 #include "hw/timer/i8254.h"

diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 02de7453baa0d0cbad003a2cc245e7c575dd146b..5fd2f9d1e0cdd4e5c381176161bcf3d6a6e2c4ac 100644 (file)
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -32,7 +32,7 @@
 #include "qemu/units.h"
 #include "hw/acpi/acpi.h"
 #include "hw/char/parallel-isa.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/i2c/smbus_eeprom.h"
 #include "hw/rtc/mc146818rtc.h"
 #include "system/tcg.h"

diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c
index 1a12b635ad98dd8a8b85711073fa4f9cd5328f27..4d64aa15550e895736009dddf8149444b555e95c 100644 (file)
--- a/hw/i386/pc_sysfw.c
+++ b/hw/i386/pc_sysfw.c
@@ -32,7 +32,7 @@
 #include "hw/sysbus.h"
 #include "hw/i386/x86.h"
 #include "hw/i386/pc.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/qdev-properties.h"
 #include "hw/block/flash.h"
 #include "system/kvm.h"

diff --git a/hw/i386/x86-common.c b/hw/i386/x86-common.c
index 397e856b37e3b109066ea2f71b63a7caa69f726e..c1c9224039244a9386d46d094f7e468c70e570e8 100644 (file)
--- a/hw/i386/x86-common.c
+++ b/hw/i386/x86-common.c
@@ -38,7 +38,7 @@
 
 #include "hw/acpi/cpu_hotplug.h"
 #include "hw/core/irq.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "multiboot.h"
 #include "elf.h"
 #include "standard-headers/asm-x86/bootparam.h"

diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c
index 4604d632b1e379a917636420c0b2b50deeb58a0f..9b3e3a4b7e741d76dd0e9fdfda3a74762f362c0b 100644 (file)
--- a/hw/ipmi/ipmi_bmc_sim.c
+++ b/hw/ipmi/ipmi_bmc_sim.c
@@ -28,7 +28,7 @@
 #include "hw/ipmi/ipmi.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "migration/vmstate.h"

diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
index 8857a0499803687924276dcca244e01061378cb7..711d5ffbbc04babe2e175e6467221430864c9bbb 100644 (file)
--- a/hw/loongarch/boot.c
+++ b/hw/loongarch/boot.c
@@ -9,7 +9,7 @@
 #include "qemu/units.h"
 #include "target/loongarch/cpu.h"
 #include "hw/loongarch/virt.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "elf.h"
 #include "qemu/error-report.h"
 #include "system/reset.h"

diff --git a/hw/loongarch/virt-fdt-build.c b/hw/loongarch/virt-fdt-build.c
index 1f0ba01f711e0a67b48835293eb2493be0913515..115080d80e2913edf96a76d8b2f589fba9f1e6d7 100644 (file)
--- a/hw/loongarch/virt-fdt-build.c
+++ b/hw/loongarch/virt-fdt-build.c
@@ -9,7 +9,7 @@
 #include "hw/acpi/generic_event_device.h"
 #include "hw/core/sysbus-fdt.h"
 #include "hw/intc/loongarch_extioi.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/loongarch/virt.h"
 #include "hw/pci-host/gpex.h"
 #include "system/device_tree.h"

diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index 0e11eb340f0ae3cffb7401cf71e52dddbfebe85f..ea53941aeb9d1b3a8b4bceabdb5a99899dc4295f 100644 (file)
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -22,7 +22,7 @@
 #include "system/address-spaces.h"
 #include "hw/core/irq.h"
 #include "net/net.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "elf.h"
 #include "hw/intc/loongarch_ipi.h"
 #include "hw/intc/loongarch_extioi.h"

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

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

diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c
index 1411436a463ddf59545feced0d961962cacbac81..e7217cbaeacbdb295587b2607073c983224fc3d2 100644 (file)
--- a/hw/m68k/next-cube.c
+++ b/hw/m68k/next-cube.c
@@ -18,7 +18,7 @@
 #include "hw/core/irq.h"
 #include "hw/m68k/next-cube.h"
 #include "hw/core/boards.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/scsi/esp.h"
 #include "hw/sysbus.h"
 #include "qom/object.h"

diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index 1aaaada34657b11ad6dba3037656e6ae5e9a324e..4c03455d6bd3d4073958267fbaefce39fd9e0a41 100644 (file)
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -30,7 +30,7 @@
 #include "hw/core/boards.h"
 #include "hw/or-irq.h"
 #include "elf.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "ui/console.h"
 #include "hw/char/escc.h"
 #include "hw/sysbus.h"

diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c
index 6f2b7bb5a081989a47832d4b23e9a46c02bccf5c..7007d4e4e9fe9b690fa16034c61220c1b1e2d1ed 100644 (file)
--- a/hw/m68k/virt.c
+++ b/hw/m68k/virt.c
@@ -16,7 +16,7 @@
 #include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "elf.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "ui/console.h"
 #include "hw/sysbus.h"
 #include "standard-headers/asm-m68k/bootinfo.h"

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

diff --git a/hw/mips/boston.c b/hw/mips/boston.c
index 633b2a90523969b1a0cf93d67e95d79eb7279bba..b4b4a86a5fa21e20c7633d0ccbccebb89dbfa579 100644 (file)
--- a/hw/mips/boston.c
+++ b/hw/mips/boston.c
@@ -25,7 +25,7 @@
 #include "hw/char/serial-mm.h"
 #include "hw/ide/pci.h"
 #include "hw/ide/ahci-pci.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/core/loader-fit.h"
 #include "hw/mips/bootloader.h"
 #include "hw/mips/cps.h"

diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c
index fa252c4b2850c0031e9652b45c672e313b9e132d..d4c100b69a02940a47891e0603af228f73ae9613 100644 (file)
--- a/hw/mips/fuloong2e.c
+++ b/hw/mips/fuloong2e.c
@@ -31,7 +31,7 @@
 #include "hw/mips/mips.h"
 #include "hw/mips/bootloader.h"
 #include "hw/pci/pci.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/ide/pci.h"
 #include "hw/qdev-properties.h"
 #include "elf.h"

diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c
index fdcae4ce90e790b89bdbc340eed8999c18f8d6d6..fb01af8ece32dd08df54e82e42ff5e36751e0866 100644 (file)
--- a/hw/mips/jazz.c
+++ b/hw/mips/jazz.c
@@ -36,7 +36,7 @@
 #include "hw/core/boards.h"
 #include "net/net.h"
 #include "hw/scsi/esp.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/rtc/mc146818rtc.h"
 #include "hw/timer/i8254.h"
 #include "hw/display/vga.h"

diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c
index 4df6cf13b36c6c48c733c3ce3b89b0790c48b5c1..fe51fb66f6f215fb765b1010edc480084da56cef 100644 (file)
--- a/hw/mips/loongson3_virt.c
+++ b/hw/mips/loongson3_virt.c
@@ -37,7 +37,7 @@
 #include "hw/misc/unimp.h"
 #include "hw/intc/i8259.h"
 #include "hw/intc/loongson_ipi.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/isa/superio.h"
 #include "hw/pci/msi.h"
 #include "hw/pci/pci.h"

diff --git a/hw/mips/malta.c b/hw/mips/malta.c
index c63d77d4cca2a09705fd485c88900c33857a4666..2b0eb8c478e9068d5369420f8ec1a14278732194 100644 (file)
--- a/hw/mips/malta.c
+++ b/hw/mips/malta.c
@@ -44,7 +44,7 @@
 #include "qemu/log.h"
 #include "hw/ide/pci.h"
 #include "hw/core/irq.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "elf.h"
 #include "qom/object.h"
 #include "hw/sysbus.h"             /* SysBusDevice */

diff --git a/hw/nubus/nubus-device.c b/hw/nubus/nubus-device.c
index 1abd948904492464f48b02afa4af9d752360ccbe..5c5894c9c5534e0eefb1364d00cefa296fa50637 100644 (file)
--- a/hw/nubus/nubus-device.c
+++ b/hw/nubus/nubus-device.c
@@ -12,7 +12,7 @@
 #include "qemu/datadir.h"
 #include "exec/target_page.h"
 #include "hw/core/irq.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/nubus/nubus.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"

diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index b696bf39e12d7d13700f907d9b185ad474611589..df07424e5537636413d91c7605fca009e08b393f 100644 (file)
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -41,7 +41,7 @@
 #include "qemu/cutils.h"
 #include "qapi/error.h"
 #include "hw/acpi/aml-build.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 
 #define FW_CFG_FILE_SLOTS_DFLT 0x20
 

diff --git a/hw/openrisc/boot.c b/hw/openrisc/boot.c
index db6fea071e817e390fd7185474aab96562639456..6256babc42acc20aef495da72123819901b05cc4 100644 (file)
--- a/hw/openrisc/boot.c
+++ b/hw/openrisc/boot.c
@@ -11,7 +11,7 @@
 #include "exec/cpu-defs.h"
 #include "exec/target_page.h"
 #include "elf.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/openrisc/boot.h"
 #include "system/device_tree.h"
 #include "system/qtest.h"

diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index ffeb3fbf7cf9beef41fa4c31028bf666c72bc1d7..a3118ac6d0d0501c45b76e48d4340cb037777673 100644 (file)
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -39,7 +39,7 @@
 #include "system/numa.h"
 #include "system/runstate.h"
 #include "system/system.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "qemu/error-report.h"
 #include "qemu/range.h"
 #include "trace.h"

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

diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index eeca31dabb917e6cbd866421296e3dc27d6957a0..769f18023d51d78507e11708e2578ad5d25a4a12 100644 (file)
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -39,7 +39,7 @@
 #include "hw/ppc/openpic_kvm.h"
 #include "hw/ppc/ppc.h"
 #include "hw/qdev-properties.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "elf.h"
 #include "hw/sysbus.h"
 #include "qemu/host-utils.h"

diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 3a6e47eb8b7f3e87ad32f99c4cc727388ab7f19d..909a4fe257dbb560039e8429b71daab6f464ce77 100644 (file)
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -65,7 +65,7 @@
 #include "hw/char/escc.h"
 #include "hw/misc/macio/macio.h"
 #include "hw/ppc/openpic.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/core/fw-path-provider.h"
 #include "elf.h"
 #include "qemu/error-report.h"

diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index 8f9ce68b8b0d7b366e441df97a79126b706ecbfd..8400db6c352e761d4855704ac7071352e4700b20 100644 (file)
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -42,7 +42,7 @@
 #include "hw/nvram/fw_cfg.h"
 #include "hw/char/escc.h"
 #include "hw/misc/macio/macio.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/core/fw-path-provider.h"
 #include "elf.h"
 #include "qemu/error-report.h"

diff --git a/hw/ppc/pegasos.c b/hw/ppc/pegasos.c
index 8b5958e7498cf0a7c2024ef2d63341858e8da231..11bf406ef772e7c8ad7ce287772572c65bb93f5d 100644 (file)
--- a/hw/ppc/pegasos.c
+++ b/hw/ppc/pegasos.c
@@ -25,7 +25,7 @@
 #include "system/runstate.h"
 #include "system/qtest.h"
 #include "hw/core/boards.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/core/fw-path-provider.h"
 #include "elf.h"
 #include "qemu/log.h"

diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index 895132da91bdf0e00bc4bef65b235d18c197223b..eb3197da9b1f8af31136246c000f03d988e1579b 100644 (file)
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -38,7 +38,7 @@
 #include "hw/ppc/ppc.h"
 #include "hw/ppc/pnv.h"
 #include "hw/ppc/pnv_core.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/nmi.h"
 #include "qapi/visitor.h"
 #include "hw/intc/intc.h"

diff --git a/hw/ppc/pnv_pnor.c b/hw/ppc/pnv_pnor.c
index af7cfd028ba8db41aa013c05005650e534f1c470..c7cbc525b336784cffc1a0940c3cd35ad25ad5ff 100644 (file)
--- a/hw/ppc/pnv_pnor.c
+++ b/hw/ppc/pnv_pnor.c
@@ -13,7 +13,7 @@
 #include "qemu/units.h"
 #include "system/block-backend.h"
 #include "system/blockdev.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/ppc/pnv_pnor.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"

diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
index 824dd91ed5e4126f2d8fd7b753ce591268009734..9e71037d84c27304c176893af4bce028b5142b70 100644 (file)
--- a/hw/ppc/ppc440_bamboo.c
+++ b/hw/ppc/ppc440_bamboo.c
@@ -21,7 +21,7 @@
 #include "hw/core/boards.h"
 #include "system/kvm.h"
 #include "system/device_tree.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "elf.h"
 #include "hw/char/serial-mm.h"
 #include "hw/ppc/ppc.h"

diff --git a/hw/ppc/ppc_booke.c b/hw/ppc/ppc_booke.c
index 13403a56b1a4805e8457ae67088a48963c607725..7c6e5df9fdeb989801b9a6ff0cda06f24d3c6216 100644 (file)
--- a/hw/ppc/ppc_booke.c
+++ b/hw/ppc/ppc_booke.c
@@ -29,7 +29,7 @@
 #include "qemu/timer.h"
 #include "system/reset.h"
 #include "system/runstate.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "kvm_ppc.h"
 
 void booke_set_tlb(ppcemb_tlb_t *tlb, target_ulong va, hwaddr pa,

diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index 0d5e1f604e6d79906cb35c4d7238a66c883f2ce9..90164face16b97f46f83e2a3809df1e7722b543b 100644 (file)
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -36,7 +36,7 @@
 #include "qemu/error-report.h"
 #include "qemu/log.h"
 #include "qemu/datadir.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/rtc/mc146818rtc.h"
 #include "hw/isa/pc87312.h"
 #include "hw/qdev-properties.h"

diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c
index 992bfe39a36bbb549bcbc4606a3cf8000ed92ee3..550aaa21fa246e1cf1784e36bca7f1efb318586d 100644 (file)
--- a/hw/ppc/sam460ex.c
+++ b/hw/ppc/sam460ex.c
@@ -22,7 +22,7 @@
 #include "system/device_tree.h"
 #include "system/block-backend.h"
 #include "exec/page-protection.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "elf.h"
 #include "system/memory.h"
 #include "ppc440.h"

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 7c695ac4ecc5b56052d0dee2626f455b1e1c0b87..bad6918e6eb846b7ee3e3381f278ded013beedac 100644 (file)
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -61,7 +61,7 @@
 #include "hw/core/cpu.h"
 
 #include "hw/ppc/ppc.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 
 #include "hw/ppc/fdt.h"
 #include "hw/ppc/spapr.h"

diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c
index c21a2a3274e1212e36f30f82320821b21e8cb553..875c17f478443345e3139d0ce4582aab4d07e5d8 100644 (file)
--- a/hw/ppc/spapr_vio.c
+++ b/hw/ppc/spapr_vio.c
@@ -24,7 +24,7 @@
 #include "qapi/error.h"
 #include "qapi/visitor.h"
 #include "qemu/log.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "elf.h"
 #include "hw/sysbus.h"
 #include "system/kvm.h"

diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
index 8221a01639df128d1727ef0abd8d6dbe20183201..8b5f4eb57a0c34a9a3e1305da14fdfa1380be689 100644 (file)
--- a/hw/ppc/virtex_ml507.c
+++ b/hw/ppc/virtex_ml507.c
@@ -34,7 +34,7 @@
 #include "system/reset.h"
 #include "hw/core/boards.h"
 #include "system/device_tree.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "elf.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"

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

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

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

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

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

diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
index 45a845318e79a5bb6bb96a24c0c34166844d7879..0505bffa44a276786fb60af8db0027e33548e2cb 100644 (file)
--- a/hw/riscv/virt.c
+++ b/hw/riscv/virt.c
@@ -24,7 +24,7 @@
 #include "qemu/guest-random.h"
 #include "qapi/error.h"
 #include "hw/core/boards.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/sysbus.h"
 #include "hw/qdev-properties.h"
 #include "hw/char/serial-mm.h"

diff --git a/hw/rx/rx-gdbsim.c b/hw/rx/rx-gdbsim.c
index 1a33082857c341bde92387ff0de906ec927f6732..0a0ad85a35a6dcc382bef2a6bf6ae2717ea3931b 100644 (file)
--- a/hw/rx/rx-gdbsim.c
+++ b/hw/rx/rx-gdbsim.c
@@ -22,7 +22,7 @@
 #include "qemu/guest-random.h"
 #include "qemu/units.h"
 #include "qapi/error.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/rx/rx62n.h"
 #include "system/qtest.h"
 #include "system/device_tree.h"

diff --git a/hw/rx/rx62n.c b/hw/rx/rx62n.c
index a2a243afa41f122204e255fbb9378849c4ee0087..3fe9a4a518c6ab40ebc8c2d22c243f8315fb93ab 100644 (file)
--- a/hw/rx/rx62n.c
+++ b/hw/rx/rx62n.c
@@ -25,7 +25,7 @@
 #include "qemu/error-report.h"
 #include "qemu/units.h"
 #include "hw/rx/rx62n.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/sysbus.h"
 #include "hw/qdev-properties.h"
 #include "system/system.h"

diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
index f1c2af15f755ded7bda7eaf14e1e81055e5c5110..e0a04ab1a22ab2c7146479c833c89e4cf512536f 100644 (file)
--- a/hw/s390x/ipl.c
+++ b/hw/s390x/ipl.c
@@ -19,7 +19,7 @@
 #include "system/runstate.h"
 #include "system/tcg.h"
 #include "elf.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/qdev-properties.h"
 #include "hw/core/boards.h"
 #include "hw/s390x/virtio-ccw.h"

diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index 5352f23ae82e647aa242da8be45387e71767bc27..9e8c2fa8d126f61046ac03dfee7b57a377d56e7e 100644 (file)
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -40,7 +40,7 @@
 #include "sh7750_regs.h"
 #include "hw/ide/mmio.h"
 #include "hw/core/irq.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/usb/usb.h"
 #include "hw/block/flash.h"
 #include "exec/tswap.h"

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

diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
index 500b63bc9b78e71ca5fd341ff969dca7b18b17a3..cd1a03a55846b32da578d7bf6f3db1f97350a0d3 100644 (file)
--- a/hw/sparc/leon3.c
+++ b/hw/sparc/leon3.c
@@ -38,7 +38,7 @@
 #include "system/qtest.h"
 #include "system/reset.h"
 #include "hw/core/boards.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "elf.h"
 #include "trace.h"
 

diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index fa5592f26cb3949bb29fe61b542f7ed3f1f48c3d..b62568645820e350065f28a8c7d132df4ff40d47 100644 (file)
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -51,7 +51,7 @@
 #include "hw/misc/unimp.h"
 #include "hw/core/irq.h"
 #include "hw/or-irq.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "elf.h"
 #include "trace.h"
 #include "qom/object.h"

diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c
index 334bec14ba3c82cfb692f8fa090a767a5327c3ec..209be38047370654eba44ce16f18aa9f1ac4f3fe 100644 (file)
--- a/hw/sparc64/niagara.c
+++ b/hw/sparc64/niagara.c
@@ -29,7 +29,7 @@
 #include "hw/core/boards.h"
 #include "hw/char/serial-mm.h"
 #include "hw/misc/unimp.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/sparc/sparc64.h"
 #include "hw/rtc/sun4v-rtc.h"
 #include "system/block-backend.h"

diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index 5b25ba81cc8100e49ce74d62fe11f9b6d2627fb5..c0fb421d2ba842edf23f33de2d7f2f45be9ac658 100644 (file)
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -53,7 +53,7 @@
 #include "hw/nvram/fw_cfg.h"
 #include "hw/sysbus.h"
 #include "hw/ide/pci.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/core/fw-path-provider.h"
 #include "elf.h"
 #include "trace.h"

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

diff --git a/hw/tricore/triboard.c b/hw/tricore/triboard.c
index cb45b01d2d21382fe3268032b262c266e06e8852..db6f2b765ac1147399543957498ff82db9e93217 100644 (file)
--- a/hw/tricore/triboard.c
+++ b/hw/tricore/triboard.c
@@ -23,7 +23,7 @@
 #include "qapi/error.h"
 #include "hw/qdev-properties.h"
 #include "net/net.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "elf.h"
 #include "hw/tricore/tricore.h"
 #include "qemu/error-report.h"

diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.c
index 21b119712c515cb2357395e8bf1d7026f23e012f..60772d4f1d75019b98e0fcd43679234fc307503c 100644 (file)
--- a/hw/tricore/tricore_testboard.c
+++ b/hw/tricore/tricore_testboard.c
@@ -24,7 +24,7 @@
 #include "cpu.h"
 #include "net/net.h"
 #include "hw/core/boards.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "elf.h"
 #include "hw/tricore/tricore.h"
 #include "hw/tricore/tricore_testdevice.h"

diff --git a/hw/virtio/vhost-user-scsi-pci.c b/hw/virtio/vhost-user-scsi-pci.c
index 994e51a37bbce82a0711a70249183700a136816b..367b8f27da5c6953205a7cc1e2fd00ba0a959afa 100644 (file)
--- a/hw/virtio/vhost-user-scsi-pci.c
+++ b/hw/virtio/vhost-user-scsi-pci.c
@@ -28,7 +28,7 @@
 #include "qemu/module.h"
 #include "hw/pci/msi.h"
 #include "hw/pci/msix.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "system/kvm.h"
 #include "hw/virtio/virtio-pci.h"
 #include "qom/object.h"

diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 263e112a5cbd371189d071f71919bcc38e7e325c..7382e7db6fa48d247b573ec50a750ed459592d3e 100644 (file)
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -33,7 +33,7 @@
 #include "qemu/bswap.h"
 #include "hw/pci/msi.h"
 #include "hw/pci/msix.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "system/accel-irq.h"
 #include "system/kvm.h"
 #include "hw/virtio/virtio-pci.h"

diff --git a/hw/vmapple/vmapple.c b/hw/vmapple/vmapple.c
index 9154a4c25761fa556d851242e160f27e3963d75f..ad513d4cbc13cc6a0b269dab5e2909a1900be6b9 100644 (file)
--- a/hw/vmapple/vmapple.c
+++ b/hw/vmapple/vmapple.c
@@ -27,7 +27,7 @@
 #include "monitor/qdev.h"
 #include "hw/core/boards.h"
 #include "hw/core/irq.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "hw/usb/usb.h"

diff --git a/hw/xen/xen_pt_load_rom.c b/hw/xen/xen_pt_load_rom.c
index 6bc64acd33523b7981e727d1b318fee26b3e930c..319efcad6ef3f67177bebb9d90bb708055cc0e37 100644 (file)
--- a/hw/xen/xen_pt_load_rom.c
+++ b/hw/xen/xen_pt_load_rom.c
@@ -4,7 +4,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/pci/pci.h"
 #include "xen_pt.h"
 

diff --git a/hw/xtensa/sim.c b/hw/xtensa/sim.c
index 37acc562d21a9d07896e57d651f96496dd62ebfe..994460d0414afae250fe71f620c297a50ea9ad6d 100644 (file)
--- a/hw/xtensa/sim.c
+++ b/hw/xtensa/sim.c
@@ -30,7 +30,7 @@
 #include "system/reset.h"
 #include "system/system.h"
 #include "hw/core/boards.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "elf.h"
 #include "system/memory.h"
 #include "qemu/error-report.h"

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

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

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

diff --git a/include/hw/riscv/boot.h b/include/hw/riscv/boot.h
index 51b0e13bd3ea11296319f26fb0ca95c55c64ff65..35964bf83183b1901f8ff751eab1391deb485b2f 100644 (file)
--- a/include/hw/riscv/boot.h
+++ b/include/hw/riscv/boot.h
@@ -21,7 +21,7 @@
 #define RISCV_BOOT_H
 
 #include "exec/cpu-defs.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/riscv/riscv_hart.h"
 
 #define RISCV32_BIOS_BIN    "opensbi-riscv32-generic-fw_dynamic.bin"

diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 2e9fa5842f620eef797dec276b8658b6ca9961e6..5e5f181b9087db9c42ddfccefe9ce186af949296 100644 (file)
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -47,7 +47,7 @@
 #define COMMON_SEMI_HEAP_SIZE (128 * 1024 * 1024)
 #else
 #include "qemu/cutils.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/core/boards.h"
 #endif
 

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

diff --git a/system/globals.c b/system/globals.c
index 98f9876d5d4fc2aceb7c7b8d99c71bcc3b515a72..c33f6ed390220dcffcb58af71c78f248495e8ea5 100644 (file)
--- a/system/globals.c
+++ b/system/globals.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "exec/cpu-common.h"
 #include "hw/display/vga.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "hw/xen/xen.h"
 #include "net/net.h"
 #include "system/cpus.h"

diff --git a/system/vl.c b/system/vl.c
index cdf32c119b2b0178f7f68c7eebeb9d22c5da9289..659c6506fc78b7434db13f8bfe21603b00bdb23f 100644 (file)
--- a/system/vl.c
+++ b/system/vl.c
@@ -62,7 +62,7 @@
 #include "hw/firmware/smbios.h"
 #include "hw/acpi/acpi.h"
 #include "hw/xen/xen.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "monitor/qdev.h"
 #include "net/net.h"
 #include "net/slirp.h"

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

diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c
index 8ed62acf84d78f946177d7086580e5a278d55f35..ef3359ced921c7c4b74b8afb1a94b09ac768baa9 100644 (file)
--- a/target/loongarch/kvm/kvm.c
+++ b/target/loongarch/kvm/kvm.c
@@ -23,7 +23,7 @@
 #include "hw/core/irq.h"
 #include "hw/loongarch/virt.h"
 #include "qemu/log.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "system/runstate.h"
 #include "cpu-csr.h"
 #include "kvm_loongarch.h"

diff --git a/target/openrisc/interrupt.c b/target/openrisc/interrupt.c
index d357aaa7da1c64fbb77d007a7e7927747a842f26..5528b80e7b8cec686e9fd1bd2464283a9efe3321 100644 (file)
--- a/target/openrisc/interrupt.c
+++ b/target/openrisc/interrupt.c
@@ -23,7 +23,7 @@
 #include "gdbstub/helpers.h"
 #include "qemu/host-utils.h"
 #ifndef CONFIG_USER_ONLY
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #endif
 #include "qemu/plugin.h"
 

diff --git a/target/openrisc/mmu.c b/target/openrisc/mmu.c
index ffb732e0d1f6d22f8995e725cf47528f323f1593..b2b2b3c4a983779197c3513da9da30a050927341 100644 (file)
--- a/target/openrisc/mmu.c
+++ b/target/openrisc/mmu.c
@@ -26,7 +26,7 @@
 #include "exec/target_page.h"
 #include "gdbstub/helpers.h"
 #include "qemu/host-utils.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 
 static void get_phys_nommu(hwaddr *phys_addr, int *prot, vaddr address)
 {

diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c
index 1d99e5f4908dee779b317fd59ef6dd75ae23f17d..5d792563b913bbf3a0bd4ee9ba5ec07f29c16d71 100644 (file)
--- a/target/riscv/kvm/kvm-cpu.c
+++ b/target/riscv/kvm/kvm-cpu.c
@@ -41,7 +41,7 @@
 #include "hw/core/irq.h"
 #include "hw/intc/riscv_imsic.h"
 #include "qemu/log.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "kvm_riscv.h"
 #include "sbi_ecall_interface.h"
 #include "chardev/char-fe.h"

diff --git a/target/rx/cpu.c b/target/rx/cpu.c
index da02ae7bf888cef3b816285c67b5d51df3867196..f5f4f3ba4abed77b67d576fe31cd2bb0d38acc51 100644 (file)
--- a/target/rx/cpu.c
+++ b/target/rx/cpu.c
@@ -25,7 +25,7 @@
 #include "exec/page-protection.h"
 #include "exec/translation-block.h"
 #include "exec/target_page.h"
-#include "hw/loader.h"
+#include "hw/core/loader.h"
 #include "fpu/softfloat.h"
 #include "tcg/debug-assert.h"
 #include "accel/tcg/cpu-ops.h"