include: move hw/qdev-properties.h to hw/core/

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

diff --git a/backends/spdm-socket.c b/backends/spdm-socket.c
index 6d8f02d3b9280fa639f7d461947e32cf3e01b06d..07aea375165793604d76bac02ad23bdca604d325 100644 (file)
--- a/backends/spdm-socket.c
+++ b/backends/spdm-socket.c
@@ -13,7 +13,7 @@
 #include "qemu/osdep.h"
 #include "system/spdm-socket.h"
 #include "qapi/error.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/core/qdev-prop-internal.h"
 

diff --git a/backends/tpm/tpm_util.c b/backends/tpm/tpm_util.c
index f2d1739e336892dacbd19b457d44bf251d208aae..a64e156f45f8b73e7814900131271ac1d851a18b 100644 (file)
--- a/backends/tpm/tpm_util.c
+++ b/backends/tpm/tpm_util.c
@@ -26,7 +26,7 @@
 #include "qapi/visitor.h"
 #include "tpm_int.h"
 #include "system/memory.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "system/tpm_backend.h"
 #include "system/tpm_util.h"
 #include "trace.h"

diff --git a/docs/devel/migration/compatibility.rst b/docs/devel/migration/compatibility.rst
index ecb887e3184a919c3fb6748c6a6b0962f32d07db..ce3a1100deb116e981faf491a5856609dce99511 100644 (file)
--- a/docs/devel/migration/compatibility.rst
+++ b/docs/devel/migration/compatibility.rst
@@ -111,7 +111,7 @@ that array to see what value it needs to get for that feature.  And
 what are we going to put in that array, the value of a property.
 
 To create a property for a device, we need to use one of the
-DEFINE_PROP_*() macros. See include/hw/qdev-properties.h to find the
+DEFINE_PROP_*() macros. See include/hw/core/qdev-properties.h to find the
 macros that exist.  With it, we set the default value for that
 property, and that is what it is going to get in the latest released
 version.  But if we want a different value for a previous version, we

diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c
index 81b91e47c634d518f479196fdef989acd9ae1dd7..9f70e2338cd226021504e1f3ea917393a2ea51da 100644 (file)
--- a/hw/9pfs/virtio-9p-device.c
+++ b/hw/9pfs/virtio-9p-device.c
@@ -22,7 +22,7 @@
 #include "virtio-9p.h"
 #include "fsdev/qemu-fsdev.h"
 #include "coth.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio-access.h"
 #include "qemu/iov.h"
 #include "qemu/module.h"

diff --git a/hw/acpi/erst.c b/hw/acpi/erst.c
index 10bbe37c170f333ccb21b84d6c963bfbef0e7fcd..b6c1942e30893bd23250f41656f1bb5213169afe 100644 (file)
--- a/hw/acpi/erst.c
+++ b/hw/acpi/erst.c
@@ -18,7 +18,7 @@
 #include "qom/object_interfaces.h"
 #include "qemu/error-report.h"
 #include "migration/vmstate.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/acpi/acpi.h"
 #include "hw/acpi/acpi-defs.h"
 #include "hw/acpi/aml-build.h"

diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c
index 675ec43d094bc0adc07f4f4374b511f220acb80e..6741f46723cbe4b66c928a572bd7f4295ee52bde 100644 (file)
--- a/hw/acpi/generic_event_device.c
+++ b/hw/acpi/generic_event_device.c
@@ -19,7 +19,7 @@
 #include "hw/mem/pc-dimm.h"
 #include "hw/mem/nvdimm.h"
 #include "hw/pci/pci_device.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qemu/error-report.h"
 #include "system/runstate.h"

diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index 1e3c63454110ba89cd5c62af6a0530a07177416b..19d4d4be932956ac6b61227b1d2d66d3826a073c 100644 (file)
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -24,7 +24,7 @@
 #include "hw/isa/apm.h"
 #include "hw/i2c/pm_smbus.h"
 #include "hw/pci/pci.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/acpi/acpi.h"
 #include "hw/acpi/pcihp.h"
 #include "hw/acpi/piix4.h"

diff --git a/hw/acpi/vmclock.c b/hw/acpi/vmclock.c
index c582c0c1f83900b812687ce95525639724fab33e..55c9f95066224cab85b289398e2d172776931a6e 100644 (file)
--- a/hw/acpi/vmclock.c
+++ b/hw/acpi/vmclock.c
@@ -17,7 +17,7 @@
 #include "hw/acpi/aml-build.h"
 #include "hw/acpi/vmclock.h"
 #include "hw/nvram/fw_cfg.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "migration/vmstate.h"
 #include "system/reset.h"

diff --git a/hw/acpi/vmgenid.c b/hw/acpi/vmgenid.c
index 33c35c85dd4b5e120e7a787fbf982e979eabd3d3..fcf9a94daf1a28f75eb619cb43e7edcb09e08b02 100644 (file)
--- a/hw/acpi/vmgenid.c
+++ b/hw/acpi/vmgenid.c
@@ -17,7 +17,7 @@
 #include "hw/acpi/aml-build.h"
 #include "hw/acpi/vmgenid.h"
 #include "hw/nvram/fw_cfg.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "migration/vmstate.h"
 #include "system/reset.h"

diff --git a/hw/adc/aspeed_adc.c b/hw/adc/aspeed_adc.c
index 564979f24ddae5199a3664d460b3b964aab2d2bb..fd3af308296ee3ae7fb7af92997b9218b2d08dbc 100644 (file)
--- a/hw/adc/aspeed_adc.c
+++ b/hw/adc/aspeed_adc.c
@@ -12,7 +12,7 @@
 #include "qapi/error.h"
 #include "qemu/log.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/adc/aspeed_adc.h"
 #include "trace.h"

diff --git a/hw/adc/npcm7xx_adc.c b/hw/adc/npcm7xx_adc.c
index 4494d5558f09df3b7189962a74b7ddc611b096f1..44079791cbd2326bed0da833b8e6cfaee1c586e8 100644 (file)
--- a/hw/adc/npcm7xx_adc.c
+++ b/hw/adc/npcm7xx_adc.c
@@ -17,7 +17,7 @@
 #include "qemu/osdep.h"
 #include "hw/adc/npcm7xx_adc.h"
 #include "hw/core/qdev-clock.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/registerfields.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"

diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
index d9c7bcbcd71d272ecd2fd7d56ed2a3330027e378..844d620286c424a4b9ef8f39da861da32ee0753a 100644 (file)
--- a/hw/arm/armv7m.c
+++ b/hw/arm/armv7m.c
@@ -13,7 +13,7 @@
 #include "hw/sysbus.h"
 #include "hw/arm/boot.h"
 #include "hw/core/loader.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/core/qdev-clock.h"
 #include "elf.h"
 #include "system/reset.h"

diff --git a/hw/arm/aspeed_coprocessor_common.c b/hw/arm/aspeed_coprocessor_common.c
index f037d5b573fd419c1ce33320cc8bdb3b416d0acf..a0a4c73d08d319f5cdb4117be4b996f322ef1821 100644 (file)
--- a/hw/arm/aspeed_coprocessor_common.c
+++ b/hw/arm/aspeed_coprocessor_common.c
@@ -9,7 +9,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "system/memory.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/arm/aspeed_coprocessor.h"
 
 static void aspeed_coprocessor_realize(DeviceState *dev, Error **errp)

diff --git a/hw/arm/aspeed_soc_common.c b/hw/arm/aspeed_soc_common.c
index 84e6458e80a6193c3899034d3f3278edf362362e..fd08793575abb1bb74b07a3a3b763739158dfaba 100644 (file)
--- a/hw/arm/aspeed_soc_common.c
+++ b/hw/arm/aspeed_soc_common.c
@@ -12,7 +12,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/misc/unimp.h"
 #include "hw/arm/aspeed_soc.h"
 #include "hw/char/serial-mm.h"

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

diff --git a/hw/arm/bananapi_m2u.c b/hw/arm/bananapi_m2u.c
index fd347e18d269478d61f6c8881ffdb6b036dffcc1..9b468cd8ac8c8a0bd8eb6d834398c947b578992d 100644 (file)
--- a/hw/arm/bananapi_m2u.c
+++ b/hw/arm/bananapi_m2u.c
@@ -24,7 +24,7 @@
 #include "qemu/error-report.h"
 #include "hw/core/boards.h"
 #include "hw/i2c/i2c.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/arm/allwinner-r40.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/machines-qom.h"

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

diff --git a/hw/arm/digic.c b/hw/arm/digic.c
index d831bc974d2531dea6a8e10d82c111b8b55f47e8..5dfa5839a615e4045801731b985be77eae5dc75e 100644 (file)
--- a/hw/arm/digic.c
+++ b/hw/arm/digic.c
@@ -24,7 +24,7 @@
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "hw/arm/digic.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "system/system.h"
 
 #define DIGIC4_TIMER_BASE(n)    (0xc0210000 + (n) * 0x100)

diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c
index 992edd3ba89867a95afaec2beacae81f16e97e25..5d68579cd6bd9ad5fb97a460caa6c2577b9dc3cb 100644 (file)
--- a/hw/arm/exynos4210.c
+++ b/hw/arm/exynos4210.c
@@ -32,7 +32,7 @@
 #include "hw/sysbus.h"
 #include "hw/arm/boot.h"
 #include "hw/core/loader.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/arm/exynos4210.h"
 #include "hw/sd/sdhci.h"
 #include "hw/usb/hcd-ehci.h"

diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c
index f07dd452fcbdce01865d8ddefde0bd301ae9e884..e8c171f40a804751a7166005d000d4d6c15604aa 100644 (file)
--- a/hw/arm/exynos4_boards.c
+++ b/hw/arm/exynos4_boards.c
@@ -32,7 +32,7 @@
 #include "system/address-spaces.h"
 #include "hw/arm/exynos4210.h"
 #include "hw/net/lan9118.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/core/boards.h"
 #include "hw/core/irq.h"
 #include "target/arm/cpu-qom.h"

diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c
index 7aad6359ea8f19cf01be5993e1be25af4a372cb6..dd670827ff7ad0efa91f1dab44bc22981dac2893 100644 (file)
--- a/hw/arm/fsl-imx25.c
+++ b/hw/arm/fsl-imx25.c
@@ -26,7 +26,7 @@
 #include "qapi/error.h"
 #include "hw/arm/fsl-imx25.h"
 #include "system/system.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "chardev/char.h"
 #include "target/arm/cpu-qom.h"
 

diff --git a/hw/arm/fsl-imx31.c b/hw/arm/fsl-imx31.c
index e9f70ad94b8fd1cc28438db30e1054ab729bbf9e..190f863355d4d8055f84f90b6d9366582f866806 100644 (file)
--- a/hw/arm/fsl-imx31.c
+++ b/hw/arm/fsl-imx31.c
@@ -24,7 +24,7 @@
 #include "hw/arm/fsl-imx31.h"
 #include "system/system.h"
 #include "system/address-spaces.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "chardev/char.h"
 #include "target/arm/cpu-qom.h"
 

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

diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c
index 21860ed14d371a87e2d7a3c80e92b745d48803ea..7ebd6c8eb9c516e66dfac6133aab843ada930295 100644 (file)
--- a/hw/arm/imx25_pdk.c
+++ b/hw/arm/imx25_pdk.c
@@ -25,7 +25,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/arm/fsl-imx25.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/machines-qom.h"

diff --git a/hw/arm/imx8mp-evk.c b/hw/arm/imx8mp-evk.c
index ed8c52e1bd218b7a541d9d7b0f75e88621f799e2..0af5aad583598ed17f026b2bc16da8c00b9c8b7b 100644 (file)
--- a/hw/arm/imx8mp-evk.c
+++ b/hw/arm/imx8mp-evk.c
@@ -12,7 +12,7 @@
 #include "hw/arm/fsl-imx8mp.h"
 #include "hw/arm/machines-qom.h"
 #include "hw/core/boards.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "system/kvm.h"
 #include "system/qtest.h"
 #include "qemu/error-report.h"

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

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

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

diff --git a/hw/arm/microbit.c b/hw/arm/microbit.c
index cd035fffc765adbee56d8161218d310cb213bffc..9d5c48984691f7cc0e50d0f7f219f8244e87d50c 100644 (file)
--- a/hw/arm/microbit.c
+++ b/hw/arm/microbit.c
@@ -18,7 +18,7 @@
 
 #include "hw/arm/nrf51_soc.h"
 #include "hw/i2c/microbit_i2c.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qom/object.h"
 
 struct MicrobitMachineState {

diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c
index 7d2efc703bd764f44db3257160b3b8841efe32b1..ac9366d84473cf6e3d36821c676fdcee0a606381 100644 (file)
--- a/hw/arm/mps2.c
+++ b/hw/arm/mps2.c
@@ -36,7 +36,7 @@
 #include "hw/core/boards.h"
 #include "system/address-spaces.h"
 #include "system/system.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/misc/unimp.h"
 #include "hw/char/cmsdk-apb-uart.h"
 #include "hw/timer/cmsdk-apb-timer.h"

diff --git a/hw/arm/mps3r.c b/hw/arm/mps3r.c
index 77a0c0b7aff5ac373f505d4d958e846d8d3f854d..2d64a198c4226d27cc89ab9dfbabd236417d7a94 100644 (file)
--- a/hw/arm/mps3r.c
+++ b/hw/arm/mps3r.c
@@ -34,7 +34,7 @@
 #include "hw/core/boards.h"
 #include "hw/core/or-irq.h"
 #include "hw/core/qdev-clock.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/bsa.h"
 #include "hw/arm/machines-qom.h"

diff --git a/hw/arm/msf2-som.c b/hw/arm/msf2-som.c
index 10382f0d3b2eb3db3fb52e844b319ab400d396c8..caf6e7e1ad7d37f77963420592286b9ba785d3f1 100644 (file)
--- a/hw/arm/msf2-som.c
+++ b/hw/arm/msf2-som.c
@@ -30,7 +30,7 @@
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "hw/core/boards.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/machines-qom.h"
 #include "hw/core/qdev-clock.h"

diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
index a4ddc0d08f95abc0f7237fe9844d3a04dbcdea83..39e8f69cae0b5380f5d4ee896f079884bf646b1d 100644 (file)
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@@ -22,7 +22,7 @@
 #include "hw/char/serial-mm.h"
 #include "qemu/timer.h"
 #include "hw/core/ptimer.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/block/flash.h"
 #include "ui/console.h"
 #include "hw/i2c/i2c.h"

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

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

diff --git a/hw/arm/npcm7xx.c b/hw/arm/npcm7xx.c
index 6905e1d8a7dacb0a68e3262b632a815658c963f6..c2bbcd89dbc69b25ceb4333c126a0df059ac0394 100644 (file)
--- a/hw/arm/npcm7xx.c
+++ b/hw/arm/npcm7xx.c
@@ -22,7 +22,7 @@
 #include "hw/core/loader.h"
 #include "hw/misc/unimp.h"
 #include "hw/core/qdev-clock.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
 #include "exec/tswap.h"
 #include "qemu/units.h"

diff --git a/hw/arm/npcm7xx_boards.c b/hw/arm/npcm7xx_boards.c
index 729306b33c54972e8bb33851d4600eba18d1d726..57a8d3186e6bcf410e7a9e2dbf71f0fe9f3262b8 100644 (file)
--- a/hw/arm/npcm7xx_boards.c
+++ b/hw/arm/npcm7xx_boards.c
@@ -24,7 +24,7 @@
 #include "hw/core/loader.h"
 #include "hw/nvram/eeprom_at24c.h"
 #include "hw/core/qdev.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
 #include "qemu/datadir.h"
 #include "qemu/units.h"

diff --git a/hw/arm/npcm8xx.c b/hw/arm/npcm8xx.c
index 71e47dac2e1c933d50af14e3f411382c136faf0c..9ce6ea52d973693c3e07e97e3fdfb7b3854644ee 100644 (file)
--- a/hw/arm/npcm8xx.c
+++ b/hw/arm/npcm8xx.c
@@ -25,7 +25,7 @@
 #include "hw/core/loader.h"
 #include "hw/misc/unimp.h"
 #include "hw/core/qdev-clock.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
 #include "qemu/units.h"
 #include "system/system.h"

diff --git a/hw/arm/npcm8xx_boards.c b/hw/arm/npcm8xx_boards.c
index 7252edf3dcb185a19cbcd0b68cf3710f9bedcad0..042a928857c72bf0d177808010530df1545c1bc0 100644 (file)
--- a/hw/arm/npcm8xx_boards.c
+++ b/hw/arm/npcm8xx_boards.c
@@ -23,7 +23,7 @@
 #include "hw/core/cpu.h"
 #include "hw/core/loader.h"
 #include "hw/core/qdev.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qemu/datadir.h"

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

diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c
index 994e5a919e1eabc69ee3b1b4ec04403b6537ae71..fcba6eb52d5d9d885d9a03ff08be3590aca22902 100644 (file)
--- a/hw/arm/omap1.c
+++ b/hw/arm/omap1.c
@@ -26,7 +26,7 @@
 #include "system/address-spaces.h"
 #include "hw/hw.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/omap.h"
 #include "hw/sd/sd.h"

diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c
index c0dd32f13cef4d09c3ea551381879d18226fa555..d84443bb7b395a1ce96619e654ceb026c72febae 100644 (file)
--- a/hw/arm/orangepi.c
+++ b/hw/arm/orangepi.c
@@ -23,7 +23,7 @@
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "hw/core/boards.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/arm/allwinner-h3.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/machines-qom.h"

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

diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c
index 5f0fb16a54c97784c5953b4369a04a7163aad8e8..d86b4706869b6a3d11e3b6d314c5829f8545215b 100644 (file)
--- a/hw/arm/sbsa-ref.c
+++ b/hw/arm/sbsa-ref.c
@@ -44,7 +44,7 @@
 #include "hw/intc/arm_gicv3_its_common.h"
 #include "hw/core/loader.h"
 #include "hw/pci-host/gpex.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/usb/usb.h"
 #include "hw/usb/xhci.h"
 #include "hw/char/pl011.h"

diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c
index 62a76121841988ca4cfdd8505040a694c5d77cca..e1b77cc55fcf72db4c43dd4d4928651dee8973e0 100644 (file)
--- a/hw/arm/smmu-common.c
+++ b/hw/arm/smmu-common.c
@@ -21,7 +21,7 @@
 #include "exec/target_page.h"
 #include "hw/core/cpu.h"
 #include "hw/pci/pci_bridge.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
 #include "qemu/jhash.h"
 #include "qemu/module.h"

diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c
index e391842dc336031f64c521404f4ec2fff9f153da..e12a64a20fbbf8269a166d334d76223ee9f35955 100644 (file)
--- a/hw/arm/smmuv3.c
+++ b/hw/arm/smmuv3.c
@@ -21,7 +21,7 @@
 #include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/core/qdev.h"
 #include "hw/pci/pci.h"
 #include "cpu.h"

diff --git a/hw/arm/stm32f100_soc.c b/hw/arm/stm32f100_soc.c
index 8d61be72c487037f9550351a367ab6fd608097a1..2358368dbab82621901871dc231ab1a0d8b063fb 100644 (file)
--- a/hw/arm/stm32f100_soc.c
+++ b/hw/arm/stm32f100_soc.c
@@ -29,7 +29,7 @@
 #include "hw/arm/boot.h"
 #include "system/address-spaces.h"
 #include "hw/arm/stm32f100_soc.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/core/qdev-clock.h"
 #include "hw/misc/unimp.h"
 #include "system/system.h"

diff --git a/hw/arm/stm32f205_soc.c b/hw/arm/stm32f205_soc.c
index 406f614f1d5e5022e2f91ba9774c81433e487e1a..a03c6b400259ab3297009ef8c8999f3d54523b28 100644 (file)
--- a/hw/arm/stm32f205_soc.c
+++ b/hw/arm/stm32f205_soc.c
@@ -28,7 +28,7 @@
 #include "hw/arm/boot.h"
 #include "system/address-spaces.h"
 #include "hw/arm/stm32f205_soc.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/core/qdev-clock.h"
 #include "system/system.h"
 

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

diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c
index 95dda0785229ee405d50dbde486fd2578be4bbbe..3ee73ee45947e5ee94fbfe1501a78b9ba85786fd 100644 (file)
--- a/hw/arm/strongarm.c
+++ b/hw/arm/strongarm.c
@@ -29,7 +29,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 0d2652e6dbc8a8d7a14e92e5b37fc3ad55fae0ab..d8773cb541ff8eb2e447bf1d1c56a8b5f288fbad 100644 (file)
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -63,7 +63,7 @@
 #include "hw/virtio/virtio-pci.h"
 #include "hw/core/sysbus-fdt.h"
 #include "hw/core/platform-bus.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/arm/fdt.h"
 #include "hw/intc/arm_gic.h"
 #include "hw/intc/arm_gicv3_common.h"

diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c
index 60daa62ea33cbc99d62f61ac4741fbe86894fc45..0694f0adf9c2f6c4ff606b8bc35ac3f6e591a158 100644 (file)
--- a/hw/audio/ac97.c
+++ b/hw/audio/ac97.c
@@ -21,7 +21,7 @@
 #include "hw/audio/model.h"
 #include "qemu/audio.h"
 #include "hw/pci/pci_device.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"
 #include "system/dma.h"

diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c
index 19d3a5f12805ce2ddbd0c19e2aa4e06c93f69fdc..8b9fe53e17b23804f15364e1f4f7381e892c884e 100644 (file)
--- a/hw/audio/adlib.c
+++ b/hw/audio/adlib.c
@@ -28,7 +28,7 @@
 #include "hw/audio/model.h"
 #include "qemu/audio.h"
 #include "hw/isa/isa.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qemu/error-report.h"
 #include "qom/object.h"
 

diff --git a/hw/audio/asc.c b/hw/audio/asc.c
index b6f420450030d1249588655b620bb61cc5374b12..77a5cc1092db1bfc4da89a56b36480604cd48bb1 100644 (file)
--- a/hw/audio/asc.c
+++ b/hw/audio/asc.c
@@ -17,7 +17,7 @@
 #include "hw/core/irq.h"
 #include "qemu/audio.h"
 #include "hw/audio/asc.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "trace.h"
 

diff --git a/hw/audio/cs4231a.c b/hw/audio/cs4231a.c
index 8368172f401c252db2f4da1ea1fe5b69ddc44009..7489cf42b7d176c8f9dc59bcf72a7d74f06f100c 100644 (file)
--- a/hw/audio/cs4231a.c
+++ b/hw/audio/cs4231a.c
@@ -27,7 +27,7 @@
 #include "qemu/audio.h"
 #include "hw/core/irq.h"
 #include "hw/isa/isa.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"
 #include "qemu/error-report.h"

diff --git a/hw/audio/gus.c b/hw/audio/gus.c
index 6c41b25486e6cc1a16669cd2b0b8b82b99b1278a..69ddc4191916756dc5fd396fc7f7b6cafee03328 100644 (file)
--- a/hw/audio/gus.c
+++ b/hw/audio/gus.c
@@ -29,7 +29,7 @@
 #include "qemu/audio.h"
 #include "hw/core/irq.h"
 #include "hw/isa/isa.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "gusemu.h"
 #include "qemu/error-report.h"

diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c
index e90c9de046e90be753421bf19e78df6e4a13ffd0..6445d227594b92996db3b938d3d7a5af519357b1 100644 (file)
--- a/hw/audio/hda-codec.c
+++ b/hw/audio/hda-codec.c
@@ -19,7 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/pci/pci.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "intel-hda.h"
 #include "migration/vmstate.h"
 #include "qemu/host-utils.h"

diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c
index 758e130c938ff18e69720bf8c36e14dba9f1cf80..d7c2c3c2fd44130c8057ab54c02c73d2c74c4de4 100644 (file)
--- a/hw/audio/intel-hda.c
+++ b/hw/audio/intel-hda.c
@@ -19,7 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/pci/pci.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/pci/msi.h"
 #include "monitor/qdev.h"
 #include "qemu/timer.h"

diff --git a/hw/audio/marvell_88w8618.c b/hw/audio/marvell_88w8618.c
index ba9bd6befd723fd7be8001c1d6fa5cb8ff037fca..39f4b4514dcbf09af723e6c3cf461f6e26882938 100644 (file)
--- a/hw/audio/marvell_88w8618.c
+++ b/hw/audio/marvell_88w8618.c
@@ -14,7 +14,7 @@
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/audio/wm8750.h"
 #include "qemu/audio.h"
 #include "qapi/error.h"

diff --git a/hw/audio/model.c b/hw/audio/model.c
index ff4e4b24528305ec403af60759790139ac4da364..86a5419b09e894ae212e5931b346e348324b8fb3 100644 (file)
--- a/hw/audio/model.c
+++ b/hw/audio/model.c
@@ -26,7 +26,7 @@
 #include "monitor/qdev.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/audio/model.h"
 
 struct audio_model {

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

diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c
index 6ca31a0e64939975eaff084185607224cefdb6a3..3c5beb9dfa3ccaaeab66956c14e14c82d2d93dba 100644 (file)
--- a/hw/audio/sb16.c
+++ b/hw/audio/sb16.c
@@ -27,7 +27,7 @@
 #include "qemu/audio.h"
 #include "hw/core/irq.h"
 #include "hw/isa/isa.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qemu/timer.h"
 #include "qemu/error-report.h"

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

diff --git a/hw/block/fdc-isa.c b/hw/block/fdc-isa.c
index 0034c3594aeb22517aec95a0c3ffd76cf556cdcc..ebb3d2f7cd8fce83a80e8a913990901ab3eb0e21 100644 (file)
--- a/hw/block/fdc-isa.c
+++ b/hw/block/fdc-isa.c
@@ -35,7 +35,7 @@
 #include "hw/acpi/acpi_aml_interface.h"
 #include "hw/core/irq.h"
 #include "hw/isa/isa.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "migration/vmstate.h"
 #include "hw/block/block.h"

diff --git a/hw/block/fdc.c b/hw/block/fdc.c
index e0e53ba0382151408a53de0d4e3f2b18aa08bc95..1747f6506fde11790041afd310a316ae6fa1ca7c 100644 (file)
--- a/hw/block/fdc.c
+++ b/hw/block/fdc.c
@@ -35,7 +35,7 @@
 #include "qemu/memalign.h"
 #include "hw/core/irq.h"
 #include "hw/isa/isa.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "migration/vmstate.h"
 #include "hw/block/block.h"

diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c
index a5336d92ff9fcaf0f18096681524545d1bf9ea30..648e6bdc00816942a0292bd479c6897e9494f596 100644 (file)
--- a/hw/block/m25p80.c
+++ b/hw/block/m25p80.c
@@ -26,7 +26,7 @@
 #include "system/block-backend.h"
 #include "hw/block/block.h"
 #include "hw/block/flash.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/ssi/ssi.h"
 #include "migration/vmstate.h"

diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c
index 168101d8dfe610b84752cf6b1b97bde8a4291129..f93b812c024f28f087cbbc59e7e128ee153c4ad1 100644 (file)
--- a/hw/block/pflash_cfi01.c
+++ b/hw/block/pflash_cfi01.c
@@ -39,7 +39,7 @@
 #include "qemu/osdep.h"
 #include "hw/block/block.h"
 #include "hw/block/flash.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "system/block-backend.h"
 #include "qapi/error.h"

diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c
index 3244b699b98d361189fbd708cb70c8e8f3de385b..6a74bcb7a1bfe87e079df89e91618ab070c2b11f 100644 (file)
--- a/hw/block/pflash_cfi02.c
+++ b/hw/block/pflash_cfi02.c
@@ -35,7 +35,7 @@
 #include "qemu/osdep.h"
 #include "hw/block/block.h"
 #include "hw/block/flash.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"

diff --git a/hw/block/swim.c b/hw/block/swim.c
index ad047362f885f3db6c721454b39760db48228e13..53ba7fa59cf9bfc6495f11199d71b91366b8303f 100644 (file)
--- a/hw/block/swim.c
+++ b/hw/block/swim.c
@@ -18,7 +18,7 @@
 #include "migration/vmstate.h"
 #include "hw/block/block.h"
 #include "hw/block/swim.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "trace.h"
 
 

diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c
index b399eab51a10a82a14a9b31479c54b2d74145029..62295f187cace145171eeb421c344dd32117cb2b 100644 (file)
--- a/hw/block/vhost-user-blk.c
+++ b/hw/block/vhost-user-blk.c
@@ -21,7 +21,7 @@
 #include "qemu/error-report.h"
 #include "qemu/cutils.h"
 #include "hw/core/qdev.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/virtio/virtio-blk-common.h"
 #include "hw/virtio/vhost.h"

diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index 64efce48462ea1501f33bc921e4ff87442f90d69..ddf0e9ee53e4f147c7e466204d557a4603b6d98c 100644 (file)
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -21,7 +21,7 @@
 #include "block/block_int.h"
 #include "trace.h"
 #include "hw/block/block.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "system/blockdev.h"
 #include "system/block-ram-registrar.h"
 #include "system/system.h"

diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c
index 74de897c798b3eaa7b3d0335d7dbf8924f46425d..5dc4ba9d076572a480f8346ff7ae65e3a5d25eb9 100644 (file)
--- a/hw/block/xen-block.c
+++ b/hw/block/xen-block.c
@@ -20,7 +20,7 @@
 #include "qobject/qstring.h"
 #include "qom/object_interfaces.h"
 #include "hw/block/xen_blkif.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/xen/xen-block.h"
 #include "hw/xen/xen-backend.h"
 #include "system/blockdev.h"

diff --git a/hw/char/avr_usart.c b/hw/char/avr_usart.c
index e98ad53e4478b0312778f173b6f7b5e2773d5291..c3515b6f7d08c0dc89a06c98386a8de13ffd95e0 100644 (file)
--- a/hw/char/avr_usart.c
+++ b/hw/char/avr_usart.c
@@ -23,7 +23,7 @@
 #include "hw/char/avr_usart.h"
 #include "qemu/log.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 
 static int avr_usart_can_receive(void *opaque)

diff --git a/hw/char/bcm2835_aux.c b/hw/char/bcm2835_aux.c
index 03428efeea84a7c6a4c8e4211e75e8a32d0a838e..47e24c5bba1befdde4c472bb94fb2063941db9f3 100644 (file)
--- a/hw/char/bcm2835_aux.c
+++ b/hw/char/bcm2835_aux.c
@@ -23,7 +23,7 @@
 #include "qemu/osdep.h"
 #include "hw/char/bcm2835_aux.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"

diff --git a/hw/char/debugcon.c b/hw/char/debugcon.c
index bb323adda552f2ed05c54e2e1be2b1b524d24b44..36607d0c1c726f52db79d240c4e554dc0eed27a1 100644 (file)
--- a/hw/char/debugcon.c
+++ b/hw/char/debugcon.c
@@ -29,7 +29,7 @@
 #include "qemu/module.h"
 #include "chardev/char-fe.h"
 #include "hw/isa/isa.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "qom/object.h"
 

diff --git a/hw/char/digic-uart.c b/hw/char/digic-uart.c
index 0f6af51bb7bcc6bd96edeec72def60c3c30c3f40..04dec0df8a60595b58d544c960d5df2601c9c011 100644 (file)
--- a/hw/char/digic-uart.c
+++ b/hw/char/digic-uart.c
@@ -34,7 +34,7 @@
 #include "qemu/module.h"
 
 #include "hw/char/digic-uart.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 
 enum {

diff --git a/hw/char/diva-gsp.c b/hw/char/diva-gsp.c
index 835594e5cb6d1a850c37e112a8894f0a83388f61..1dafc1e80c3062c9dcfcafe5f2fe3dddbda8a8aa 100644 (file)
--- a/hw/char/diva-gsp.c
+++ b/hw/char/diva-gsp.c
@@ -20,7 +20,7 @@
 #include "hw/char/serial.h"
 #include "hw/core/irq.h"
 #include "hw/pci/pci_device.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "migration/vmstate.h"
 

diff --git a/hw/char/escc.c b/hw/char/escc.c
index 27269dca6433bc113c641b17a924d78cf610e7cc..496bbc56dea17f3ac1b3dbff26710f5dffaffe9d 100644 (file)
--- a/hw/char/escc.c
+++ b/hw/char/escc.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"

diff --git a/hw/char/exynos4210_uart.c b/hw/char/exynos4210_uart.c
index 8ba310fd7acb85ea23e65d385dd8e06883888fc6..387156d5e34d8da653f02704d8cc5740e91011eb 100644 (file)
--- a/hw/char/exynos4210_uart.c
+++ b/hw/char/exynos4210_uart.c
@@ -31,7 +31,7 @@
 
 #include "hw/arm/exynos4210.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 
 #include "trace.h"

diff --git a/hw/char/grlib_apbuart.c b/hw/char/grlib_apbuart.c
index 15925eb2e6398d04e1ee8ba5787d8d0cc43690d4..9731e664c1b75259ff9bc93d35726ab828a6354a 100644 (file)
--- a/hw/char/grlib_apbuart.c
+++ b/hw/char/grlib_apbuart.c
@@ -26,7 +26,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/char/grlib_uart.h"
 #include "hw/sysbus.h"

diff --git a/hw/char/ibex_uart.c b/hw/char/ibex_uart.c
index 23abeacb1b5ad32d9b93fbd114857bccd71ff122..ac4a43af84ecde33a9f33612ce37208c0eaa90d1 100644 (file)
--- a/hw/char/ibex_uart.c
+++ b/hw/char/ibex_uart.c
@@ -29,7 +29,7 @@
 #include "hw/char/ibex_uart.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-clock.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/registerfields.h"
 #include "migration/vmstate.h"

diff --git a/hw/char/imx_serial.c b/hw/char/imx_serial.c
index 9f13236f29c8f4215b868028526693cc2f9fc935..78d2c25f86f2d56939166974bb1f68cb3bba1f0e 100644 (file)
--- a/hw/char/imx_serial.c
+++ b/hw/char/imx_serial.c
@@ -21,7 +21,7 @@
 #include "qemu/osdep.h"
 #include "hw/char/imx_serial.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"

diff --git a/hw/char/ipoctal232.c b/hw/char/ipoctal232.c
index 6e38916150c4136d954976af434a56f959330822..19f312b9d3050db38be982291ab66440e09f573a 100644 (file)
--- a/hw/char/ipoctal232.c
+++ b/hw/char/ipoctal232.c
@@ -11,7 +11,7 @@
 #include "qemu/osdep.h"
 #include "hw/ipack/ipack.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "migration/vmstate.h"
 #include "qemu/bitops.h"

diff --git a/hw/char/max78000_uart.c b/hw/char/max78000_uart.c
index 5fc933123e9d77c3e56408f5d89085ee7b8d2c44..59ec24a15e84edd61ebf9d5f8e7c6aff373fad3f 100644 (file)
--- a/hw/char/max78000_uart.c
+++ b/hw/char/max78000_uart.c
@@ -9,7 +9,7 @@
 #include "qemu/osdep.h"
 #include "hw/char/max78000_uart.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c
index d9d551924b3f0603c3ec469826f59c00830f0c05..391674dbcc689df7b696ed89f52a9016fa9c21ce 100644 (file)
--- a/hw/char/mcf_uart.c
+++ b/hw/char/mcf_uart.c
@@ -12,7 +12,7 @@
 #include "qemu/module.h"
 #include "qapi/error.h"
 #include "hw/m68k/mcf.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "chardev/char-fe.h"
 #include "qom/object.h"

diff --git a/hw/char/mchp_pfsoc_mmuart.c b/hw/char/mchp_pfsoc_mmuart.c
index 6149f9d20479f4349b14f8342c3ff7761740e4ba..6673721454cc4fd004bb782114a0d2442c0b044a 100644 (file)
--- a/hw/char/mchp_pfsoc_mmuart.c
+++ b/hw/char/mchp_pfsoc_mmuart.c
@@ -25,7 +25,7 @@
 #include "qapi/error.h"
 #include "migration/vmstate.h"
 #include "hw/char/mchp_pfsoc_mmuart.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 
 #define REGS_OFFSET 0x20
 

diff --git a/hw/char/nrf51_uart.c b/hw/char/nrf51_uart.c
index 39d144538d10fe9fa82417468545ec871fcde29d..6087cabeb3cdc3bbbbf26094936e3a7de41bfd83 100644 (file)
--- a/hw/char/nrf51_uart.c
+++ b/hw/char/nrf51_uart.c
@@ -17,7 +17,7 @@
 #include "qemu/module.h"
 #include "hw/char/nrf51_uart.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "migration/vmstate.h"
 #include "trace.h"

diff --git a/hw/char/parallel-isa.c b/hw/char/parallel-isa.c
index b6dfb6cc31a6fb41c6657b0aca113d1707688335..92e94138f4aeea0b900be7480e1e20d8b3f49984 100644 (file)
--- a/hw/char/parallel-isa.c
+++ b/hw/char/parallel-isa.c
@@ -12,7 +12,7 @@
 #include "qemu/osdep.h"
 #include "system/system.h"
 #include "hw/isa/isa.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/char/parallel-isa.h"
 #include "hw/char/parallel.h"
 #include "qapi/error.h"

diff --git a/hw/char/parallel.c b/hw/char/parallel.c
index 8732e4e9f962fb236ace9d5b8d6dab070bb9fee9..6708d7658bd5dd246b515fb9bd70c5578caad975 100644 (file)
--- a/hw/char/parallel.c
+++ b/hw/char/parallel.c
@@ -28,7 +28,7 @@
 #include "qemu/module.h"
 #include "chardev/char-parallel.h"
 #include "hw/acpi/acpi_aml_interface.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "migration/vmstate.h"
 #include "hw/char/parallel-isa.h"

diff --git a/hw/char/pl011.c b/hw/char/pl011.c
index 030d6a2e8b4e57b92f8381b7101e58088c5e78c7..f37ffd349f6f87b73ae0a476266f60a134195ea6 100644 (file)
--- a/hw/char/pl011.c
+++ b/hw/char/pl011.c
@@ -24,7 +24,7 @@
 #include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "hw/core/qdev-clock.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "migration/vmstate.h"
 #include "chardev/char-fe.h"

diff --git a/hw/char/renesas_sci.c b/hw/char/renesas_sci.c
index b32e41d5b8a93f00bc70f69014ff4cb910f2c926..3c1cc43954bb06badaa6f8bab6e08015d17f1689 100644 (file)
--- a/hw/char/renesas_sci.c
+++ b/hw/char/renesas_sci.c
@@ -25,7 +25,7 @@
 #include "qemu/log.h"
 #include "hw/core/irq.h"
 #include "hw/registerfields.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/char/renesas_sci.h"
 #include "migration/vmstate.h"

diff --git a/hw/char/sclpconsole-lm.c b/hw/char/sclpconsole-lm.c
index c51308f9c5c954229f98f90ede858e0537678070..ed08cf42da2f49d98db01405f41fe75fb3cfdae6 100644 (file)
--- a/hw/char/sclpconsole-lm.c
+++ b/hw/char/sclpconsole-lm.c
@@ -22,7 +22,7 @@
 #include "hw/s390x/sclp.h"
 #include "migration/vmstate.h"
 #include "hw/s390x/event-facility.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/s390x/ebcdic.h"
 #include "qom/object.h"

diff --git a/hw/char/sclpconsole.c b/hw/char/sclpconsole.c
index 2abf861dbcf44b30bebf680defcc8a0670469725..ab444fe1fa4faeff953e9e0fc71b3c50a222f0e2 100644 (file)
--- a/hw/char/sclpconsole.c
+++ b/hw/char/sclpconsole.c
@@ -19,7 +19,7 @@
 
 #include "hw/s390x/sclp.h"
 #include "migration/vmstate.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/s390x/event-facility.h"
 #include "chardev/char-fe.h"

diff --git a/hw/char/serial-isa.c b/hw/char/serial-isa.c
index 0ea59a3d5c23aa195939d11ea23e2421c127034a..a4be0492c598914aa5d3b407fe9670399f1bf419 100644 (file)
--- a/hw/char/serial-isa.c
+++ b/hw/char/serial-isa.c
@@ -31,7 +31,7 @@
 #include "hw/char/serial.h"
 #include "hw/char/serial-isa.h"
 #include "hw/isa/isa.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qom/object.h"
 

diff --git a/hw/char/serial-mm.c b/hw/char/serial-mm.c
index 13aba780ec53b2b3950ee4bd4c8bd9e007f90fc9..6e963e581f952e3685dd5220e88513aed1a9f82d 100644 (file)
--- a/hw/char/serial-mm.c
+++ b/hw/char/serial-mm.c
@@ -28,7 +28,7 @@
 #include "exec/cpu-common.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 
 static uint64_t serial_mm_read(void *opaque, hwaddr addr, unsigned size)
 {

diff --git a/hw/char/serial-pci-multi.c b/hw/char/serial-pci-multi.c
index 34608569988b9b91da0daf01c85fc4a2dcda6d3d..f0af12c14f9d7a86de1b5051f8aeb0166bf19854 100644 (file)
--- a/hw/char/serial-pci-multi.c
+++ b/hw/char/serial-pci-multi.c
@@ -32,7 +32,7 @@
 #include "hw/char/serial.h"
 #include "hw/core/irq.h"
 #include "hw/pci/pci_device.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "migration/vmstate.h"
 

diff --git a/hw/char/serial-pci.c b/hw/char/serial-pci.c
index d05d0898998b13c64c4a09aeabd6856f391f6d09..d8cacc90859c4e3628762078deacd379dcf5a589 100644 (file)
--- a/hw/char/serial-pci.c
+++ b/hw/char/serial-pci.c
@@ -31,7 +31,7 @@
 #include "hw/char/serial.h"
 #include "hw/core/irq.h"
 #include "hw/pci/pci_device.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qom/object.h"
 

diff --git a/hw/char/serial.c b/hw/char/serial.c
index 11685b397b76b2d267213a7c072fdf022a5af6df..cbff68a71119ab318e6c3c86f4bb2a147a4a5ac3 100644 (file)
--- a/hw/char/serial.c
+++ b/hw/char/serial.c
@@ -35,7 +35,7 @@
 #include "system/runstate.h"
 #include "qemu/error-report.h"
 #include "trace.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 
 #define UART_LCR_DLAB   0x80    /* Divisor latch access bit */

diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c
index 008a2ea2f04b537ebcb4831b90f4e557a22efdd0..9cd79fce3346493f4e7911d0633aa3a14861eebb 100644 (file)
--- a/hw/char/sh_serial.c
+++ b/hw/char/sh_serial.c
@@ -29,7 +29,7 @@
 #include "hw/sysbus.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/sh4/sh.h"
 #include "chardev/char-fe.h"

diff --git a/hw/char/shakti_uart.c b/hw/char/shakti_uart.c
index 6e216edb0fc49ab460c8c0318ceb8d10239a0fbe..51e45351d958ea9de77536bd365c57ddb9ad1cb1 100644 (file)
--- a/hw/char/shakti_uart.c
+++ b/hw/char/shakti_uart.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/char/shakti_uart.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "qemu/log.h"
 

diff --git a/hw/char/spapr_vty.c b/hw/char/spapr_vty.c
index 766b2bfcac051129497fa2432f824fff2621dc2c..17a17c47c369c1fcddaafcb3dbf82a8486c42c83 100644 (file)
--- a/hw/char/spapr_vty.c
+++ b/hw/char/spapr_vty.c
@@ -6,7 +6,7 @@
 #include "chardev/char-fe.h"
 #include "hw/ppc/spapr.h"
 #include "hw/ppc/spapr_vio.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "qom/object.h"
 

diff --git a/hw/char/stm32f2xx_usart.c b/hw/char/stm32f2xx_usart.c
index 49bbda03b870480e1bdfdf13804742ff4391cbdc..2c19ec69cc87935749b5fd709937a233c15c837a 100644 (file)
--- a/hw/char/stm32f2xx_usart.c
+++ b/hw/char/stm32f2xx_usart.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "hw/char/stm32f2xx_usart.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/char/stm32l4x5_usart.c b/hw/char/stm32l4x5_usart.c
index 4533cbc93beed20ddbd550b58b7f84ac2341935b..8b208ba9b6a579c4d1d95645281f2ba753450140 100644 (file)
--- a/hw/char/stm32l4x5_usart.c
+++ b/hw/char/stm32l4x5_usart.c
@@ -26,7 +26,7 @@
 #include "hw/core/clock.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-clock.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/registerfields.h"
 #include "trace.h"

diff --git a/hw/char/terminal3270.c b/hw/char/terminal3270.c
index c993f67b42add740a2d1a24557f091d09892c531..821a75c37a283e72ffeecc6a02b45f8c644f076c 100644 (file)
--- a/hw/char/terminal3270.c
+++ b/hw/char/terminal3270.c
@@ -15,7 +15,7 @@
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "chardev/char-fe.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/s390x/3270-ccw.h"
 #include "qom/object.h"

diff --git a/hw/char/virtio-console.c b/hw/char/virtio-console.c
index 1b669c9be837e83b6cbcad753c49df044196788d..8c2a6a9d1d3a0cb4e8b19736935e43bac3ddf375 100644 (file)
--- a/hw/char/virtio-console.c
+++ b/hw/char/virtio-console.c
@@ -15,7 +15,7 @@
 #include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "trace.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/virtio/virtio-serial.h"
 #include "qapi/error.h"

diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c
index 673c50f0be08ef9b7142c16eaf8e6e31c7a00ca5..5ec5f5313b2134ea753a6b8c601e4437aa4c8017 100644 (file)
--- a/hw/char/virtio-serial-bus.c
+++ b/hw/char/virtio-serial-bus.c
@@ -27,7 +27,7 @@
 #include "monitor/monitor.h"
 #include "qemu/error-report.h"
 #include "qemu/queue.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "trace.h"
 #include "hw/virtio/virtio-serial.h"
 #include "hw/virtio/virtio-access.h"

diff --git a/hw/char/xen_console.c b/hw/char/xen_console.c
index a639fb0b114f9f484c7d3944caabd156cb47564b..a0d142582ee84205237b41f652772975a594a48b 100644 (file)
--- a/hw/char/xen_console.c
+++ b/hw/char/xen_console.c
@@ -29,7 +29,7 @@
 #include "chardev/char-fe.h"
 #include "hw/xen/xen-backend.h"
 #include "hw/xen/xen-bus-helper.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/xen/interface/io/console.h"
 #include "hw/xen/interface/io/xs_wire.h"

diff --git a/hw/char/xilinx_uartlite.c b/hw/char/xilinx_uartlite.c
index da1ecd249c7da1e47ba376b6f87831dec43bfa45..9d81cd904c66eb0d6b21a28656cfe2c1b365aef6 100644 (file)
--- a/hw/char/xilinx_uartlite.c
+++ b/hw/char/xilinx_uartlite.c
@@ -27,7 +27,7 @@
 #include "qapi/error.h"
 #include "hw/char/xilinx_uartlite.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/sysbus.h"
 #include "qemu/module.h"

diff --git a/hw/core/bus.c b/hw/core/bus.c
index bddfc22d388ae08f724214c0ed0219c98c2f2f1e..53f392fdda842dbeb3773153b6b1a6721cc0b686 100644 (file)
--- a/hw/core/bus.c
+++ b/hw/core/bus.c
@@ -18,7 +18,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qemu/ctype.h"
 #include "qemu/module.h"
 #include "qapi/error.h"

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

diff --git a/hw/core/cpu-system.c b/hw/core/cpu-system.c
index 5d5a4357399c3dd16875827d5cbca55e5b47c44f..48c8ddf4b154b09f622c6b6cc591c5fd450621ee 100644 (file)
--- a/hw/core/cpu-system.c
+++ b/hw/core/cpu-system.c
@@ -25,7 +25,7 @@
 #include "system/memory.h"
 #include "qemu/target-info.h"
 #include "hw/core/qdev.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/core/sysemu-cpu-ops.h"
 #include "migration/vmstate.h"
 #include "system/tcg.h"

diff --git a/hw/core/cpu-user.c b/hw/core/cpu-user.c
index 270afe5b9f66fc92f5ac8bef107d398b5e8df131..25aa25ad24018b2c263cf0c6ced89f8de86cc0a2 100644 (file)
--- a/hw/core/cpu-user.c
+++ b/hw/core/cpu-user.c
@@ -8,7 +8,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/core/qdev.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/core/cpu.h"
 #include "migration/vmstate.h"
 

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

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

diff --git a/hw/core/or-irq.c b/hw/core/or-irq.c
index bcc7ad1e44416ab5a013c89f7a6aaab97a5f6b93..3dc008ea4f3c911bdb428ef287cef04b8f3990dd 100644 (file)
--- a/hw/core/or-irq.c
+++ b/hw/core/or-irq.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
 #include "hw/core/or-irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"
 

diff --git a/hw/core/platform-bus.c b/hw/core/platform-bus.c
index 4b6cc5f6498dfc7fda68ecc7e913f5c804ce8908..a2217a2deec7ab0f49b211c6658db02d13c319df 100644 (file)
--- a/hw/core/platform-bus.c
+++ b/hw/core/platform-bus.c
@@ -21,7 +21,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/core/platform-bus.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"

diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c
index 7aa5cbb5103d885bd4aa69b3c243c938e0823b4d..d0a66358b5a11d620345beefdfb40182a522a6c6 100644 (file)
--- a/hw/core/qdev-properties-system.c
+++ b/hw/core/qdev-properties-system.c
@@ -11,7 +11,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"

diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index 0930d64252df916ffa3b33063d811ccc1d0a4166..05489c8fbbf93acc7882695076dd69ccb3180b85 100644 (file)
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -1,5 +1,5 @@
 #include "qemu/osdep.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
 #include "qapi/qapi-types-misc.h"
 #include "qapi/qapi-visit-common.h"

diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index fae9ffc75952f6bc46060a5f7bbce3c725c26326..a3b41286ea025ad28965cd86cc6242327703cb8e 100644 (file)
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -33,7 +33,7 @@
 #include "qemu/error-report.h"
 #include "qemu/option.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/core/boards.h"
 #include "hw/sysbus.h"
 #include "hw/core/qdev-clock.h"

diff --git a/hw/core/split-irq.c b/hw/core/split-irq.c
index d0aaa108eb95ec5905caa7e9ca3a2fbe0c0f5402..7491d74791e9156ebb3b0cd83ddb5a5cba039f70 100644 (file)
--- a/hw/core/split-irq.c
+++ b/hw/core/split-irq.c
@@ -26,7 +26,7 @@
 #include "qemu/osdep.h"
 #include "hw/core/split-irq.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
 #include "qemu/module.h"
 

diff --git a/hw/cpu/a15mpcore.c b/hw/cpu/a15mpcore.c
index 1a6fb914f3ba2e389447e91bfca56fb95dd99d80..28cc4b3a4bd80c21988475c52f8122e7584efaf9 100644 (file)
--- a/hw/cpu/a15mpcore.c
+++ b/hw/cpu/a15mpcore.c
@@ -23,7 +23,7 @@
 #include "qemu/module.h"
 #include "hw/cpu/a15mpcore.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "system/kvm.h"
 #include "kvm_arm.h"
 #include "target/arm/gtimer.h"

diff --git a/hw/cpu/a9mpcore.c b/hw/cpu/a9mpcore.c
index 9f8e0f70c4926c6b37603a9ab1e309f7fef2068d..2127f9557892f766071331a580917cd96327727d 100644 (file)
--- a/hw/cpu/a9mpcore.c
+++ b/hw/cpu/a9mpcore.c
@@ -13,7 +13,7 @@
 #include "qemu/module.h"
 #include "hw/cpu/a9mpcore.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/core/cpu.h"
 #include "target/arm/cpu-qom.h"
 

diff --git a/hw/cpu/arm11mpcore.c b/hw/cpu/arm11mpcore.c
index 1953d12f61b6e914f8e29e3cf4b1a1eb6a4d4828..f3a5174c1f9ead4ca36b63439bf94a92b8daf5c5 100644 (file)
--- a/hw/cpu/arm11mpcore.c
+++ b/hw/cpu/arm11mpcore.c
@@ -13,7 +13,7 @@
 #include "hw/cpu/arm11mpcore.h"
 #include "hw/intc/realview_gic.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 
 #define ARM11MPCORE_NUM_GIC_PRIORITY_BITS    4
 

diff --git a/hw/cpu/cluster.c b/hw/cpu/cluster.c
index ef3b3d1e94064b8ef5202d77a9878fdf42d5ccf7..628fe333673eb349adfdbe69194be5f795db7d9c 100644 (file)
--- a/hw/cpu/cluster.c
+++ b/hw/cpu/cluster.c
@@ -22,7 +22,7 @@
 
 #include "hw/core/cpu.h"
 #include "hw/cpu/cluster.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
 
 static const Property cpu_cluster_properties[] = {

diff --git a/hw/cxl/switch-mailbox-cci.c b/hw/cxl/switch-mailbox-cci.c
index 223f220433143f20c9ea7dd058452b94c9a2deb5..5ba587b4e5571ee1257cca73e873ce44c54bddc9 100644 (file)
--- a/hw/cxl/switch-mailbox-cci.c
+++ b/hw/cxl/switch-mailbox-cci.c
@@ -14,7 +14,7 @@
 #include "qapi/error.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/cxl/cxl.h"
 
 #define CXL_SWCCI_MSIX_MBOX 3

diff --git a/hw/display/apple-gfx.h b/hw/display/apple-gfx.h
index a8b1d1efc09a4529ef1449a629e10fb979d66b2e..3197bd853dabe89fc5747fef587d4f59791f85fb 100644 (file)
--- a/hw/display/apple-gfx.h
+++ b/hw/display/apple-gfx.h
@@ -10,7 +10,7 @@
 
 #include "qemu/queue.h"
 #include "system/memory.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "ui/surface.h"
 
 #define TYPE_APPLE_GFX_MMIO         "apple-gfx-mmio"

diff --git a/hw/display/artist.c b/hw/display/artist.c
index e6fed03786e9a6753f99d9a8fc4e00e45915864e..22524d9c5fe7ae269f61b59d67a379f718261d2f 100644 (file)
--- a/hw/display/artist.c
+++ b/hw/display/artist.c
@@ -17,7 +17,7 @@
 #include "hw/sysbus.h"
 #include "hw/core/loader.h"
 #include "hw/core/qdev.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "ui/console.h"
 #include "trace.h"

diff --git a/hw/display/ati.c b/hw/display/ati.c
index f7c0006a879d5379ec2fdf30005066048c301878..e9c3ad2cd152e3c483167c30db80e26b0d4984b2 100644 (file)
--- a/hw/display/ati.c
+++ b/hw/display/ati.c
@@ -20,7 +20,7 @@
 #include "ati_int.h"
 #include "ati_regs.h"
 #include "vga-access.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "vga_regs.h"
 #include "qemu/bswap.h"
 #include "qemu/log.h"

diff --git a/hw/display/bcm2835_fb.c b/hw/display/bcm2835_fb.c
index f8f13b55cb43134485689fdf993d53524cd9361a..8eec0dc600b684999de261dbbb5d61edc1c1a0e0 100644 (file)
--- a/hw/display/bcm2835_fb.c
+++ b/hw/display/bcm2835_fb.c
@@ -31,7 +31,7 @@
 #include "framebuffer.h"
 #include "ui/pixel_ops.h"
 #include "hw/misc/bcm2835_mbox_defs.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/display/bochs-display.c b/hw/display/bochs-display.c
index ad2821c974580812364bc1643a37b9e2590f3ade..5fb6b733cb55c495dda7ce4dd1ad4930fe9b489b 100644 (file)
--- a/hw/display/bochs-display.c
+++ b/hw/display/bochs-display.c
@@ -9,7 +9,7 @@
 #include "qemu/module.h"
 #include "qemu/units.h"
 #include "hw/pci/pci_device.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/display/bochs-vbe.h"
 #include "hw/display/edid.h"

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

diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c
index ef08694626d6937cd2266892334a35dc149ae5f4..37228ff1345ab90a2cc13f2da4e7fa129936a1c9 100644 (file)
--- a/hw/display/cirrus_vga.c
+++ b/hw/display/cirrus_vga.c
@@ -40,7 +40,7 @@
 #include "qapi/error.h"
 #include "trace.h"
 #include "hw/pci/pci_device.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "ui/pixel_ops.h"
 #include "vga_regs.h"

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

diff --git a/hw/display/dm163.c b/hw/display/dm163.c
index e78804693cda65108367e6a59fa526a821d71146..4feae912945c52367fb6bd165f191405cfd7422a 100644 (file)
--- a/hw/display/dm163.c
+++ b/hw/display/dm163.c
@@ -18,7 +18,7 @@
 #include "qapi/error.h"
 #include "migration/vmstate.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/display/dm163.h"
 #include "ui/console.h"
 #include "trace.h"

diff --git a/hw/display/exynos4210_fimd.c b/hw/display/exynos4210_fimd.c
index 8d8062f427c48649b17048b4339641a833747917..8e3a61ed0e87e1d8938e4e4be27daad80949b827 100644 (file)
--- a/hw/display/exynos4210_fimd.c
+++ b/hw/display/exynos4210_fimd.c
@@ -23,7 +23,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/hw.h"
 #include "hw/core/irq.h"
 #include "hw/sysbus.h"

diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c
index 10686cd6763013f106469eb0c51caeb59d52f8f0..8ed3e6ecc37ccd661c1d569d0b033ba658a943ca 100644 (file)
--- a/hw/display/g364fb.c
+++ b/hw/display/g364fb.c
@@ -21,7 +21,7 @@
 #include "qemu/units.h"
 #include "hw/hw.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"

diff --git a/hw/display/i2c-ddc.c b/hw/display/i2c-ddc.c
index 2adfc1a1472f58cf8f00ab4f5c948e6bc7e14222..1fddc5807a0faed3e95f7f9cda44959a66a3365f 100644 (file)
--- a/hw/display/i2c-ddc.c
+++ b/hw/display/i2c-ddc.c
@@ -20,7 +20,7 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "hw/i2c/i2c.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/display/i2c-ddc.h"
 

diff --git a/hw/display/macfb.c b/hw/display/macfb.c
index 574d667173ca48f75059ef8a370893a6067a4356..fa3572ead34c4d7eeb1df02421af0c945dcc535f 100644 (file)
--- a/hw/display/macfb.c
+++ b/hw/display/macfb.c
@@ -18,7 +18,7 @@
 #include "hw/nubus/nubus.h"
 #include "hw/display/macfb.h"
 #include "qapi/error.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "trace.h"
 

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

diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index 18f482ca7f7b4e3dfc9082b54670ffae9997601b..f29b736722cabf5e100e8363924e1a45471a9faa 100644 (file)
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -28,7 +28,7 @@
 #include "qemu/atomic.h"
 #include "qemu/main-loop.h"
 #include "qemu/module.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "system/runstate.h"
 #include "migration/cpr.h"
 #include "migration/vmstate.h"

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

diff --git a/hw/display/sm501.c b/hw/display/sm501.c
index bc091b3c9fb1eae01f8c81cf3003d8b86107a74c..6ccec03fe72dded70e7c93498c820f6777bbeb8f 100644 (file)
--- a/hw/display/sm501.c
+++ b/hw/display/sm501.c
@@ -35,7 +35,7 @@
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/pci/pci_device.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/i2c/i2c.h"
 #include "hw/display/i2c-ddc.h"
 #include "qemu/range.h"

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

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

diff --git a/hw/display/vga-mmio.c b/hw/display/vga-mmio.c
index 33263856b763cfa970ce894568a9aa22647ea634..4c497b70f418aeeb535f0f170b499984c1e2a2ff 100644 (file)
--- a/hw/display/vga-mmio.c
+++ b/hw/display/vga-mmio.c
@@ -26,7 +26,7 @@
 #include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "hw/display/vga.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "ui/console.h"
 #include "vga_int.h"
 

diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c
index 7a39bb9b213aa152a5b1d5fa015ee75538ab740b..d0f9de1ab3591c770fb4233e47148d5af4fc7044 100644 (file)
--- a/hw/display/vga-pci.c
+++ b/hw/display/vga-pci.c
@@ -26,7 +26,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/pci/pci_device.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "vga_int.h"
 #include "ui/pixel_ops.h"

diff --git a/hw/display/vhost-user-gpu.c b/hw/display/vhost-user-gpu.c
index 9fc6bbcd2ce14b08202d7f0f9323d1ce3b285b97..3f6fb7a8033ea22a20e0040300d873ba89c8549d 100644 (file)
--- a/hw/display/vhost-user-gpu.c
+++ b/hw/display/vhost-user-gpu.c
@@ -13,7 +13,7 @@
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
 #include "qemu/sockets.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio-gpu.h"
 #include "chardev/char-fe.h"
 #include "qapi/error.h"

diff --git a/hw/display/virtio-gpu-gl.c b/hw/display/virtio-gpu-gl.c
index c06a078fb36a665102f850b813507802994b6b39..b98ef2ef98770b018188c8b64989fc958ee94f1e 100644 (file)
--- a/hw/display/virtio-gpu-gl.c
+++ b/hw/display/virtio-gpu-gl.c
@@ -21,7 +21,7 @@
 #include "hw/virtio/virtio-gpu.h"
 #include "hw/virtio/virtio-gpu-bswap.h"
 #include "hw/virtio/virtio-gpu-pixman.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 
 #include <virglrenderer.h>
 

diff --git a/hw/display/virtio-gpu-pci-gl.c b/hw/display/virtio-gpu-pci-gl.c
index a2819e1ca93f98022a81b5a14d18718a1396d182..c8923795dfa7318aa91398728a6cba3a88149c89 100644 (file)
--- a/hw/display/virtio-gpu-pci-gl.c
+++ b/hw/display/virtio-gpu-pci-gl.c
@@ -15,7 +15,7 @@
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "hw/pci/pci.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio.h"
 #include "hw/virtio/virtio-bus.h"
 #include "hw/virtio/virtio-gpu-pci.h"

diff --git a/hw/display/virtio-gpu-pci-rutabaga.c b/hw/display/virtio-gpu-pci-rutabaga.c
index 5fdff37f2c150e2bf36403b0574cc3444a3e54de..4db77cb868dbc9ec3a0816e79fcfc33183a4f8f9 100644 (file)
--- a/hw/display/virtio-gpu-pci-rutabaga.c
+++ b/hw/display/virtio-gpu-pci-rutabaga.c
@@ -4,7 +4,7 @@
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "hw/pci/pci.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio.h"
 #include "hw/virtio/virtio-bus.h"
 #include "hw/virtio/virtio-gpu-pci.h"

diff --git a/hw/display/virtio-gpu-pci.c b/hw/display/virtio-gpu-pci.c
index c0d71b6254caf7c7c7690174fddffb9c75ddf536..22659ca196b5ce01b18252e05f3c47a681df4f58 100644 (file)
--- a/hw/display/virtio-gpu-pci.c
+++ b/hw/display/virtio-gpu-pci.c
@@ -15,7 +15,7 @@
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "hw/pci/pci.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio.h"
 #include "hw/virtio/virtio-bus.h"
 #include "hw/virtio/virtio-gpu-pci.h"

diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
index 43e88a4daffd75116b44575cca27111a730232fa..f23eec6862aa8b146bca588c9be92c93c013489c 100644 (file)
--- a/hw/display/virtio-gpu.c
+++ b/hw/display/virtio-gpu.c
@@ -26,7 +26,7 @@
 #include "hw/virtio/virtio-gpu-bswap.h"
 #include "hw/virtio/virtio-gpu-pixman.h"
 #include "hw/virtio/virtio-bus.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qemu/log.h"
 #include "qemu/memfd.h"
 #include "qemu/module.h"

diff --git a/hw/display/virtio-vga-gl.c b/hw/display/virtio-vga-gl.c
index 984faa6b39a80bc786e31ec3d39396bade78d81c..178e4c717250c3241adac5d701e7824a58461819 100644 (file)
--- a/hw/display/virtio-vga-gl.c
+++ b/hw/display/virtio-vga-gl.c
@@ -1,6 +1,6 @@
 #include "qemu/osdep.h"
 #include "hw/pci/pci.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio-gpu.h"
 #include "hw/display/vga.h"
 #include "qapi/error.h"

diff --git a/hw/display/virtio-vga-rutabaga.c b/hw/display/virtio-vga-rutabaga.c
index a7bef6da248b9d8a0e2f52e66c8e42f42fd4982d..1e07ee0b0d34e2e94c45d362df82dbe7c6bc3243 100644 (file)
--- a/hw/display/virtio-vga-rutabaga.c
+++ b/hw/display/virtio-vga-rutabaga.c
@@ -2,7 +2,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/pci/pci.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio-gpu.h"
 #include "hw/display/vga.h"
 #include "qapi/error.h"

diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c
index 40e60f70fcd484f4632dd240d5f0199691090c4a..5e087169f2f43928417b2bdfd2ff08bc02c8d7ce 100644 (file)
--- a/hw/display/virtio-vga.c
+++ b/hw/display/virtio-vga.c
@@ -1,6 +1,6 @@
 #include "qemu/osdep.h"
 #include "hw/pci/pci.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio-gpu.h"
 #include "qapi/error.h"
 #include "qemu/module.h"

diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c
index 7ca5a55142621d05690b71d422b43727a4defa0a..ea7a9fca04e170177eaf1c1fc1e2df3c279dd934 100644 (file)
--- a/hw/display/vmware_vga.c
+++ b/hw/display/vmware_vga.c
@@ -30,7 +30,7 @@
 #include "hw/core/loader.h"
 #include "trace.h"
 #include "hw/pci/pci_device.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qom/object.h"
 #include "ui/console.h"

diff --git a/hw/dma/i82374.c b/hw/dma/i82374.c
index e226eda6d158362c10c4b8352b11d7c855a36364..c909cf46401ed0768e3c3ef13c9e86bda655f1f4 100644 (file)
--- a/hw/dma/i82374.c
+++ b/hw/dma/i82374.c
@@ -26,7 +26,7 @@
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "hw/isa/isa.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/dma/i8257.h"
 #include "qom/object.h"

diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c
index 2463952ada28c095de281fee3ad2d624f7fc43d3..d909d6c8fc23d877fc0d867c6fbbd326e31a814b 100644 (file)
--- a/hw/dma/i8257.c
+++ b/hw/dma/i8257.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/isa/isa.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/dma/i8257.h"
 #include "qapi/error.h"

diff --git a/hw/dma/pl080.c b/hw/dma/pl080.c
index 28f793716465dc56ec4182e5983fe92a11d0ec36..bd61d8ed4881aca1e4bdb4c6ef2b833f95c20140 100644 (file)
--- a/hw/dma/pl080.c
+++ b/hw/dma/pl080.c
@@ -15,7 +15,7 @@
 #include "hw/dma/pl080.h"
 #include "hw/hw.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
 
 #define PL080_CONF_E    0x1

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

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

diff --git a/hw/dma/sparc32_dma.c b/hw/dma/sparc32_dma.c
index 9f56faf9a53ccdb339c603e546ab7eafe389f520..5601d221ec268ba63654d4cb64136cff4a587c70 100644 (file)
--- a/hw/dma/sparc32_dma.c
+++ b/hw/dma/sparc32_dma.c
@@ -27,7 +27,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/sparc/sparc32_dma.h"
 #include "hw/sparc/sun4m_iommu.h"
 #include "hw/sysbus.h"

diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c
index 15da3fcbc2c5a2778bd71abcb1b7e1f4e5a2cb1d..7cdd76330f31073988181b07eb6f31187ee26901 100644 (file)
--- a/hw/dma/xilinx_axidma.c
+++ b/hw/dma/xilinx_axidma.c
@@ -29,7 +29,7 @@
 #include "hw/hw.h"
 #include "hw/core/irq.h"
 #include "hw/core/ptimer.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
 

diff --git a/hw/dma/xlnx-zdma.c b/hw/dma/xlnx-zdma.c
index 660fc21b6d16cd620d022b1c71ef345f9e3b546e..306c56c3ef5493d2863b080dfa30026dcf7fa004 100644 (file)
--- a/hw/dma/xlnx-zdma.c
+++ b/hw/dma/xlnx-zdma.c
@@ -29,7 +29,7 @@
 #include "qemu/osdep.h"
 #include "hw/dma/xlnx-zdma.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qemu/bitops.h"
 #include "qemu/log.h"

diff --git a/hw/dma/xlnx_csu_dma.c b/hw/dma/xlnx_csu_dma.c
index 92f445034e8a2f87c6d2909cda0c5f6c2871de6d..650401614ed9c0c412dc2318f0711ffe2b76c98c 100644 (file)
--- a/hw/dma/xlnx_csu_dma.c
+++ b/hw/dma/xlnx_csu_dma.c
@@ -22,7 +22,7 @@
 #include "qemu/log.h"
 #include "qapi/error.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "system/dma.h"

diff --git a/hw/fsi/cfam.c b/hw/fsi/cfam.c
index e2145c5934bd9cd03bc7da98a9ee780748d7c046..54c0b05769d402513acd127c82179af0ae771800 100644 (file)
--- a/hw/fsi/cfam.c
+++ b/hw/fsi/cfam.c
@@ -14,7 +14,7 @@
 #include "hw/fsi/cfam.h"
 #include "hw/fsi/fsi.h"
 
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 
 #define ENGINE_CONFIG_NEXT            BIT(31)
 #define ENGINE_CONFIG_TYPE_PEEK       (0x02 << 4)

diff --git a/hw/fsi/lbus.c b/hw/fsi/lbus.c
index 8ec7f5fd780431c6bc5b792dbed3d3bd67ecd646..cae29e0658b29c065d9e32032d212d5de243507d 100644 (file)
--- a/hw/fsi/lbus.c
+++ b/hw/fsi/lbus.c
@@ -8,7 +8,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/fsi/lbus.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qemu/log.h"
 #include "trace.h"
 

diff --git a/hw/gpio/imx_gpio.c b/hw/gpio/imx_gpio.c
index 842c997a2a6d0ebca9e246fd3f44c7f615bcaa6b..5abf208df4754b75f01686154de23cd9a0d3a1ec 100644 (file)
--- a/hw/gpio/imx_gpio.c
+++ b/hw/gpio/imx_gpio.c
@@ -20,7 +20,7 @@
 #include "qemu/osdep.h"
 #include "hw/gpio/imx_gpio.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/gpio/npcm7xx_gpio.c b/hw/gpio/npcm7xx_gpio.c
index 59b95d232bf82edc2644066ea22a6f9d5261a7ab..ad19b9fd42759707f61c40908c052cc30e83f8c5 100644 (file)
--- a/hw/gpio/npcm7xx_gpio.c
+++ b/hw/gpio/npcm7xx_gpio.c
@@ -17,7 +17,7 @@
 
 #include "hw/gpio/npcm7xx_gpio.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"
 #include "qemu/log.h"

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

diff --git a/hw/gpio/pca9552.c b/hw/gpio/pca9552.c
index fe1d8dbffa20492970801ede128cfde0babed15e..dd3c795e49aaf3e5ce0aeffd2b8b5721d75aef34 100644 (file)
--- a/hw/gpio/pca9552.c
+++ b/hw/gpio/pca9552.c
@@ -14,7 +14,7 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "qemu/bitops.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/gpio/pca9552.h"
 #include "hw/gpio/pca9552_regs.h"
 #include "hw/core/irq.h"

diff --git a/hw/gpio/pca9554.c b/hw/gpio/pca9554.c
index c6cdd27b3ff162085984905215bff706af7b910c..8427e01e9b2385e767e7c532e675ff3b960be596 100644 (file)
--- a/hw/gpio/pca9554.c
+++ b/hw/gpio/pca9554.c
@@ -10,7 +10,7 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "qemu/bitops.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/gpio/pca9554.h"
 #include "hw/gpio/pca9554_regs.h"
 #include "hw/core/irq.h"

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

diff --git a/hw/gpio/sifive_gpio.c b/hw/gpio/sifive_gpio.c
index 63ca721fadd98c52355c23598c5b61a55869f34c..b7a56935c05bafca0d1a3a703c707b32daf1a31f 100644 (file)
--- a/hw/gpio/sifive_gpio.c
+++ b/hw/gpio/sifive_gpio.c
@@ -14,7 +14,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/gpio/sifive_gpio.h"
 #include "migration/vmstate.h"
 #include "trace.h"

diff --git a/hw/gpio/stm32l4x5_gpio.c b/hw/gpio/stm32l4x5_gpio.c
index 5686bd53c23cc381f39195473c56e0f80f46b44a..92fa397fbafe58ab07154c335c4e0bdcd4b41b8b 100644 (file)
--- a/hw/gpio/stm32l4x5_gpio.c
+++ b/hw/gpio/stm32l4x5_gpio.c
@@ -22,7 +22,7 @@
 #include "hw/core/irq.h"
 #include "hw/core/clock.h"
 #include "hw/core/qdev-clock.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/visitor.h"
 #include "qapi/error.h"
 #include "migration/vmstate.h"

diff --git a/hw/hyperv/hv-balloon.c b/hw/hyperv/hv-balloon.c
index deb20d7b6a3fa865189c5a24e2db7bc65800ce07..9dd759f11e8abeaa2f7c8acf9b33f7816daaa478 100644 (file)
--- a/hw/hyperv/hv-balloon.c
+++ b/hw/hyperv/hv-balloon.c
@@ -20,7 +20,7 @@
 #include "hw/mem/memory-device.h"
 #include "hw/mem/pc-dimm.h"
 #include "hw/core/qdev.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "monitor/qdev.h"
 #include "qapi/error.h"
 #include "qapi/qapi-commands-machine.h"

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

diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c
index 961406cdd6a34d8737afd6e7b960e34c4668cf82..639d932b0941465f02e6edab4d043465b0acc67c 100644 (file)
--- a/hw/hyperv/vmbus.c
+++ b/hw/hyperv/vmbus.c
@@ -13,7 +13,7 @@
 #include "exec/target_page.h"
 #include "qapi/error.h"
 #include "migration/vmstate.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/hyperv/hyperv.h"
 #include "hw/hyperv/vmbus.h"

diff --git a/hw/i2c/aspeed_i2c.c b/hw/i2c/aspeed_i2c.c
index 3d66dd863a1766512a74e4c06ff3a1341567d68b..e3ca77865bdcc3b684a430e4fdfefa6a38e4820f 100644 (file)
--- a/hw/i2c/aspeed_i2c.c
+++ b/hw/i2c/aspeed_i2c.c
@@ -28,7 +28,7 @@
 #include "qapi/error.h"
 #include "hw/i2c/aspeed_i2c.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/registerfields.h"
 #include "trace.h"
 

diff --git a/hw/i2c/core.c b/hw/i2c/core.c
index 4b6345b588925a85009b4a03ac778ab40588964d..54f6bdca882060b6f64e032fa52dde22009618be 100644 (file)
--- a/hw/i2c/core.c
+++ b/hw/i2c/core.c
@@ -9,7 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/i2c/i2c.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"
 #include "qemu/module.h"

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

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

diff --git a/hw/i2c/smbus_eeprom.c b/hw/i2c/smbus_eeprom.c
index ce3723e14838afa2d1f01db205da5ab7ea302278..d9ac556a0abc2da95394799e5eb466248c607726 100644 (file)
--- a/hw/i2c/smbus_eeprom.c
+++ b/hw/i2c/smbus_eeprom.c
@@ -28,7 +28,7 @@
 #include "hw/core/boards.h"
 #include "hw/i2c/i2c.h"
 #include "hw/i2c/smbus_slave.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/i2c/smbus_eeprom.h"
 #include "qom/object.h"

diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c
index d689a06eca469f89dd2e7ee42b40116b3dd75c73..789e09d6f2bcdcdd8202b1564f577c52ab985d24 100644 (file)
--- a/hw/i386/amd_iommu.c
+++ b/hw/i386/amd_iommu.c
@@ -31,7 +31,7 @@
 #include "hw/i386/apic_internal.h"
 #include "trace.h"
 #include "hw/i386/apic-msidef.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "kvm/kvm_i386.h"
 #include "qemu/iova-tree.h"
 

diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
index 78b142cceab3c4bb08ce1151930722135ed2717c..f744be9f70f546a25ea0ccfce58528f6643c23e8 100644 (file)
--- a/hw/i386/intel_iommu.c
+++ b/hw/i386/intel_iommu.c
@@ -27,7 +27,7 @@
 #include "intel_iommu_internal.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_bus.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/i386/pc.h"
 #include "hw/i386/apic-msidef.h"
 #include "hw/i386/x86-iommu.h"

diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c
index f56382717f766d43120f33ef366c703702c75e61..310b9a8eb5a0d508c3bc7feda282f9ded42e3b8e 100644 (file)
--- a/hw/i386/kvm/clock.c
+++ b/hw/i386/kvm/clock.c
@@ -23,7 +23,7 @@
 #include "migration/vmstate.h"
 #include "hw/sysbus.h"
 #include "hw/i386/kvm/clock.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
 
 #include <linux/kvm.h>

diff --git a/hw/i386/kvm/ioapic.c b/hw/i386/kvm/ioapic.c
index 693ee978a12b6a3c93323172ef3ed5084366ce1d..ba7888e3d1e666cfb81282d29e23ed11efa63c3d 100644 (file)
--- a/hw/i386/kvm/ioapic.c
+++ b/hw/i386/kvm/ioapic.c
@@ -12,7 +12,7 @@
 
 #include "qemu/osdep.h"
 #include "monitor/monitor.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/intc/ioapic_internal.h"
 #include "hw/intc/kvm_irqcount.h"
 #include "system/kvm.h"

diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 5fd2f9d1e0cdd4e5c381176161bcf3d6a6e2c4ac..18158ad15e41be1ccb3376800a8f3223873099d5 100644 (file)
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -40,7 +40,7 @@
 #include "hw/i386/kvm/clock.h"
 #include "hw/pci-host/q35.h"
 #include "hw/pci/pcie_port.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/i386/x86.h"
 #include "hw/i386/pc.h"
 #include "hw/i386/amd_iommu.h"

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

diff --git a/hw/i386/sgx-epc.c b/hw/i386/sgx-epc.c
index 2b3b2823b5f8a334f89865e28f8c93d7e11db349..d3fe10028c510b307a133e934b9461896003ed81 100644 (file)
--- a/hw/i386/sgx-epc.c
+++ b/hw/i386/sgx-epc.c
@@ -13,7 +13,7 @@
 #include "hw/i386/pc.h"
 #include "hw/i386/sgx-epc.h"
 #include "hw/mem/memory-device.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"
 #include "target/i386/cpu.h"

diff --git a/hw/i386/vmmouse.c b/hw/i386/vmmouse.c
index 3896159b05585c47c85c8f1b92f474831fe2dac8..2ae7f3a242e1f6d35a1fde5a826a6b97daabe10d 100644 (file)
--- a/hw/i386/vmmouse.c
+++ b/hw/i386/vmmouse.c
@@ -27,7 +27,7 @@
 #include "ui/console.h"
 #include "hw/i386/vmport.h"
 #include "hw/input/i8042.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "cpu.h"
 #include "qom/object.h"

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

diff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c
index c127a44bb4bc8cf38f5e81894072ea801de3114c..21e0d40e1143f0312001ad874843db67fba805b2 100644 (file)
--- a/hw/i386/x86-iommu.c
+++ b/hw/i386/x86-iommu.c
@@ -20,7 +20,7 @@
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/i386/x86-iommu.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/i386/pc.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"

diff --git a/hw/i386/xen/xen_pvdevice.c b/hw/i386/xen/xen_pvdevice.c
index 87a974ae5a0477ba065c53d7d26209fcc5346bef..fab26a06af177bcb362a02f2d10aeb5fb2679905 100644 (file)
--- a/hw/i386/xen/xen_pvdevice.c
+++ b/hw/i386/xen/xen_pvdevice.c
@@ -33,7 +33,7 @@
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "hw/pci/pci_device.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "trace.h"
 #include "qom/object.h"

diff --git a/hw/ide/ahci-sysbus.c b/hw/ide/ahci-sysbus.c
index 210818d0479e3e4a411a2b51ec31c7020e26f002..c722e91be1c94d9bd1ed8d671f59943e77b7e2c4 100644 (file)
--- a/hw/ide/ahci-sysbus.c
+++ b/hw/ide/ahci-sysbus.c
@@ -23,7 +23,7 @@
 
 #include "qemu/osdep.h"
 #include "system/address-spaces.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 
 #include "hw/ide/ahci-sysbus.h"

diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c
index 2a59516a9ddbc0a7d40400f521b9cef07006b76a..d44a90a1622af823127ba52010ee19e85d360975 100644 (file)
--- a/hw/ide/cmd646.c
+++ b/hw/ide/cmd646.c
@@ -25,7 +25,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/pci/pci.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"
 #include "hw/isa/isa.h"

diff --git a/hw/ide/isa.c b/hw/ide/isa.c
index 5f418413c1882f7a327382d5afbd6dca9a04a346..c97b7a1ff4d37e79f8d2db44d3516dd456c35e47 100644 (file)
--- a/hw/ide/isa.c
+++ b/hw/ide/isa.c
@@ -25,7 +25,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/isa/isa.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"
 #include "qemu/module.h"

diff --git a/hw/ide/macio.c b/hw/ide/macio.c
index 07db7dc34aafde89a06666b0a5d834b5264d58cc..a7ed41fa265428c53f393ed8d8e8def706d82f36 100644 (file)
--- a/hw/ide/macio.c
+++ b/hw/ide/macio.c
@@ -26,7 +26,7 @@
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
 #include "hw/ppc/mac_dbdma.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"
 #include "hw/misc/macio/macio.h"

diff --git a/hw/ide/mmio.c b/hw/ide/mmio.c
index 699874db785d49ce852586dbfa1a3679140a01af..04b56ac5d866663cd93120b8d87710445e3bc394 100644 (file)
--- a/hw/ide/mmio.c
+++ b/hw/ide/mmio.c
@@ -30,7 +30,7 @@
 #include "system/dma.h"
 
 #include "hw/ide/mmio.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "ide-internal.h"
 
 /***********************************************************/

diff --git a/hw/input/adb.c b/hw/input/adb.c
index bcb11edca3594d66169a16c98836e6b1d0274115..29c09c755966ccf1ffe4da4d1e5effc20b1bd7dc 100644 (file)
--- a/hw/input/adb.c
+++ b/hw/input/adb.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/input/adb.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"
 #include "qemu/timer.h"

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

diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
index 48b457cac76be73909ba171d827f134657ea2cbd..b09c3bce93395cb0bd3876f149734a54c851dfa7 100644 (file)
--- a/hw/input/pckbd.c
+++ b/hw/input/pckbd.c
@@ -33,7 +33,7 @@
 #include "hw/input/ps2.h"
 #include "hw/core/irq.h"
 #include "hw/input/i8042.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "system/reset.h"
 #include "system/runstate.h"
 

diff --git a/hw/input/stellaris_gamepad.c b/hw/input/stellaris_gamepad.c
index bd80db6fac5c62ffa16091fc2f6e755e9a0c10ee..f64f5ea9ce36007bb6e137f434beec72c87e6275 100644 (file)
--- a/hw/input/stellaris_gamepad.c
+++ b/hw/input/stellaris_gamepad.c
@@ -11,7 +11,7 @@
 #include "qapi/error.h"
 #include "hw/input/stellaris_gamepad.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "ui/console.h"
 

diff --git a/hw/input/virtio-input-hid.c b/hw/input/virtio-input-hid.c
index d986c3c16e35340885c0bef159d9eb690f92cd45..bcbfef0b905a805506dcfb0adfcae0547df10ef6 100644 (file)
--- a/hw/input/virtio-input-hid.c
+++ b/hw/input/virtio-input-hid.c
@@ -9,7 +9,7 @@
 #include "qemu/module.h"
 
 #include "hw/virtio/virtio.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio-input.h"
 
 #include "ui/console.h"

diff --git a/hw/input/virtio-input-host.c b/hw/input/virtio-input-host.c
index 9f62532559d6af410f9a08d2eb2ab8e25120e6ce..633547cc4f7926e5f1e71b4fabe80865e59dd2dd 100644 (file)
--- a/hw/input/virtio-input-host.c
+++ b/hw/input/virtio-input-host.c
@@ -10,7 +10,7 @@
 #include "qemu/sockets.h"
 
 #include "hw/virtio/virtio.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio-input.h"
 
 #include <sys/ioctl.h>

diff --git a/hw/input/virtio-input.c b/hw/input/virtio-input.c
index a3f554f2110cdd28f8913c2ffa5a7cd32aa27302..6494cfbbe82dad8d37177d976681655b1214fec8 100644 (file)
--- a/hw/input/virtio-input.c
+++ b/hw/input/virtio-input.c
@@ -11,7 +11,7 @@
 #include "trace.h"
 
 #include "hw/virtio/virtio.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio-input.h"
 
 #include "standard-headers/linux/input.h"

diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c
index 83e1bc2d75903ca97838b56541010662040ef9d6..afac20440f822ab43926f212ab1cd426f312efae 100644 (file)
--- a/hw/intc/apic_common.c
+++ b/hw/intc/apic_common.c
@@ -29,7 +29,7 @@
 #include "trace.h"
 #include "hw/core/boards.h"
 #include "system/kvm.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 

diff --git a/hw/intc/arm_gic_common.c b/hw/intc/arm_gic_common.c
index ed5be0564528ea7e03f22ee3c2422e4eeca91518..304d89cf56219bf76eeeb24e55dbfe60be23ba43 100644 (file)
--- a/hw/intc/arm_gic_common.c
+++ b/hw/intc/arm_gic_common.c
@@ -24,7 +24,7 @@
 #include "qemu/error-report.h"
 #include "gic_internal.h"
 #include "hw/arm/linux-boot-if.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "system/kvm.h"
 

diff --git a/hw/intc/arm_gicv2m.c b/hw/intc/arm_gicv2m.c
index e823fcc97fc1a54d4358048039d849bd8a0603fb..c39d31b1870aa32a3aa4e5df13015ebd4d3b3811 100644 (file)
--- a/hw/intc/arm_gicv2m.c
+++ b/hw/intc/arm_gicv2m.c
@@ -30,7 +30,7 @@
 #include "hw/sysbus.h"
 #include "hw/core/irq.h"
 #include "hw/pci/msi.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "system/kvm.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/intc/arm_gicv3_common.c b/hw/intc/arm_gicv3_common.c
index 2d0df6da86c239a0d9242979837b8f7f2bfcf713..0a2e5a3e2fc973e9c6d0a21ac9277d3f20f4c119 100644 (file)
--- a/hw/intc/arm_gicv3_common.c
+++ b/hw/intc/arm_gicv3_common.c
@@ -27,7 +27,7 @@
 #include "qemu/error-report.h"
 #include "hw/core/cpu.h"
 #include "hw/intc/arm_gicv3_common.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "gicv3_internal.h"
 #include "hw/arm/linux-boot-if.h"

diff --git a/hw/intc/arm_gicv3_its.c b/hw/intc/arm_gicv3_its.c
index 577b4454057f3d89753152a2d51c61f4eaaecf91..cce3486d74c166d757a4d528b11e582fd11c6262 100644 (file)
--- a/hw/intc/arm_gicv3_its.c
+++ b/hw/intc/arm_gicv3_its.c
@@ -14,7 +14,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "trace.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/intc/arm_gicv3_its_common.h"
 #include "gicv3_internal.h"
 #include "qom/object.h"

diff --git a/hw/intc/arm_gicv3_its_kvm.c b/hw/intc/arm_gicv3_its_kvm.c
index 9812d5085977b208043f64bb47f520174b7c7ed4..ae12d41eee17bb8992705be7e31a79892a8a888b 100644 (file)
--- a/hw/intc/arm_gicv3_its_kvm.c
+++ b/hw/intc/arm_gicv3_its_kvm.c
@@ -23,7 +23,7 @@
 #include "qemu/module.h"
 #include "qemu/error-report.h"
 #include "hw/intc/arm_gicv3_its_common.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "system/runstate.h"
 #include "system/kvm.h"
 #include "kvm_arm.h"

diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c
index bb39a690a59ba4b900d2b35f5d247d23b2b1f31d..5fa210c63357f80875af27349b202acf9aa594b3 100644 (file)
--- a/hw/intc/armv7m_nvic.c
+++ b/hw/intc/armv7m_nvic.c
@@ -17,7 +17,7 @@
 #include "qemu/timer.h"
 #include "hw/intc/armv7m_nvic.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "system/tcg.h"
 #include "system/runstate.h"
 #include "target/arm/cpu.h"

diff --git a/hw/intc/exynos4210_combiner.c b/hw/intc/exynos4210_combiner.c
index b9e74d19c372b77df7e618f0aaa86885104afe96..8bea69d91b7c27b943ebd1c9199e98e40fa4e66c 100644 (file)
--- a/hw/intc/exynos4210_combiner.c
+++ b/hw/intc/exynos4210_combiner.c
@@ -35,7 +35,7 @@
 #include "hw/arm/exynos4210.h"
 #include "hw/hw.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qom/object.h"
 
 //#define DEBUG_COMBINER

diff --git a/hw/intc/exynos4210_gic.c b/hw/intc/exynos4210_gic.c
index 5b156f7ef5a46165cc5f2f98f7dfee0e99d9ed34..a65c9c6d28ba75b08f82e01b60254f05aaf838b1 100644 (file)
--- a/hw/intc/exynos4210_gic.c
+++ b/hw/intc/exynos4210_gic.c
@@ -26,7 +26,7 @@
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/intc/exynos4210_gic.h"
 #include "hw/arm/exynos4210.h"
 #include "qom/object.h"

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

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

diff --git a/hw/intc/i8259_common.c b/hw/intc/i8259_common.c
index 602e44c8eafd632437ef32bb96b74d88d8bec424..8ceb5841b9b63ff9d13f5ccfdb6eb9d951205dbe 100644 (file)
--- a/hw/intc/i8259_common.c
+++ b/hw/intc/i8259_common.c
@@ -26,7 +26,7 @@
 #include "qemu/osdep.h"
 #include "hw/intc/i8259.h"
 #include "hw/isa/i8259_internal.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"
 

diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c
index 38e438464861040341f73c576c3214e2ceab2f8a..98de6ca8108fb34fa10d4bc5e46ece5580ad6b2d 100644 (file)
--- a/hw/intc/ioapic.c
+++ b/hw/intc/ioapic.c
@@ -29,7 +29,7 @@
 #include "hw/intc/ioapic.h"
 #include "hw/intc/ioapic_internal.h"
 #include "hw/pci/msi.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "system/accel-irq.h"
 #include "system/kvm.h"
 #include "system/system.h"

diff --git a/hw/intc/loongarch_dintc.c b/hw/intc/loongarch_dintc.c
index 082755d28bb6fec925639bc90f78b872d42b85ea..574e4a0d2773fc96b92d52a69ba5d9afef1e3ac9 100644 (file)
--- a/hw/intc/loongarch_dintc.c
+++ b/hw/intc/loongarch_dintc.c
@@ -15,7 +15,7 @@
 #include "hw/misc/unimp.h"
 #include "migration/vmstate.h"
 #include "trace.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "target/loongarch/cpu.h"
 #include "qemu/error-report.h"
 #include "system/hw_accel.h"

diff --git a/hw/intc/loongarch_extioi_common.c b/hw/intc/loongarch_extioi_common.c
index ba03383ed1937abc87a5559950e27690e27a5ce2..5cb0d396c65f61d774a04a4cfa052c0a71e5d6b1 100644 (file)
--- a/hw/intc/loongarch_extioi_common.c
+++ b/hw/intc/loongarch_extioi_common.c
@@ -7,7 +7,7 @@
 #include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "qapi/error.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/intc/loongarch_extioi_common.h"
 #include "migration/vmstate.h"
 #include "target/loongarch/cpu.h"

diff --git a/hw/intc/loongarch_ipi.c b/hw/intc/loongarch_ipi.c
index 2a4557a8baa02cab0e6450bd7dbf04923e15eb4b..5d8b8c96df70145bed909432d7f4c85ba4a89dd3 100644 (file)
--- a/hw/intc/loongarch_ipi.c
+++ b/hw/intc/loongarch_ipi.c
@@ -10,7 +10,7 @@
 #include "hw/core/boards.h"
 #include "qapi/error.h"
 #include "hw/intc/loongarch_ipi.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "system/kvm.h"
 #include "target/loongarch/cpu.h"
 

diff --git a/hw/intc/loongarch_pic_common.c b/hw/intc/loongarch_pic_common.c
index de170501cf2741a47316d5804528af039d8187c1..309182b2fb1aa42697afe0c89d1e3c9eae967f10 100644 (file)
--- a/hw/intc/loongarch_pic_common.c
+++ b/hw/intc/loongarch_pic_common.c
@@ -7,7 +7,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/intc/loongarch_pic_common.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 
 static int loongarch_pic_pre_save(void *opaque)

diff --git a/hw/intc/loongson_ipi.c b/hw/intc/loongson_ipi.c
index fbc73e8b00135aea828553b2742586bf5e240b13..88d22afa6ac8487f6f066b6de3d241296a61f59f 100644 (file)
--- a/hw/intc/loongson_ipi.c
+++ b/hw/intc/loongson_ipi.c
@@ -7,7 +7,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/intc/loongson_ipi.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
 #include "target/mips/cpu.h"
 

diff --git a/hw/intc/loongson_liointc.c b/hw/intc/loongson_liointc.c
index 4c24f330ed7c6fc86f38f9266d649ef8d4bbf2f4..053d9898f8c538714360903cf9e79681a893e818 100644 (file)
--- a/hw/intc/loongson_liointc.c
+++ b/hw/intc/loongson_liointc.c
@@ -23,7 +23,7 @@
 #include "qemu/module.h"
 #include "qemu/log.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/intc/loongson_liointc.h"
 
 #define NUM_IRQS                32

diff --git a/hw/intc/m68k_irqc.c b/hw/intc/m68k_irqc.c
index 67cb9acb418b4e18044c7086f89b9e294285a1bd..c652bf143f00e0d9f112110c4b75f3c9bb72e9ef 100644 (file)
--- a/hw/intc/m68k_irqc.c
+++ b/hw/intc/m68k_irqc.c
@@ -10,7 +10,7 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "migration/vmstate.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/core/nmi.h"
 #include "hw/intc/intc.h"
 #include "hw/intc/m68k_irqc.h"

diff --git a/hw/intc/mips_gic.c b/hw/intc/mips_gic.c
index 08925fe1e41224033c9d97335aa41852b16c5832..e983f3a2b58a0c06cd97011b9137759dbc690f2e 100644 (file)
--- a/hw/intc/mips_gic.c
+++ b/hw/intc/mips_gic.c
@@ -20,7 +20,7 @@
 #include "kvm_mips.h"
 #include "hw/intc/mips_gic.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 
 static void mips_gic_set_vp_irq(MIPSGICState *gic, int vp, int pin)
 {

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

diff --git a/hw/intc/ompic.c b/hw/intc/ompic.c
index 5a630bd51cb21ff99cbfb351d81a930de1ec4c24..05f0ef82549c8155f6d7f6469e802b501b1ece24 100644 (file)
--- a/hw/intc/ompic.c
+++ b/hw/intc/ompic.c
@@ -10,7 +10,7 @@
 #include "qemu/module.h"
 #include "qapi/error.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "system/memory.h"

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

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

diff --git a/hw/intc/pnv_xive.c b/hw/intc/pnv_xive.c
index c2ca40b8be87c9463af4965e18ecf349d991a1be..13ac2c6ccbf396a674edf10f5cae68b837660ae7 100644 (file)
--- a/hw/intc/pnv_xive.c
+++ b/hw/intc/pnv_xive.c
@@ -21,7 +21,7 @@
 #include "hw/ppc/pnv_xscom.h"
 #include "hw/ppc/pnv_xive.h"
 #include "hw/ppc/xive_regs.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/ppc/ppc.h"
 #include "trace.h"
 

diff --git a/hw/intc/pnv_xive2.c b/hw/intc/pnv_xive2.c
index 0663baab544caa2dc77afe1a854ef83f0fb4442c..ae424d01c42f7cf0b97af5b33bad98ac05694a7a 100644 (file)
--- a/hw/intc/pnv_xive2.c
+++ b/hw/intc/pnv_xive2.c
@@ -22,7 +22,7 @@
 #include "hw/ppc/xive_regs.h"
 #include "hw/ppc/xive2_regs.h"
 #include "hw/ppc/ppc.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "system/reset.h"
 #include "system/qtest.h"
 

diff --git a/hw/intc/ppc-uic.c b/hw/intc/ppc-uic.c
index bfc4a4fbceb84f1c3b6831ace7b36156fa5d3b60..5090101f077ffffdccfa8aae952497b30e308c5e 100644 (file)
--- a/hw/intc/ppc-uic.c
+++ b/hw/intc/ppc-uic.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "hw/intc/ppc-uic.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 
 enum {

diff --git a/hw/intc/realview_gic.c b/hw/intc/realview_gic.c
index ecaf8201fd6c127b90b847a77631f5f20d5933b9..56ece334a5ea0853abbc4f7d34a28f9648dafb02 100644 (file)
--- a/hw/intc/realview_gic.c
+++ b/hw/intc/realview_gic.c
@@ -12,7 +12,7 @@
 #include "qemu/module.h"
 #include "hw/intc/realview_gic.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 
 static void realview_gic_set_irq(void *opaque, int irq, int level)
 {

diff --git a/hw/intc/riscv_aclint.c b/hw/intc/riscv_aclint.c
index f3e37df47d16f6beeca16562deac602c13c8198e..83968ad7cca23e07cb5be1fcd3111efc3e3835ae 100644 (file)
--- a/hw/intc/riscv_aclint.c
+++ b/hw/intc/riscv_aclint.c
@@ -29,7 +29,7 @@
 #include "hw/sysbus.h"
 #include "target/riscv/cpu.h"
 #include "target/riscv/time_helper.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/intc/riscv_aclint.h"
 #include "qemu/timer.h"
 #include "hw/core/irq.h"

diff --git a/hw/intc/riscv_aplic.c b/hw/intc/riscv_aplic.c
index 580622d1712db5883a933b61509b8e601417e531..cc5f30b5588b0c11f593761c4a3762809116d37a 100644 (file)
--- a/hw/intc/riscv_aplic.c
+++ b/hw/intc/riscv_aplic.c
@@ -26,7 +26,7 @@
 #include "hw/sysbus.h"
 #include "hw/pci/msi.h"
 #include "hw/core/boards.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/intc/riscv_aplic.h"
 #include "hw/core/irq.h"
 #include "target/riscv/cpu.h"

diff --git a/hw/intc/riscv_imsic.c b/hw/intc/riscv_imsic.c
index 54e72b81e789204941fe99bfc99549118f00663b..bc580c000ef5a3870ad6950ca22b98a6f2d9877a 100644 (file)
--- a/hw/intc/riscv_imsic.c
+++ b/hw/intc/riscv_imsic.c
@@ -26,7 +26,7 @@
 #include "hw/sysbus.h"
 #include "hw/pci/msi.h"
 #include "hw/core/boards.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/intc/riscv_imsic.h"
 #include "hw/core/irq.h"
 #include "target/riscv/cpu.h"

diff --git a/hw/intc/rx_icu.c b/hw/intc/rx_icu.c
index 84712e2e4d00bf36376e1ad68d98b62b19b9f105..788afe6b1a09430bd5de3641011ebb2e6330cbd7 100644 (file)
--- a/hw/intc/rx_icu.c
+++ b/hw/intc/rx_icu.c
@@ -28,7 +28,7 @@
 #include "qemu/error-report.h"
 #include "hw/core/irq.h"
 #include "hw/registerfields.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/intc/rx_icu.h"
 #include "migration/vmstate.h"
 

diff --git a/hw/intc/s390_flic.c b/hw/intc/s390_flic.c
index 1eed5125d17b639d1a822b008f456f5b14c47a10..508b58382ed8ea8cbc901f8247b43f6f9aaaff37 100644 (file)
--- a/hw/intc/s390_flic.c
+++ b/hw/intc/s390_flic.c
@@ -17,7 +17,7 @@
 #include "hw/sysbus.h"
 #include "hw/s390x/ioinst.h"
 #include "hw/s390x/s390_flic.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/s390x/css.h"
 #include "trace.h"
 #include "qapi/error.h"

diff --git a/hw/intc/sifive_plic.c b/hw/intc/sifive_plic.c
index c578b6e36d2fdc8da009ee005c6050c6517a63f6..5df578822f9e74b717c14f79f152d00967eceb9a 100644 (file)
--- a/hw/intc/sifive_plic.c
+++ b/hw/intc/sifive_plic.c
@@ -25,7 +25,7 @@
 #include "qemu/error-report.h"
 #include "hw/sysbus.h"
 #include "hw/pci/msi.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/intc/sifive_plic.h"
 #include "target/riscv/cpu.h"
 #include "migration/vmstate.h"

diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c
index e393f5dcdccfe405363526fb29244a53da1951ba..76ab476f59ab6b9ecfe58a9cb5323836a6478b3e 100644 (file)
--- a/hw/intc/spapr_xive.c
+++ b/hw/intc/spapr_xive.c
@@ -21,7 +21,7 @@
 #include "hw/ppc/spapr_xive.h"
 #include "hw/ppc/xive.h"
 #include "hw/ppc/xive_regs.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "trace.h"
 
 /*

diff --git a/hw/intc/xics.c b/hw/intc/xics.c
index e87c0ad2bcd7cde307856863f34edc8da4fbf4a5..1d40c4386d16badfae1d9859960acbab036f2c72 100644 (file)
--- a/hw/intc/xics.c
+++ b/hw/intc/xics.c
@@ -30,7 +30,7 @@
 #include "trace.h"
 #include "qemu/timer.h"
 #include "hw/ppc/xics.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "qapi/visitor.h"

diff --git a/hw/intc/xilinx_intc.c b/hw/intc/xilinx_intc.c
index f5a59d89830d930737baad1f5219af0e22d94164..465df1c3af252d8852b64d6e96d8da18a15d9ded 100644 (file)
--- a/hw/intc/xilinx_intc.c
+++ b/hw/intc/xilinx_intc.c
@@ -30,7 +30,7 @@
 #include "hw/sysbus.h"
 #include "qemu/module.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "qom/object.h"
 

diff --git a/hw/intc/xive.c b/hw/intc/xive.c
index 6f9babf601cb8ceb89e8b4bf1a96244ba41f3c04..d702b58bd0af6861f114704fbbb236563f3610b9 100644 (file)
--- a/hw/intc/xive.c
+++ b/hw/intc/xive.c
@@ -14,7 +14,7 @@
 #include "system/cpus.h"
 #include "system/dma.h"
 #include "system/reset.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/core/irq.h"
 #include "hw/ppc/xive.h"

diff --git a/hw/intc/xive2.c b/hw/intc/xive2.c
index fbb3b7975e50bf39894d3b42fe8ce5eeb11786ff..495925196a8811ed5129c3cf22e3ac5e9d6af10f 100644 (file)
--- a/hw/intc/xive2.c
+++ b/hw/intc/xive2.c
@@ -13,7 +13,7 @@
 #include "target/ppc/cpu.h"
 #include "system/cpus.h"
 #include "system/dma.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/ppc/xive.h"
 #include "hw/ppc/xive2.h"
 #include "hw/ppc/xive2_regs.h"

diff --git a/hw/intc/xlnx-pmu-iomod-intc.c b/hw/intc/xlnx-pmu-iomod-intc.c
index 098c1f327cd6e88df30f38250e86a3de9fa75bde..f3509efa0ab9f51348fda8fe07402d54f7149306 100644 (file)
--- a/hw/intc/xlnx-pmu-iomod-intc.c
+++ b/hw/intc/xlnx-pmu-iomod-intc.c
@@ -33,7 +33,7 @@
 #include "qemu/module.h"
 #include "hw/intc/xlnx-pmu-iomod-intc.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 
 #ifndef XLNX_PMU_IO_INTC_ERR_DEBUG
 #define XLNX_PMU_IO_INTC_ERR_DEBUG 0

diff --git a/hw/ipack/ipack.c b/hw/ipack/ipack.c
index 4a710eb1876e82d3b2a7b8f21941551dc8e25583..f2e5524fa8bde8964b0e9c0763af025d0d943eb9 100644 (file)
--- a/hw/ipack/ipack.c
+++ b/hw/ipack/ipack.c
@@ -13,7 +13,7 @@
 #include "qemu/module.h"
 #include "hw/ipack/ipack.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 
 IPackDevice *ipack_device_find(IPackBus *bus, int32_t slot)

diff --git a/hw/ipmi/ipmi.c b/hw/ipmi/ipmi.c
index 2a7bc667ec375bab8d10335a3df8ca3054e665ce..b49affaccecfc0019a57cd109a5511cccf376853 100644 (file)
--- a/hw/ipmi/ipmi.c
+++ b/hw/ipmi/ipmi.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/ipmi/ipmi.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qom/object_interfaces.h"
 #include "system/runstate.h"
 #include "qapi/error.h"

diff --git a/hw/ipmi/ipmi_bmc_extern.c b/hw/ipmi/ipmi_bmc_extern.c
index 2c6c515579267e2128d4225b2fa9f0d83869fda3..fb90a7d7c30285bee794356a6e0fe435d3b51681 100644 (file)
--- a/hw/ipmi/ipmi_bmc_extern.c
+++ b/hw/ipmi/ipmi_bmc_extern.c
@@ -34,7 +34,7 @@
 #include "qemu/timer.h"
 #include "chardev/char-fe.h"
 #include "hw/ipmi/ipmi.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "migration/vmstate.h"
 #include "qom/object.h"

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

diff --git a/hw/ipmi/isa_ipmi_bt.c b/hw/ipmi/isa_ipmi_bt.c
index 2b26f9c9f0f25940e07010f3d47f1e2ab57e6b9e..911e16afbe78ee6341a042bbdeb6deef9aaf391a 100644 (file)
--- a/hw/ipmi/isa_ipmi_bt.c
+++ b/hw/ipmi/isa_ipmi_bt.c
@@ -28,7 +28,7 @@
 #include "hw/core/irq.h"
 #include "hw/ipmi/ipmi_bt.h"
 #include "hw/isa/isa.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qom/object.h"
 #include "hw/acpi/ipmi.h"

diff --git a/hw/ipmi/isa_ipmi_kcs.c b/hw/ipmi/isa_ipmi_kcs.c
index 14e85e6e9fd83083e193287dd74f72ba9de6a278..927f6b7a56134521acb2ba3085d03b00c2780382 100644 (file)
--- a/hw/ipmi/isa_ipmi_kcs.c
+++ b/hw/ipmi/isa_ipmi_kcs.c
@@ -28,7 +28,7 @@
 #include "hw/core/irq.h"
 #include "hw/ipmi/ipmi_kcs.h"
 #include "hw/isa/isa.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qom/object.h"
 #include "hw/acpi/ipmi.h"

diff --git a/hw/isa/isa-superio.c b/hw/isa/isa-superio.c
index 941b0f91d7522647f3d46798321d2cbea0873fe4..dc6ae3cb1048b622833c22e2bf8c422b61dab04c 100644 (file)
--- a/hw/isa/isa-superio.c
+++ b/hw/isa/isa-superio.c
@@ -20,7 +20,7 @@
 #include "hw/char/parallel.h"
 #include "hw/block/fdc.h"
 #include "hw/isa/superio.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/input/i8042.h"
 #include "hw/char/parallel-isa.h"
 #include "hw/char/serial-isa.h"

diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c
index 6e772eca57351d8eb6d4677d8e41707c96d5c237..51dc680029d5edf1713bfe6ca5ac03b03739c0e7 100644 (file)
--- a/hw/isa/lpc_ich9.c
+++ b/hw/isa/lpc_ich9.c
@@ -45,7 +45,7 @@
 #include "hw/acpi/ich9.h"
 #include "hw/acpi/ich9_timer.h"
 #include "hw/pci/pci_bus.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "system/runstate.h"
 #include "system/system.h"
 #include "hw/core/cpu.h"

diff --git a/hw/isa/pc87312.c b/hw/isa/pc87312.c
index 388da8f59008f42fedcd331f3e315c099dbb72a7..2a2c3e7b66a7ea39253be698a2d8a778b2a4cc2e 100644 (file)
--- a/hw/isa/pc87312.c
+++ b/hw/isa/pc87312.c
@@ -25,7 +25,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/isa/pc87312.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"

diff --git a/hw/isa/piix.c b/hw/isa/piix.c
index bf1c79a3e63da6c761f0d25d314a17a6407783d9..04b2be2cc39789348a1f48528ce8156fcd487e9d 100644 (file)
--- a/hw/isa/piix.c
+++ b/hw/isa/piix.c
@@ -30,7 +30,7 @@
 #include "hw/southbridge/piix.h"
 #include "hw/timer/i8254.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/ide/piix.h"
 #include "hw/intc/i8259.h"
 #include "hw/isa/isa.h"

diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
index 1362a1f40423259442f0f56e0d8b25fc3d9170d7..99be41d0adfbca8b61f2795f6db7ec94eb5258cf 100644 (file)
--- a/hw/isa/vt82c686.c
+++ b/hw/isa/vt82c686.c
@@ -19,7 +19,7 @@
 #include "hw/char/parallel-isa.h"
 #include "hw/char/serial-isa.h"
 #include "hw/pci/pci.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/ide/pci.h"
 #include "hw/isa/isa.h"
 #include "hw/isa/superio.h"

diff --git a/hw/m68k/mcf5206.c b/hw/m68k/mcf5206.c
index e17da4fd2098e12463b9624f28a5f4f2ad815926..4bc7b1d189ee08a0ebf5e677e2ff3ad10ac42ccf 100644 (file)
--- a/hw/m68k/mcf5206.c
+++ b/hw/m68k/mcf5206.c
@@ -10,7 +10,7 @@
 #include "qemu/error-report.h"
 #include "qemu/log.h"
 #include "cpu.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/core/boards.h"
 #include "hw/core/irq.h"
 #include "hw/m68k/mcf.h"

diff --git a/hw/m68k/mcf_intc.c b/hw/m68k/mcf_intc.c
index efac6802a971dcd38b195b45112adb3878fae9b3..b8770e3a53f6329b1a08cb4e18da5eafb35d1827 100644 (file)
--- a/hw/m68k/mcf_intc.c
+++ b/hw/m68k/mcf_intc.c
@@ -14,7 +14,7 @@
 #include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "hw/m68k/mcf.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qom/object.h"
 
 #define TYPE_MCF_INTC "mcf-intc"

diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c
index e7217cbaeacbdb295587b2607073c983224fc3d2..75ae66c311a4bc1f29918063122e7c1a02b0451b 100644 (file)
--- a/hw/m68k/next-cube.c
+++ b/hw/m68k/next-cube.c
@@ -25,7 +25,7 @@
 #include "hw/char/escc.h" /* ZILOG 8530 Serial Emulation */
 #include "hw/block/fdc.h"
 #include "hw/misc/empty_slot.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "ui/console.h"

diff --git a/hw/m68k/q800-glue.c b/hw/m68k/q800-glue.c
index 84dd01459cdcb0f6745134b88609fc50bf9d4c48..24fccab96668ee3de5953bc3093b0b314af41ce9 100644 (file)
--- a/hw/m68k/q800-glue.c
+++ b/hw/m68k/q800-glue.c
@@ -26,7 +26,7 @@
 #include "hw/core/boards.h"
 #include "hw/core/irq.h"
 #include "hw/core/nmi.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 
 /*

diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c
index 7007d4e4e9fe9b690fa16034c61220c1b1e2d1ed..2d83919fa8688cb0d9c615365d3c2067e86335fa 100644 (file)
--- a/hw/m68k/virt.c
+++ b/hw/m68k/virt.c
@@ -14,7 +14,7 @@
 #include "system/system.h"
 #include "cpu.h"
 #include "hw/core/boards.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "elf.h"
 #include "hw/core/loader.h"
 #include "ui/console.h"

diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c
index 4f3688a71b67a02c8834406b2f70073bc9fc51ec..26baa1c3d6c33b4e1347e9c841acefb0b1733294 100644 (file)
--- a/hw/mem/cxl_type3.c
+++ b/hw/mem/cxl_type3.c
@@ -17,7 +17,7 @@
 #include "hw/mem/memory-device.h"
 #include "hw/mem/pc-dimm.h"
 #include "hw/pci/pci.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "qapi/error.h"
 #include "qemu/log.h"

diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c
index 23ab143ef8e0c8d792aa58b10bfa2d15a7545f54..b7032525271a33f683417f3364549e5346e1067c 100644 (file)
--- a/hw/mem/nvdimm.c
+++ b/hw/mem/nvdimm.c
@@ -28,7 +28,7 @@
 #include "qapi/error.h"
 #include "qapi/visitor.h"
 #include "hw/mem/nvdimm.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/mem/memory-device.h"
 #include "system/hostmem.h"
 

diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
index 33e5a376ffa979c585e97d28b694a9720d789b18..3efe47f499a351e82998117d204f9a8f6498cdd1 100644 (file)
--- a/hw/mem/pc-dimm.c
+++ b/hw/mem/pc-dimm.c
@@ -21,7 +21,7 @@
 #include "qemu/osdep.h"
 #include "hw/core/boards.h"
 #include "hw/mem/pc-dimm.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/mem/nvdimm.h"
 #include "hw/mem/memory-device.h"

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

diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c
index f5b9b2e8904bd172a62412de9ca0de58bcda4198..9c2b0ff0b3760c95a9a391d528a4f8f3f3589b4d 100644 (file)
--- a/hw/microblaze/petalogix_ml605_mmu.c
+++ b/hw/microblaze/petalogix_ml605_mmu.c
@@ -35,7 +35,7 @@
 #include "system/system.h"
 #include "hw/core/boards.h"
 #include "hw/char/serial-mm.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "system/address-spaces.h"
 #include "hw/ssi/ssi.h"
 

diff --git a/hw/mips/boston.c b/hw/mips/boston.c
index b63b27d03fa584116ff1a476ba45f32cbf41a62a..4579df23eb70fd6b9d4d882204ed816291cc0dce 100644 (file)
--- a/hw/mips/boston.c
+++ b/hw/mips/boston.c
@@ -31,7 +31,7 @@
 #include "hw/mips/cps.h"
 #include "hw/pci-host/xilinx-pcie.h"
 #include "hw/core/qdev-clock.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qemu/guest-random.h"

diff --git a/hw/mips/cps.c b/hw/mips/cps.c
index 13f048ef9c9211e622446eb9f39fcb3743549681..620ee972f8f0ae7b45e37a43b4c31d167292649a 100644 (file)
--- a/hw/mips/cps.c
+++ b/hw/mips/cps.c
@@ -23,7 +23,7 @@
 #include "hw/mips/cps.h"
 #include "hw/mips/mips.h"
 #include "hw/core/qdev-clock.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "system/tcg.h"
 #include "system/reset.h"
 

diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c
index d4c100b69a02940a47891e0603af228f73ae9613..d0efe36f7ce0eb9d9e72b9531f5eb215ebcc6c9c 100644 (file)
--- a/hw/mips/fuloong2e.c
+++ b/hw/mips/fuloong2e.c
@@ -33,7 +33,7 @@
 #include "hw/pci/pci.h"
 #include "hw/core/loader.h"
 #include "hw/ide/pci.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "elf.h"
 #include "hw/isa/vt82c686.h"
 #include "system/qtest.h"

diff --git a/hw/misc/a9scu.c b/hw/misc/a9scu.c
index bb00ae29692f2e4dd0d4db1e9681ca9d7dfd3240..d5eb985044bf70ababf1aef8109b92d34d39e530 100644 (file)
--- a/hw/misc/a9scu.c
+++ b/hw/misc/a9scu.c
@@ -10,7 +10,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/misc/a9scu.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"
 #include "qemu/log.h"

diff --git a/hw/misc/allwinner-h3-dramc.c b/hw/misc/allwinner-h3-dramc.c
index 8834524c30caec2bb5033414f6ab0a3301e4536d..ef491b36ffb79904f876e867d72c80c5a8105881 100644 (file)
--- a/hw/misc/allwinner-h3-dramc.c
+++ b/hw/misc/allwinner-h3-dramc.c
@@ -25,7 +25,7 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "system/address-spaces.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
 #include "hw/misc/allwinner-h3-dramc.h"
 #include "trace.h"

diff --git a/hw/misc/allwinner-r40-dramc.c b/hw/misc/allwinner-r40-dramc.c
index 1c8e17e3c0b5ba2694e74c2ccf1a160805bb6ffe..3af8af733ace7b02558a1645280bfadac2b1c304 100644 (file)
--- a/hw/misc/allwinner-r40-dramc.c
+++ b/hw/misc/allwinner-r40-dramc.c
@@ -25,7 +25,7 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "system/address-spaces.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
 #include "qemu/bitops.h"
 #include "hw/misc/allwinner-r40-dramc.h"

diff --git a/hw/misc/allwinner-sid.c b/hw/misc/allwinner-sid.c
index 1e66c14567b67c91449de857fb4bedf5a2cba633..17faf67e606458a66f09c7d886d338038071faf3 100644 (file)
--- a/hw/misc/allwinner-sid.c
+++ b/hw/misc/allwinner-sid.c
@@ -25,7 +25,7 @@
 #include "qemu/module.h"
 #include "qemu/guest-random.h"
 #include "qapi/error.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/misc/allwinner-sid.h"
 #include "trace.h"

diff --git a/hw/misc/allwinner-sramc.c b/hw/misc/allwinner-sramc.c
index ed299ecaae78c94d31098577d45ecf0c72c31bdd..bd7f59fec97d452e0be14c049678711ed6b92d56 100644 (file)
--- a/hw/misc/allwinner-sramc.c
+++ b/hw/misc/allwinner-sramc.c
@@ -24,7 +24,7 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "qapi/error.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/misc/allwinner-sramc.h"
 #include "trace.h"

diff --git a/hw/misc/applesmc.c b/hw/misc/applesmc.c
index a015d4a9b8cda7f36920eec9fd1afbf63fd91d87..fd96f5f245fbe119c74a5b30ceb6d03070f2197f 100644 (file)
--- a/hw/misc/applesmc.c
+++ b/hw/misc/applesmc.c
@@ -32,7 +32,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/isa/isa.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "ui/console.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"

diff --git a/hw/misc/arm11scu.c b/hw/misc/arm11scu.c
index 2ad4fd1d21d2e215ccfebd05f4e6fe06920b0249..89c2c4cd73065c2934d8dd3b1aa593e2c552e3b0 100644 (file)
--- a/hw/misc/arm11scu.c
+++ b/hw/misc/arm11scu.c
@@ -10,7 +10,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/misc/arm11scu.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
 

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

diff --git a/hw/misc/arm_sysctl.c b/hw/misc/arm_sysctl.c
index 8995eaeec36c0bba9ef6e74057134af9c1fef15c..0c91ebafac7df5936b6953d241aa6b60ac90c4c5 100644 (file)
--- a/hw/misc/arm_sysctl.c
+++ b/hw/misc/arm_sysctl.c
@@ -9,7 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qemu/timer.h"
 #include "system/runstate.h"
 #include "qemu/bitops.h"

diff --git a/hw/misc/armsse-cpuid.c b/hw/misc/armsse-cpuid.c
index a57764d731f6b3e37182e78ed46bed81432c7f86..3a52bb5381f2a40e03cfdf14e790bf1a3396ef82 100644 (file)
--- a/hw/misc/armsse-cpuid.c
+++ b/hw/misc/armsse-cpuid.c
@@ -26,7 +26,7 @@
 #include "hw/sysbus.h"
 #include "hw/registerfields.h"
 #include "hw/misc/armsse-cpuid.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 
 REG32(CPUID, 0x0)
 REG32(PID4, 0xfd0)

diff --git a/hw/misc/aspeed_hace.c b/hw/misc/aspeed_hace.c
index 51c73ca2a5294ad697935b6905eb367e3e73ee06..23e8030cd966bcc14216d9c720f7006b0d021575 100644 (file)
--- a/hw/misc/aspeed_hace.c
+++ b/hw/misc/aspeed_hace.c
@@ -18,7 +18,7 @@
 #include "qapi/error.h"
 #include "migration/vmstate.h"
 #include "crypto/hash.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/core/irq.h"
 #include "trace.h"
 

diff --git a/hw/misc/aspeed_i3c.c b/hw/misc/aspeed_i3c.c
index 3bef1c84dd1fe3e93a3ab8c14140b8b3b4398fc3..37a05b9ce2771503a48358c68453e13070f804a7 100644 (file)
--- a/hw/misc/aspeed_i3c.c
+++ b/hw/misc/aspeed_i3c.c
@@ -12,7 +12,7 @@
 #include "qemu/error-report.h"
 #include "hw/misc/aspeed_i3c.h"
 #include "hw/registerfields.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
 #include "migration/vmstate.h"
 #include "trace.h"

diff --git a/hw/misc/aspeed_lpc.c b/hw/misc/aspeed_lpc.c
index 829955e6f160c7194f249741a0e10e25e8e4ad49..68f0f6334bc337e1d48f5d41b16c4dd28e623367 100644 (file)
--- a/hw/misc/aspeed_lpc.c
+++ b/hw/misc/aspeed_lpc.c
@@ -14,7 +14,7 @@
 #include "qapi/error.h"
 #include "qapi/visitor.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 
 #define TO_REG(offset) ((offset) >> 2)

diff --git a/hw/misc/aspeed_sbc.c b/hw/misc/aspeed_sbc.c
index 2fc5db749d23e25bb8e36ae8d049930d852cbe52..065e822e70d9dc9678f6414f6b5139224203876e 100644 (file)
--- a/hw/misc/aspeed_sbc.c
+++ b/hw/misc/aspeed_sbc.c
@@ -11,7 +11,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "qemu/error-report.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/misc/aspeed_sbc.h"
 #include "qapi/error.h"
 #include "migration/vmstate.h"

diff --git a/hw/misc/aspeed_scu.c b/hw/misc/aspeed_scu.c
index a0ab5eed8f1751a16c03f87b060bca8c7d725804..d27e0c7f9158df340a8f3b5db1964263ad54dc1e 100644 (file)
--- a/hw/misc/aspeed_scu.c
+++ b/hw/misc/aspeed_scu.c
@@ -11,7 +11,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/misc/aspeed_scu.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"

diff --git a/hw/misc/aspeed_sdmc.c b/hw/misc/aspeed_sdmc.c
index dff7cc362d32ac4423dfa18651c1fb7dcdccf44a..59b4a9a42647349d55205760c1bdd9fec848911f 100644 (file)
--- a/hw/misc/aspeed_sdmc.c
+++ b/hw/misc/aspeed_sdmc.c
@@ -12,7 +12,7 @@
 #include "qemu/module.h"
 #include "qemu/error-report.h"
 #include "hw/misc/aspeed_sdmc.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"
 #include "trace.h"

diff --git a/hw/misc/aspeed_sli.c b/hw/misc/aspeed_sli.c
index c51484035e0828d13c8a3e7c709db73754220136..5b4d70cdc064f4730fbe8bca5ac644ff887d962f 100644 (file)
--- a/hw/misc/aspeed_sli.c
+++ b/hw/misc/aspeed_sli.c
@@ -9,7 +9,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "qemu/error-report.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/misc/aspeed_sli.h"
 #include "qapi/error.h"
 #include "migration/vmstate.h"

diff --git a/hw/misc/avr_power.c b/hw/misc/avr_power.c
index 947304ed3b64f77cf31ec3159f6f060f05b3b915..f42cf4fd9060277c5a46a88102a68d56b05bef19 100644 (file)
--- a/hw/misc/avr_power.c
+++ b/hw/misc/avr_power.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "hw/misc/avr_power.h"
 #include "qemu/log.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/core/irq.h"
 #include "trace.h"
 

diff --git a/hw/misc/bcm2835_cprman.c b/hw/misc/bcm2835_cprman.c
index efe6f900dbfa62e7b50ba8dffba133ab37acb17b..8220f7a6b4b1df3474d3e7e5dfb8e0ad6560cf15 100644 (file)
--- a/hw/misc/bcm2835_cprman.c
+++ b/hw/misc/bcm2835_cprman.c
@@ -46,7 +46,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "migration/vmstate.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/misc/bcm2835_cprman.h"
 #include "hw/misc/bcm2835_cprman_internals.h"
 #include "trace.h"

diff --git a/hw/misc/bcm2835_property.c b/hw/misc/bcm2835_property.c
index 2026294ce1218f2b87c20f1283e104130fe7c5dd..216a746c2bd7eef642cc76e12ec3ac79d60c9a8e 100644 (file)
--- a/hw/misc/bcm2835_property.c
+++ b/hw/misc/bcm2835_property.c
@@ -8,7 +8,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/misc/bcm2835_property.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/core/irq.h"
 #include "hw/misc/bcm2835_mbox_defs.h"

diff --git a/hw/misc/debugexit.c b/hw/misc/debugexit.c
index 04a9fc3122373a600db5f6f4ffb0329333111da9..cdd19166a5aeb7efb6cf6df0e07b248266132bbd 100644 (file)
--- a/hw/misc/debugexit.c
+++ b/hw/misc/debugexit.c
@@ -9,7 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/isa/isa.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qemu/module.h"
 #include "qom/object.h"
 #include "system/runstate.h"

diff --git a/hw/misc/djmemc.c b/hw/misc/djmemc.c
index c5b09f551b0880cf79efcf53efde3889bfaa3a64..5fd3a8bfb2583fbacda3be82a8952d21ebbc2932 100644 (file)
--- a/hw/misc/djmemc.c
+++ b/hw/misc/djmemc.c
@@ -11,7 +11,7 @@
 #include "qemu/log.h"
 #include "migration/vmstate.h"
 #include "hw/misc/djmemc.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "trace.h"
 
 

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

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

diff --git a/hw/misc/iotkit-secctl.c b/hw/misc/iotkit-secctl.c
index f8a2946191db2d683349fd22e7a6400c8ea812a8..64e94a764799e2a870057fbf531774a2a0fbe481 100644 (file)
--- a/hw/misc/iotkit-secctl.c
+++ b/hw/misc/iotkit-secctl.c
@@ -20,7 +20,7 @@
 #include "hw/core/irq.h"
 #include "hw/misc/iotkit-secctl.h"
 #include "hw/arm/armsse-version.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 
 /* Registers in the secure privilege control block */
 REG32(SECRESPCFG, 0x10)

diff --git a/hw/misc/iotkit-sysctl.c b/hw/misc/iotkit-sysctl.c
index d70e51ab2ec3315cd84b8f9bbcd976211102912c..a9c3568c216df307ae591d61f96bdb368febcec0 100644 (file)
--- a/hw/misc/iotkit-sysctl.c
+++ b/hw/misc/iotkit-sysctl.c
@@ -27,7 +27,7 @@
 #include "migration/vmstate.h"
 #include "hw/registerfields.h"
 #include "hw/misc/iotkit-sysctl.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/arm/armsse-version.h"
 #include "target/arm/arm-powerctl.h"
 

diff --git a/hw/misc/iotkit-sysinfo.c b/hw/misc/iotkit-sysinfo.c
index 57405cb7e17aac214e545b4cb1a2bd7a7104d09d..a53b1f51802336996b373ee92657c5b4278f2d08 100644 (file)
--- a/hw/misc/iotkit-sysinfo.c
+++ b/hw/misc/iotkit-sysinfo.c
@@ -25,7 +25,7 @@
 #include "hw/sysbus.h"
 #include "hw/registerfields.h"
 #include "hw/misc/iotkit-sysinfo.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/arm/armsse-version.h"
 
 REG32(SYS_VERSION, 0x0)

diff --git a/hw/misc/ivshmem-pci.c b/hw/misc/ivshmem-pci.c
index 636d0b83dee540137832ff934ebf1dbcc7f9e9b0..fb69af52f62d8e43a6e448f74309b548bef77926 100644 (file)
--- a/hw/misc/ivshmem-pci.c
+++ b/hw/misc/ivshmem-pci.c
@@ -22,7 +22,7 @@
 #include "qapi/error.h"
 #include "qemu/cutils.h"
 #include "hw/pci/pci.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/pci/msi.h"
 #include "hw/pci/msix.h"

diff --git a/hw/misc/led.c b/hw/misc/led.c
index f7f709072af7219e0c56939aee145e284aa2b41e..d9256aaaf568da704b34d9b9c2a49673f3f9ec75 100644 (file)
--- a/hw/misc/led.c
+++ b/hw/misc/led.c
@@ -8,7 +8,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "migration/vmstate.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/misc/led.h"
 #include "trace.h"
 

diff --git a/hw/misc/mac_via.c b/hw/misc/mac_via.c
index 13ccd3023fb359ab86d57320c510a7fdc33fdf75..887397ae84223d33c6d13cfebcee9725ccabf2f7 100644 (file)
--- a/hw/misc/mac_via.c
+++ b/hw/misc/mac_via.c
@@ -27,7 +27,7 @@
 #include "system/runstate.h"
 #include "qapi/error.h"
 #include "qemu/cutils.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "system/block-backend.h"
 #include "system/rtc.h"

diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c
index 3b8dd462f5682dae926ec9c4ff780a18911cab28..312dde242baa49e0c56add11122efbf3fc6fc3b9 100644 (file)
--- a/hw/misc/macio/cuda.c
+++ b/hw/misc/macio/cuda.c
@@ -25,7 +25,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/misc/macio/cuda.h"
 #include "qemu/timer.h"

diff --git a/hw/misc/macio/gpio.c b/hw/misc/macio/gpio.c
index 77658cb6d02c0115c7ebb9c31e4c706c748f183a..1a7c534d65299a2ab7f615f9cfa19fb0cdc6f66e 100644 (file)
--- a/hw/misc/macio/gpio.c
+++ b/hw/misc/macio/gpio.c
@@ -24,7 +24,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/misc/macio/macio.h"
 #include "hw/misc/macio/gpio.h"

diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c
index 6710485d72866eea4f0fe10677d34a1bd76e34f3..2813705c03ba2da012b4caa3250ff4242411b940 100644 (file)
--- a/hw/misc/macio/macio.c
+++ b/hw/misc/macio/macio.c
@@ -29,7 +29,7 @@
 #include "hw/misc/macio/cuda.h"
 #include "hw/pci/pci.h"
 #include "hw/ppc/mac_dbdma.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/char/escc.h"
 #include "hw/misc/macio/macio.h"

diff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c
index 73e64306b8600d0e68889141a558e3264d00cca8..04640c20e0a23f56e33005ff4b858eff089e2e29 100644 (file)
--- a/hw/misc/macio/pmu.c
+++ b/hw/misc/macio/pmu.c
@@ -29,7 +29,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/core/irq.h"
 #include "hw/misc/macio/pmu.h"

diff --git a/hw/misc/max78000_gcr.c b/hw/misc/max78000_gcr.c
index 6d2e2bd617692f4506a1997b68449453516a8082..e8dc59373294a563c3a2da6f50e48fa912cc523f 100644 (file)
--- a/hw/misc/max78000_gcr.c
+++ b/hw/misc/max78000_gcr.c
@@ -12,7 +12,7 @@
 #include "hw/core/irq.h"
 #include "system/runstate.h"
 #include "migration/vmstate.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/char/max78000_uart.h"
 #include "hw/misc/max78000_trng.h"
 #include "hw/misc/max78000_aes.h"

diff --git a/hw/misc/mips_cmgcr.c b/hw/misc/mips_cmgcr.c
index 5484b7396743b1b45acaf58b796f8249d82a68b1..1c6e9d1f6f03d5d563e2f8c0145c1819f7faf0ef 100644 (file)
--- a/hw/misc/mips_cmgcr.c
+++ b/hw/misc/mips_cmgcr.c
@@ -16,7 +16,7 @@
 #include "migration/vmstate.h"
 #include "hw/misc/mips_cmgcr.h"
 #include "hw/misc/mips_cpc.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/intc/mips_gic.h"
 
 static inline bool is_cpc_connected(MIPSGCRState *s)

diff --git a/hw/misc/mips_cpc.c b/hw/misc/mips_cpc.c
index 9bfb7c972199336f4b7bd898e9af826c40d792b6..efc0326f6f251170d5f53f79ef58280d2028fb3b 100644 (file)
--- a/hw/misc/mips_cpc.c
+++ b/hw/misc/mips_cpc.c
@@ -26,7 +26,7 @@
 #include "migration/vmstate.h"
 
 #include "hw/misc/mips_cpc.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 
 static inline uint64_t cpc_vp_run_mask(MIPSCPCState *cpc)
 {

diff --git a/hw/misc/mips_itu.c b/hw/misc/mips_itu.c
index fc17385cde765dc614d259564592315c627c8392..82c0a90f704f71bb8cc27a087f7807c3e0876ce0 100644 (file)
--- a/hw/misc/mips_itu.c
+++ b/hw/misc/mips_itu.c
@@ -24,7 +24,7 @@
 #include "qapi/error.h"
 #include "hw/core/cpu.h"
 #include "hw/misc/mips_itu.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "target/mips/cpu.h"
 
 #define ITC_TAG_ADDRSPACE_SZ (ITC_ADDRESSMAP_NUM * 8)

diff --git a/hw/misc/mos6522.c b/hw/misc/mos6522.c
index 728931883d8d15175d9e11d40679995536f0f9c2..bae766ef1782af2f331b876817d9244201353892 100644 (file)
--- a/hw/misc/mos6522.c
+++ b/hw/misc/mos6522.c
@@ -27,7 +27,7 @@
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
 #include "hw/misc/mos6522.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "monitor/monitor.h"
 #include "monitor/hmp.h"

diff --git a/hw/misc/mps2-fpgaio.c b/hw/misc/mps2-fpgaio.c
index bee1309f5a6c78d28d95dd791a5499750e31d243..f3d51fd22862372dda20945645c28e6d48393faf 100644 (file)
--- a/hw/misc/mps2-fpgaio.c
+++ b/hw/misc/mps2-fpgaio.c
@@ -25,7 +25,7 @@
 #include "hw/registerfields.h"
 #include "hw/misc/mps2-fpgaio.h"
 #include "hw/misc/led.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qemu/timer.h"
 
 REG32(LED0, 0)

diff --git a/hw/misc/mps2-scc.c b/hw/misc/mps2-scc.c
index ea9cad85dc2295e762953c0999028a179e41421d..56aa01350729312f86df4d8025eb935ddfb1015d 100644 (file)
--- a/hw/misc/mps2-scc.c
+++ b/hw/misc/mps2-scc.c
@@ -28,7 +28,7 @@
 #include "hw/registerfields.h"
 #include "hw/misc/mps2-scc.h"
 #include "hw/misc/led.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 
 REG32(CFG0, 0)
 REG32(CFG1, 4)

diff --git a/hw/misc/msf2-sysreg.c b/hw/misc/msf2-sysreg.c
index ce0ad50c1beb631fcb930ed507052ff739604983..90c786e95ad162a87f867e59aea95b0fc9895361 100644 (file)
--- a/hw/misc/msf2-sysreg.c
+++ b/hw/misc/msf2-sysreg.c
@@ -17,7 +17,7 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "hw/misc/msf2-sysreg.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qemu/error-report.h"
 #include "trace.h"

diff --git a/hw/misc/npcm7xx_mft.c b/hw/misc/npcm7xx_mft.c
index 0bbae111cf95d940ddff233896ec443cadb73521..21e74385c716f7174dfba5f0b4bf55b891709cd8 100644 (file)
--- a/hw/misc/npcm7xx_mft.c
+++ b/hw/misc/npcm7xx_mft.c
@@ -17,7 +17,7 @@
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-clock.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/misc/npcm7xx_mft.h"
 #include "hw/misc/npcm7xx_pwm.h"
 #include "hw/registerfields.h"

diff --git a/hw/misc/npcm7xx_pwm.c b/hw/misc/npcm7xx_pwm.c
index 39ac0dbe2a54f329611a5e9d3fb3f8aab2319e3c..1b010e51ec0e39d047d21aa839c5d4020ee3e69f 100644 (file)
--- a/hw/misc/npcm7xx_pwm.c
+++ b/hw/misc/npcm7xx_pwm.c
@@ -17,7 +17,7 @@
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-clock.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/misc/npcm7xx_pwm.h"
 #include "hw/registerfields.h"
 #include "migration/vmstate.h"

diff --git a/hw/misc/npcm_gcr.c b/hw/misc/npcm_gcr.c
index 2acaa16771397f6baac05a0e082c64a9c75f423a..2d7e5b5a015c462622ed03696bcedde7c3f23c6c 100644 (file)
--- a/hw/misc/npcm_gcr.c
+++ b/hw/misc/npcm_gcr.c
@@ -17,7 +17,7 @@
 #include "qemu/osdep.h"
 
 #include "hw/misc/npcm_gcr.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"
 #include "qemu/cutils.h"

diff --git a/hw/misc/nrf51_rng.c b/hw/misc/nrf51_rng.c
index 0254fb377a625f9e02d55a806ad49f5231410423..37c832d976cec6b78f5ef465ba0e576ecde03706 100644 (file)
--- a/hw/misc/nrf51_rng.c
+++ b/hw/misc/nrf51_rng.c
@@ -16,7 +16,7 @@
 #include "hw/arm/nrf51.h"
 #include "hw/core/irq.h"
 #include "hw/misc/nrf51_rng.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qemu/guest-random.h"
 

diff --git a/hw/misc/pci-testdev.c b/hw/misc/pci-testdev.c
index ba71c5069ff81621b5f20082668864e7f1aa52ed..3c3887afe0d20a4af37a72f6667dd866ef259e31 100644 (file)
--- a/hw/misc/pci-testdev.c
+++ b/hw/misc/pci-testdev.c
@@ -20,7 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/pci/pci_device.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qemu/event_notifier.h"
 #include "qemu/module.h"
 #include "system/kvm.h"

diff --git a/hw/misc/pvpanic-isa.c b/hw/misc/pvpanic-isa.c
index f7b421c713bd170455756b6266f93d6410e33817..85fb7da5e5c03e12a1d7a2e4c949688249b9de0c 100644 (file)
--- a/hw/misc/pvpanic-isa.c
+++ b/hw/misc/pvpanic-isa.c
@@ -17,7 +17,7 @@
 #include "system/runstate.h"
 
 #include "hw/nvram/fw_cfg.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/misc/pvpanic.h"
 #include "qom/object.h"
 #include "hw/isa/isa.h"

diff --git a/hw/misc/pvpanic-mmio.c b/hw/misc/pvpanic-mmio.c
index 2a363106b2da07ce2354e48c838c5d85bd4d7ad3..2d1464435a8e431af6d91d00d90226c07a00684c 100644 (file)
--- a/hw/misc/pvpanic-mmio.c
+++ b/hw/misc/pvpanic-mmio.c
@@ -8,7 +8,7 @@
 
 #include "qemu/osdep.h"
 
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/misc/pvpanic.h"
 #include "hw/sysbus.h"
 #include "standard-headers/misc/pvpanic.h"

diff --git a/hw/misc/pvpanic-pci.c b/hw/misc/pvpanic-pci.c
index 2869b6a7ff83429c247f523e987bec705386e441..5509f70a3e5dab0fcad8ecf12b7f23080ac1dd2c 100644 (file)
--- a/hw/misc/pvpanic-pci.c
+++ b/hw/misc/pvpanic-pci.c
@@ -16,7 +16,7 @@
 #include "system/runstate.h"
 
 #include "hw/nvram/fw_cfg.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/misc/pvpanic.h"
 #include "qom/object.h"

diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c
index c83247c4087910b3aceca607559a4521e17b0c72..bbd06d9accd74b8722b37d443d4b7c95380c6c2f 100644 (file)
--- a/hw/misc/pvpanic.c
+++ b/hw/misc/pvpanic.c
@@ -18,7 +18,7 @@
 #include "system/runstate.h"
 
 #include "hw/nvram/fw_cfg.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/misc/pvpanic.h"
 #include "qom/object.h"
 #include "standard-headers/misc/pvpanic.h"

diff --git a/hw/misc/sifive_e_aon.c b/hw/misc/sifive_e_aon.c
index 9b1e7baf95ee102986c7aa8e6d0c6f9e922de36e..4d6e015ca383fda681802fffaa9e55604641ec39 100644 (file)
--- a/hw/misc/sifive_e_aon.c
+++ b/hw/misc/sifive_e_aon.c
@@ -25,7 +25,7 @@
 #include "qapi/visitor.h"
 #include "qapi/error.h"
 #include "system/watchdog.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 
 REG32(AON_WDT_WDOGCFG, 0x0)
     FIELD(AON_WDT_WDOGCFG, SCALE, 0, 4)

diff --git a/hw/misc/sifive_u_otp.c b/hw/misc/sifive_u_otp.c
index 1ebed2fd8b4396dbb9115cb60bb47c8b0b08aa96..1d352680468046000e051d87c440019ebe1345f0 100644 (file)
--- a/hw/misc/sifive_u_otp.c
+++ b/hw/misc/sifive_u_otp.c
@@ -20,7 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/sysbus.h"
 #include "qemu/error-report.h"

diff --git a/hw/misc/stm32l4x5_rcc.c b/hw/misc/stm32l4x5_rcc.c
index 1b012d1cc1eb3406c6c239712b7fd343e3069dcc..c2b25e9a4defba3ec66164db5be7f25ba62abf4a 100644 (file)
--- a/hw/misc/stm32l4x5_rcc.c
+++ b/hw/misc/stm32l4x5_rcc.c
@@ -26,7 +26,7 @@
 #include "hw/core/clock.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-clock.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/registerfields.h"
 #include "trace.h"

diff --git a/hw/misc/tz-mpc.c b/hw/misc/tz-mpc.c
index d922639da1771e30f16feaedc5ce7e685eaf8a49..fb5d232bff530e7c45d16145d745082c3681b270 100644 (file)
--- a/hw/misc/tz-mpc.c
+++ b/hw/misc/tz-mpc.c
@@ -19,7 +19,7 @@
 #include "hw/registerfields.h"
 #include "hw/core/irq.h"
 #include "hw/misc/tz-mpc.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 
 /* Our IOMMU has two IOMMU indexes, one for secure transactions and one for
  * non-secure transactions.

diff --git a/hw/misc/tz-msc.c b/hw/misc/tz-msc.c
index 74c31f6d7d21c9510fc434e50664e1d21a91c6c1..3e33455d421b5024c13abf9942f397e8984dfc95 100644 (file)
--- a/hw/misc/tz-msc.c
+++ b/hw/misc/tz-msc.c
@@ -19,7 +19,7 @@
 #include "hw/registerfields.h"
 #include "hw/core/irq.h"
 #include "hw/misc/tz-msc.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 
 static void tz_msc_update_irq(TZMSC *s)
 {

diff --git a/hw/misc/tz-ppc.c b/hw/misc/tz-ppc.c
index 2ab03fa9730db82c1dcf298ce26fb7b74f030040..a41c6011fbadc6c2aee14c6e98e9aab5d7350588 100644 (file)
--- a/hw/misc/tz-ppc.c
+++ b/hw/misc/tz-ppc.c
@@ -19,7 +19,7 @@
 #include "hw/registerfields.h"
 #include "hw/core/irq.h"
 #include "hw/misc/tz-ppc.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 
 static void tz_ppc_update_irq(TZPPC *s)
 {

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

diff --git a/hw/misc/xlnx-versal-cframe-reg.c b/hw/misc/xlnx-versal-cframe-reg.c
index 616c0ecf837b2252cb0d93ca637bdca8716a8f1f..33a4ece26f6cf2907ff2f5653103d16f6fb27fe9 100644 (file)
--- a/hw/misc/xlnx-versal-cframe-reg.c
+++ b/hw/misc/xlnx-versal-cframe-reg.c
@@ -16,7 +16,7 @@
 #include "qemu/log.h"
 #include "qemu/units.h"
 #include "qapi/error.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/core/irq.h"
 #include "hw/misc/xlnx-versal-cframe-reg.h"

diff --git a/hw/misc/xlnx-versal-cfu.c b/hw/misc/xlnx-versal-cfu.c
index ce58404eb2cbfa1c770b0d5328893867d3671dcb..80f9612b2ff54634a16c6d3113b34dcf910eb32e 100644 (file)
--- a/hw/misc/xlnx-versal-cfu.c
+++ b/hw/misc/xlnx-versal-cfu.c
@@ -18,7 +18,7 @@
 #include "qemu/log.h"
 #include "qemu/units.h"
 #include "migration/vmstate.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/misc/xlnx-versal-cfu.h"
 

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

diff --git a/hw/misc/xlnx-versal-pmc-iou-slcr.c b/hw/misc/xlnx-versal-pmc-iou-slcr.c
index c75800c1b3cca7e8542068b1cc138c33daea67bf..84d474c38fc8b66d328cb3da392934dfa0141bdc 100644 (file)
--- a/hw/misc/xlnx-versal-pmc-iou-slcr.c
+++ b/hw/misc/xlnx-versal-pmc-iou-slcr.c
@@ -30,7 +30,7 @@
 #include "qemu/bitops.h"
 #include "qemu/log.h"
 #include "migration/vmstate.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/misc/xlnx-versal-pmc-iou-slcr.h"
 
 #ifndef XILINX_VERSAL_PMC_IOU_SLCR_ERR_DEBUG

diff --git a/hw/misc/xlnx-versal-trng.c b/hw/misc/xlnx-versal-trng.c
index 2b573a45bdb26ea513144b234e18ccc0ea35aa40..aa1d65de7b70e2b7c8e6b7299cca2d26a151aad4 100644 (file)
--- a/hw/misc/xlnx-versal-trng.c
+++ b/hw/misc/xlnx-versal-trng.c
@@ -35,7 +35,7 @@
 #include "qemu/timer.h"
 #include "qapi/visitor.h"
 #include "migration/vmstate.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 
 #ifndef XLNX_VERSAL_TRNG_ERR_DEBUG
 #define XLNX_VERSAL_TRNG_ERR_DEBUG 0

diff --git a/hw/misc/xlnx-versal-xramc.c b/hw/misc/xlnx-versal-xramc.c
index af58bc761f319d5f491c8c6349056fcdc6b0be4b..6a86f6b5d4832adee7362a35cf42ec8c0267e7bf 100644 (file)
--- a/hw/misc/xlnx-versal-xramc.c
+++ b/hw/misc/xlnx-versal-xramc.c
@@ -12,7 +12,7 @@
 #include "migration/vmstate.h"
 #include "hw/sysbus.h"
 #include "hw/register.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/core/irq.h"
 #include "hw/misc/xlnx-versal-xramc.h"
 

diff --git a/hw/misc/xlnx-zynqmp-apu-ctrl.c b/hw/misc/xlnx-zynqmp-apu-ctrl.c
index 196e2452ae3a3a5b7280dbbc40fa65fb636acbd6..93f0bedc48eae2c753355c3d26e8c4e0f32b1fe5 100644 (file)
--- a/hw/misc/xlnx-zynqmp-apu-ctrl.c
+++ b/hw/misc/xlnx-zynqmp-apu-ctrl.c
@@ -12,7 +12,7 @@
 #include "qapi/error.h"
 #include "qemu/log.h"
 #include "migration/vmstate.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "hw/core/irq.h"
 #include "hw/register.h"

diff --git a/hw/misc/zynq_slcr.c b/hw/misc/zynq_slcr.c
index cc18b21b22b2c1b046ebf9289a469ad43879e9f4..d1900a2b9485ce1f593ab31830cf9b6b0d434740 100644 (file)
--- a/hw/misc/zynq_slcr.c
+++ b/hw/misc/zynq_slcr.c
@@ -24,7 +24,7 @@
 #include "hw/registerfields.h"
 #include "hw/core/qdev-clock.h"
 #include "qom/object.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
 
 #ifndef ZYNQ_SLCR_ERR_DEBUG

diff --git a/hw/net/allwinner-sun8i-emac.c b/hw/net/allwinner-sun8i-emac.c
index a4824d61bdad3187adb6f0b9fd1a0cd209889531..8ff0db5ccdcc33b2ecd5163aca31a39b4ad62b54 100644 (file)
--- a/hw/net/allwinner-sun8i-emac.c
+++ b/hw/net/allwinner-sun8i-emac.c
@@ -24,7 +24,7 @@
 #include "migration/vmstate.h"
 #include "net/net.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qemu/log.h"
 #include "trace.h"
 #include "net/checksum.h"

diff --git a/hw/net/allwinner_emac.c b/hw/net/allwinner_emac.c
index 9158c77cb4fbbea7103d466fd1727306d2b36b25..cbe4cb80e4a1a7dc3aacaf7bc00efd7cd475138f 100644 (file)
--- a/hw/net/allwinner_emac.c
+++ b/hw/net/allwinner_emac.c
@@ -24,7 +24,7 @@
 #include "qemu/fifo8.h"
 #include "hw/core/irq.h"
 #include "hw/net/allwinner_emac.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include <zlib.h>

diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c
index ef72821f8d7cbdb0dbce2cf4e28f26b4d2c24904..fe9747fdb6f7884d1cf0076a590b98bbef6b0ad2 100644 (file)
--- a/hw/net/cadence_gem.c
+++ b/hw/net/cadence_gem.c
@@ -27,7 +27,7 @@
 
 #include "hw/core/irq.h"
 #include "hw/net/cadence_gem.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/registerfields.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"

diff --git a/hw/net/can/can_kvaser_pci.c b/hw/net/can/can_kvaser_pci.c
index 52584c5d6facc05277f1efebac71d33a40ef870c..f2912b206da8d496c3d454bbac323661917e1b3f 100644 (file)
--- a/hw/net/can/can_kvaser_pci.c
+++ b/hw/net/can/can_kvaser_pci.c
@@ -34,7 +34,7 @@
 #include "qapi/error.h"
 #include "hw/core/irq.h"
 #include "hw/pci/pci_device.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "net/can_emu.h"
 

diff --git a/hw/net/can/can_mioe3680_pci.c b/hw/net/can/can_mioe3680_pci.c
index 2e9e09741b2a41ac421dd5111bd171f1f1be50a1..fe1a91ee0e7775c32b428f8b9ec13339064bc134 100644 (file)
--- a/hw/net/can/can_mioe3680_pci.c
+++ b/hw/net/can/can_mioe3680_pci.c
@@ -30,7 +30,7 @@
 #include "qapi/error.h"
 #include "hw/core/irq.h"
 #include "hw/pci/pci_device.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "net/can_emu.h"
 

diff --git a/hw/net/can/can_pcm3680_pci.c b/hw/net/can/can_pcm3680_pci.c
index 7dd23c905e53bb32c31b657ad19e123342fd1e5b..ea45de28a8286dfbecff7ddea06fba1c9f8dd1cc 100644 (file)
--- a/hw/net/can/can_pcm3680_pci.c
+++ b/hw/net/can/can_pcm3680_pci.c
@@ -30,7 +30,7 @@
 #include "qapi/error.h"
 #include "hw/core/irq.h"
 #include "hw/pci/pci_device.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "net/can_emu.h"
 

diff --git a/hw/net/can/ctucan_pci.c b/hw/net/can/ctucan_pci.c
index ad2b1e60cb46a7bc9000a0f159955da0deb1fc51..40654778a45dde4aebd3e89043002a7e015551a3 100644 (file)
--- a/hw/net/can/ctucan_pci.c
+++ b/hw/net/can/ctucan_pci.c
@@ -31,7 +31,7 @@
 #include "qapi/error.h"
 #include "hw/core/irq.h"
 #include "hw/pci/pci_device.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "net/can_emu.h"
 

diff --git a/hw/net/can/xlnx-versal-canfd.c b/hw/net/can/xlnx-versal-canfd.c
index 073427955757635a6a9d299f68cb54cdf4362d6a..94d9178a540001c1f93374e679c500f22f9566a0 100644 (file)
--- a/hw/net/can/xlnx-versal-canfd.c
+++ b/hw/net/can/xlnx-versal-canfd.c
@@ -36,7 +36,7 @@
 #include "hw/register.h"
 #include "qapi/error.h"
 #include "qemu/log.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/net/xlnx-versal-canfd.h"
 #include "trace.h"

diff --git a/hw/net/can/xlnx-zynqmp-can.c b/hw/net/can/xlnx-zynqmp-can.c
index a98b208169fe6d68ba506d0586da75de0749070e..533ac854a2fc477f9749a85bb4d868651dab112b 100644 (file)
--- a/hw/net/can/xlnx-zynqmp-can.c
+++ b/hw/net/can/xlnx-zynqmp-can.c
@@ -38,7 +38,7 @@
 #include "qemu/log.h"
 #include "qemu/cutils.h"
 #include "migration/vmstate.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "net/can_emu.h"
 #include "net/can_host.h"
 #include "qemu/event_notifier.h"

diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c
index 68062481c596197218b0491ebbfdf55471f70016..182f0e5f6b1c2c5295efffd1fa14e84ea2cbf81a 100644 (file)
--- a/hw/net/dp8393x.c
+++ b/hw/net/dp8393x.c
@@ -19,7 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/net/dp8393x.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"

diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index a80a7b0cdb40e6b251588639beef60e5f5d4d39f..202ad404013ae014caa9a95734238d9581ca23b1 100644 (file)
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -28,7 +28,7 @@
 #include "qemu/osdep.h"
 #include "hw/net/mii.h"
 #include "hw/pci/pci_device.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "net/eth.h"
 #include "net/net.h"

diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c
index 89e6d52ba0f28415a4642d7aac2cdb405f90574e..3d4683370c6428a72bdd19ef5812ec99ccaba6bf 100644 (file)
--- a/hw/net/e1000e.c
+++ b/hw/net/e1000e.c
@@ -45,7 +45,7 @@
 #include "hw/net/mii.h"
 #include "hw/pci/msi.h"
 #include "hw/pci/msix.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 
 #include "e1000_common.h"

diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c
index d47df5a97fd1df7c8a2cc1e5b10113dfbb7bc1b8..aaa3eb60f8ab3dab99d30331f8e5fe7b1f31212f 100644 (file)
--- a/hw/net/eepro100.c
+++ b/hw/net/eepro100.c
@@ -45,7 +45,7 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "hw/pci/pci_device.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "net/net.h"
 #include "net/eth.h"

diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c
index e6a29d9ec6d051e36b313ded3ddaa015ec176a01..5b77528e365e3101d864217ea94e3faa356433b3 100644 (file)
--- a/hw/net/fsl_etsec/etsec.c
+++ b/hw/net/fsl_etsec/etsec.c
@@ -31,7 +31,7 @@
 #include "hw/core/irq.h"
 #include "hw/net/mii.h"
 #include "hw/core/ptimer.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "etsec.h"
 #include "registers.h"
 #include "qapi/error.h"

diff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c
index d5590391b7fc8a1942289f8e97c4bcb0193491a3..d29f7dcd171bfde9f3ee3dce27436faf6bf62c4a 100644 (file)
--- a/hw/net/ftgmac100.c
+++ b/hw/net/ftgmac100.c
@@ -21,7 +21,7 @@
 #include "net/checksum.h"
 #include "net/eth.h"
 #include "hw/net/mii.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 
 #include <zlib.h> /* for crc32 */

diff --git a/hw/net/i82596.c b/hw/net/i82596.c
index a94cfa2d6df5b4c26f7f59953f3ff6238a290516..37ce20efb193669d47b8cf07420a7401659cc91e 100644 (file)
--- a/hw/net/i82596.c
+++ b/hw/net/i82596.c
@@ -41,7 +41,7 @@
 #include "net/net.h"
 #include "net/eth.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "system/address-spaces.h"
 #include "qemu/module.h"

diff --git a/hw/net/igb.c b/hw/net/igb.c
index e4c02365d6724692cc9d8edfbab2331fe81ff0e5..d39eba9f64dccbd1882be83e5e205326df6a90da 100644 (file)
--- a/hw/net/igb.c
+++ b/hw/net/igb.c
@@ -52,7 +52,7 @@
 #include "hw/pci/pcie_sriov.h"
 #include "hw/pci/msi.h"
 #include "hw/pci/msix.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 
 #include "igb_common.h"

diff --git a/hw/net/imx_fec.c b/hw/net/imx_fec.c
index 386d24421cb25827d9bcad8a4ee43b9d4f086e18..c177b7ff2b7be15313e9b0c79719170a1bde88c1 100644 (file)
--- a/hw/net/imx_fec.c
+++ b/hw/net/imx_fec.c
@@ -24,7 +24,7 @@
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
 #include "hw/net/imx_fec.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "system/dma.h"
 #include "qemu/log.h"

diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c
index 191fd8b421bbefae346d528dd0eb1ebec249d010..381fd3876412fa1d84612735e587cd54dbff854a 100644 (file)
--- a/hw/net/lan9118.c
+++ b/hw/net/lan9118.c
@@ -19,7 +19,7 @@
 #include "hw/net/lan9118_phy.h"
 #include "hw/net/lan9118.h"
 #include "hw/core/ptimer.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
 #include "qemu/bswap.h"
 #include "qemu/log.h"

diff --git a/hw/net/lance.c b/hw/net/lance.c
index dfb855c23a42d881c465d7100b8d13dcad6a1cc4..5d5bf9b96167631380047a9aa13f7f3cd118d116 100644 (file)
--- a/hw/net/lance.c
+++ b/hw/net/lance.c
@@ -41,7 +41,7 @@
 #include "hw/sparc/sparc32_dma.h"
 #include "migration/vmstate.h"
 #include "hw/net/lance.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "trace.h"
 #include "system/system.h"
 

diff --git a/hw/net/lasi_i82596.c b/hw/net/lasi_i82596.c
index 2f212a7ed38384b523b596d49e0e3c2902558e8e..50e3c4fa86d0bdc6f11e668fad19eeb918250a9e 100644 (file)
--- a/hw/net/lasi_i82596.c
+++ b/hw/net/lasi_i82596.c
@@ -19,7 +19,7 @@
 #include "hw/net/lasi_82596.h"
 #include "hw/net/i82596.h"
 #include "trace.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 
 #define PA_I82596_RESET         0       /* Offsets relative to LASI-LAN-Addr.*/

diff --git a/hw/net/mcf_fec.c b/hw/net/mcf_fec.c
index 9cd94369859f358b5616e5bf519d6b671083d656..ecf105adf2e5aa4f204e84802ff33c1264e12cde 100644 (file)
--- a/hw/net/mcf_fec.c
+++ b/hw/net/mcf_fec.c
@@ -14,7 +14,7 @@
 #include "hw/m68k/mcf.h"
 #include "hw/m68k/mcf_fec.h"
 #include "hw/net/mii.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/sysbus.h"
 #include <zlib.h> /* for crc32 */
 

diff --git a/hw/net/msf2-emac.c b/hw/net/msf2-emac.c
index 3e279209628497ce35205b1d1fad46f259f41afa..ac01d1ce472c1277b70f6c1b7c40732e9a664e6e 100644 (file)
--- a/hw/net/msf2-emac.c
+++ b/hw/net/msf2-emac.c
@@ -35,7 +35,7 @@
 #include "hw/net/msf2-emac.h"
 #include "hw/net/mii.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 
 REG32(CFG1, 0x0)

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

diff --git a/hw/net/ne2000-pci.c b/hw/net/ne2000-pci.c
index 7b215eb1f2e43322ec19851bb4e2cd70f8f38d57..f741478101d63920764412c75fec5ffcb4188801 100644 (file)
--- a/hw/net/ne2000-pci.c
+++ b/hw/net/ne2000-pci.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
 #include "hw/pci/pci_device.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "ne2000.h"
 #include "system/system.h"

diff --git a/hw/net/npcm7xx_emc.c b/hw/net/npcm7xx_emc.c
index 704f4387684c89240737694ce4be9dba600e47ee..4105e8942971340de3cacf37a860b6653cc3e600 100644 (file)
--- a/hw/net/npcm7xx_emc.c
+++ b/hw/net/npcm7xx_emc.c
@@ -33,7 +33,7 @@
 
 #include "hw/core/irq.h"
 #include "hw/core/qdev-clock.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/net/npcm7xx_emc.h"
 #include "net/eth.h"
 #include "migration/vmstate.h"

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

diff --git a/hw/net/pcnet-pci.c b/hw/net/pcnet-pci.c
index dad5d2ab06db485837f7f2781a63f7e3d296e275..bef608959a67c7b2d23e122d68bef174587378ac 100644 (file)
--- a/hw/net/pcnet-pci.c
+++ b/hw/net/pcnet-pci.c
@@ -30,7 +30,7 @@
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
 #include "hw/pci/pci_device.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "net/net.h"
 #include "qemu/module.h"

diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c
index fc2ce5eeb2da73115d12e589243daf8b87099be3..0bd7d4314e7124bc65f859d791ab7b9990bd6c75 100644 (file)
--- a/hw/net/pcnet.c
+++ b/hw/net/pcnet.c
@@ -38,7 +38,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "net/net.h"
 #include "net/eth.h"

diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c
index cc49701dd3cbc551c1bfc3e5d57719cc4831643d..935e74fd7d17ef42370788c476c531ced774ec86 100644 (file)
--- a/hw/net/rocker/rocker.c
+++ b/hw/net/rocker/rocker.c
@@ -17,7 +17,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/pci/pci_device.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "migration/vmstate.h"
 #include "hw/pci/msix.h"

diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c
index 324fb932aaceeace2fcb18abfda61625f12d506e..9fd00574d29d671ec11e110456140aa148eea117 100644 (file)
--- a/hw/net/rtl8139.c
+++ b/hw/net/rtl8139.c
@@ -52,7 +52,7 @@
 #include <zlib.h> /* for crc32 */
 
 #include "hw/pci/pci_device.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "system/dma.h"
 #include "qemu/module.h"

diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c
index b1c675be6fc39a511d0be4f114106ff43224c854..e3bf3b0e726eb70340398cefe85d36f96e273e5b 100644 (file)
--- a/hw/net/smc91c111.c
+++ b/hw/net/smc91c111.c
@@ -14,7 +14,7 @@
 #include "hw/core/irq.h"
 #include "hw/net/smc91c111.h"
 #include "hw/registerfields.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/net/spapr_llan.c b/hw/net/spapr_llan.c
index f6f217d6320a5dfbe0e54c8c35ebf5877b1add55..550848307d16e4df77e371fa52fbf7a505f7e4e1 100644 (file)
--- a/hw/net/spapr_llan.c
+++ b/hw/net/spapr_llan.c
@@ -32,7 +32,7 @@
 #include "migration/vmstate.h"
 #include "hw/ppc/spapr.h"
 #include "hw/ppc/spapr_vio.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "system/system.h"
 #include "trace.h"
 

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

diff --git a/hw/net/sungem.c b/hw/net/sungem.c
index b405eb89fa5302ec4a414053f7f21839629931f4..308c2d0dbd02c75262fe652f1ba0d994a22948ba 100644 (file)
--- a/hw/net/sungem.c
+++ b/hw/net/sungem.c
@@ -9,7 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/pci/pci_device.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/net/sunhme.c b/hw/net/sunhme.c
index c2f7a8483daab2657fdcf0d08ec61c8602fa4d29..e2cd1b527100af19eafd9a895fd0b53bb2135cb9 100644 (file)
--- a/hw/net/sunhme.c
+++ b/hw/net/sunhme.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/pci/pci_device.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/net/mii.h"
 #include "net/net.h"

diff --git a/hw/net/tulip.c b/hw/net/tulip.c
index 5f9df76a74e99e24fa2cd7c7bdb75c91ed060822..bc7b18ed36d591286bfdc4cdb5ee621829b4f263 100644 (file)
--- a/hw/net/tulip.c
+++ b/hw/net/tulip.c
@@ -10,7 +10,7 @@
 #include "qemu/log.h"
 #include "hw/core/irq.h"
 #include "hw/pci/pci_device.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/nvram/eeprom93xx.h"
 #include "migration/vmstate.h"
 #include "system/system.h"

diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index ca813203d768fa5ac85219712b78a6949ab3fdc4..317f1ad23b14d200ce4fefe91c1726c469a44b0e 100644 (file)
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -33,7 +33,7 @@
 #include "hw/virtio/virtio-bus.h"
 #include "qapi/error.h"
 #include "qapi/qapi-events-net.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/qapi-types-migration.h"
 #include "qapi/qapi-events-migration.h"
 #include "hw/virtio/virtio-access.h"

diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
index 03732375a76d44af36d7ba64b24c47aefc11b10a..bae3a44cb0c9ea94cb8255947cc45406c11f44e8 100644 (file)
--- a/hw/net/vmxnet3.c
+++ b/hw/net/vmxnet3.c
@@ -18,7 +18,7 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "net/tap.h"
 #include "net/checksum.h"
 #include "system/system.h"

diff --git a/hw/net/xen_nic.c b/hw/net/xen_nic.c
index e7bdc732de0790b693b608d3d5c7554103e345b8..4ef1b7dd29a1a392e6c088875b3b23219c86c2ee 100644 (file)
--- a/hw/net/xen_nic.c
+++ b/hw/net/xen_nic.c
@@ -37,7 +37,7 @@
 
 #include "hw/xen/xen-backend.h"
 #include "hw/xen/xen-bus-helper.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 
 #include "hw/xen/interface/io/netif.h"

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

diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c
index c7cb257e62de65327a0cfe11ef16724cc17b3218..36047a51c00ac0633dfab62a25f16e1babcd510e 100644 (file)
--- a/hw/net/xilinx_axienet.c
+++ b/hw/net/xilinx_axienet.c
@@ -32,7 +32,7 @@
 #include "net/checksum.h"
 
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/stream.h"
 #include "qom/object.h"
 

diff --git a/hw/net/xilinx_ethlite.c b/hw/net/xilinx_ethlite.c
index 0d00e3cc0d99b6e263272791b0ba59a9202ccec0..39e64a46e26dad31c75c02241a1c93e98084efb5 100644 (file)
--- a/hw/net/xilinx_ethlite.c
+++ b/hw/net/xilinx_ethlite.c
@@ -33,7 +33,7 @@
 #include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/misc/unimp.h"
 #include "net/net.h"

diff --git a/hw/nvram/aspeed_otp.c b/hw/nvram/aspeed_otp.c
index dcf8ed3917e298444d4e635234a7d58b2b59ffcc..a60289000c37e41b2f03a087de6da75ebfb532e7 100644 (file)
--- a/hw/nvram/aspeed_otp.c
+++ b/hw/nvram/aspeed_otp.c
@@ -10,7 +10,7 @@
 #include "qemu/log.h"
 #include "qapi/error.h"
 #include "system/block-backend.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/nvram/aspeed_otp.h"
 #include "hw/nvram/trace.h"
 

diff --git a/hw/nvram/ds1225y.c b/hw/nvram/ds1225y.c
index 0945e36652e9963b4fe0564e1c347524b834b72a..512e5485187909216854c7a98b17f63ac29c1007 100644 (file)
--- a/hw/nvram/ds1225y.c
+++ b/hw/nvram/ds1225y.c
@@ -23,7 +23,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "trace.h"

diff --git a/hw/nvram/eeprom_at24c.c b/hw/nvram/eeprom_at24c.c
index 82ea97e552a15c8bcd38e38939b53545b01ad273..e947cf8a3b2e94e41209d949242c829ac14c4c5d 100644 (file)
--- a/hw/nvram/eeprom_at24c.c
+++ b/hw/nvram/eeprom_at24c.c
@@ -14,7 +14,7 @@
 #include "qemu/module.h"
 #include "hw/i2c/i2c.h"
 #include "hw/nvram/eeprom_at24c.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "system/block-backend.h"
 #include "qom/object.h"

diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index df07424e5537636413d91c7605fca009e08b393f..e5c35b0e2e403673b8f62546a22d92bf394884bc 100644 (file)
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -30,7 +30,7 @@
 #include "system/address-spaces.h"
 #include "hw/core/boards.h"
 #include "hw/nvram/fw_cfg.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "migration/qemu-file-types.h"
 #include "migration/vmstate.h"

diff --git a/hw/nvram/mac_nvram.c b/hw/nvram/mac_nvram.c
index 66526a229141c36e984f3b583d98e32793f4964c..b048db0777a3f88115aebb0e87f1c8d9db00955e 100644 (file)
--- a/hw/nvram/mac_nvram.c
+++ b/hw/nvram/mac_nvram.c
@@ -27,7 +27,7 @@
 #include "qapi/error.h"
 #include "hw/nvram/chrp_nvram.h"
 #include "hw/nvram/mac_nvram.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "system/block-backend.h"
 #include "migration/vmstate.h"

diff --git a/hw/nvram/nrf51_nvm.c b/hw/nvram/nrf51_nvm.c
index 23cc9fe9b3de2566a3f8d5c8458e7b4b15c1f404..b841ead579d7890517fb85b37c10f88fa5fb3467 100644 (file)
--- a/hw/nvram/nrf51_nvm.c
+++ b/hw/nvram/nrf51_nvm.c
@@ -23,7 +23,7 @@
 #include "qemu/module.h"
 #include "hw/arm/nrf51.h"
 #include "hw/nvram/nrf51_nvm.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 
 /*

diff --git a/hw/nvram/spapr_nvram.c b/hw/nvram/spapr_nvram.c
index d0ac4e5735fc84f692f9c9580d5beda53fd9a851..c9202ddfcd43b3f91074894bf7d8ff9b3ac77166 100644 (file)
--- a/hw/nvram/spapr_nvram.c
+++ b/hw/nvram/spapr_nvram.c
@@ -36,7 +36,7 @@
 #include "hw/nvram/chrp_nvram.h"
 #include "hw/ppc/spapr.h"
 #include "hw/ppc/spapr_vio.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "qom/object.h"
 

diff --git a/hw/nvram/xlnx-bbram.c b/hw/nvram/xlnx-bbram.c
index 22aefbc240d5158f32c05a792a081da629846502..aad445b9018360fc0af6a6f7ff827498f356fc2a 100644 (file)
--- a/hw/nvram/xlnx-bbram.c
+++ b/hw/nvram/xlnx-bbram.c
@@ -31,7 +31,7 @@
 #include "qapi/error.h"
 #include "system/blockdev.h"
 #include "migration/vmstate.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/nvram/xlnx-efuse.h"
 

diff --git a/hw/nvram/xlnx-efuse.c b/hw/nvram/xlnx-efuse.c
index 4c23f8b931275f7e2164abad237ecb9f5b202d2a..7eb156f941383c103526590644bb9d0651832cfc 100644 (file)
--- a/hw/nvram/xlnx-efuse.c
+++ b/hw/nvram/xlnx-efuse.c
@@ -31,7 +31,7 @@
 #include "qemu/log.h"
 #include "qapi/error.h"
 #include "system/blockdev.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 
 #define TBIT0_OFFSET     28

diff --git a/hw/nvram/xlnx-versal-efuse-cache.c b/hw/nvram/xlnx-versal-efuse-cache.c
index d4ec96a6264f9904454e16c26ae381854c41d78f..56c2def5f89c404799bbf75a2b98dd41d8999193 100644 (file)
--- a/hw/nvram/xlnx-versal-efuse-cache.c
+++ b/hw/nvram/xlnx-versal-efuse-cache.c
@@ -26,7 +26,7 @@
 #include "hw/nvram/xlnx-versal-efuse.h"
 
 #include "qemu/log.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 
 #define MR_SIZE 0xC00
 

diff --git a/hw/nvram/xlnx-versal-efuse-ctrl.c b/hw/nvram/xlnx-versal-efuse-ctrl.c
index 6f17f32a0c327ba1963d40d324eca33c553f65b0..b7dc0e49e5fe651ab5776a60397a721b177b1b86 100644 (file)
--- a/hw/nvram/xlnx-versal-efuse-ctrl.c
+++ b/hw/nvram/xlnx-versal-efuse-ctrl.c
@@ -29,7 +29,7 @@
 #include "qemu/log.h"
 #include "qapi/error.h"
 #include "migration/vmstate.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 
 #ifndef XLNX_VERSAL_EFUSE_CTRL_ERR_DEBUG
 #define XLNX_VERSAL_EFUSE_CTRL_ERR_DEBUG 0

diff --git a/hw/nvram/xlnx-zynqmp-efuse.c b/hw/nvram/xlnx-zynqmp-efuse.c
index ce35bb0cc1f72eb5470f84799c562da9067fa7cf..e6bc54fc6bda9f729612f963e3de51c37b7bcd59 100644 (file)
--- a/hw/nvram/xlnx-zynqmp-efuse.c
+++ b/hw/nvram/xlnx-zynqmp-efuse.c
@@ -31,7 +31,7 @@
 #include "qemu/log.h"
 #include "qapi/error.h"
 #include "migration/vmstate.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 
 #ifndef ZYNQMP_EFUSE_ERR_DEBUG
 #define ZYNQMP_EFUSE_ERR_DEBUG 0

diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c
index a42e7b5e271a0f72f0d9afd6b3b6aa8f2b0a8425..bafb877cc38c2694956aa414a7385b3684196aef 100644 (file)
--- a/hw/openrisc/openrisc_sim.c
+++ b/hw/openrisc/openrisc_sim.c
@@ -27,7 +27,7 @@
 #include "hw/char/serial-mm.h"
 #include "net/net.h"
 #include "hw/openrisc/boot.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "system/address-spaces.h"
 #include "system/device_tree.h"
 #include "system/system.h"

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

diff --git a/hw/pci-bridge/cxl_downstream.c b/hw/pci-bridge/cxl_downstream.c
index 1065245a8b87babef7b8a490b7e5cc97b4ae84e9..1265e40c395a3c6c20c8d4b67133e749e5965d46 100644 (file)
--- a/hw/pci-bridge/cxl_downstream.c
+++ b/hw/pci-bridge/cxl_downstream.c
@@ -13,7 +13,7 @@
 #include "hw/pci/msi.h"
 #include "hw/pci/pcie.h"
 #include "hw/pci/pcie_port.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/cxl/cxl.h"
 #include "qapi/error.h"

diff --git a/hw/pci-bridge/cxl_root_port.c b/hw/pci-bridge/cxl_root_port.c
index e6a4035d26c518230cdeae0859280964e27cbdfa..df359dee670507df38caccef3364098a60d51de9 100644 (file)
--- a/hw/pci-bridge/cxl_root_port.c
+++ b/hw/pci-bridge/cxl_root_port.c
@@ -23,7 +23,7 @@
 #include "hw/pci/pci_bridge.h"
 #include "hw/pci/pcie_port.h"
 #include "hw/pci/msi.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/sysbus.h"
 #include "qapi/error.h"

diff --git a/hw/pci-bridge/cxl_upstream.c b/hw/pci-bridge/cxl_upstream.c
index 208e0c6172e1f12315411a54b6f3ad4161bed64d..019c311bb5b46bf2107b3b17e86bebd6ce447a80 100644 (file)
--- a/hw/pci-bridge/cxl_upstream.c
+++ b/hw/pci-bridge/cxl_upstream.c
@@ -10,7 +10,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/pci/msi.h"
 #include "hw/pci/pcie.h"

diff --git a/hw/pci-bridge/gen_pcie_root_port.c b/hw/pci-bridge/gen_pcie_root_port.c
index d9078e783bf00ea79df5d877c93c3439559cccd8..fa1cf5e58fd6b133dc8e26cc3fa43ba2209e9981 100644 (file)
--- a/hw/pci-bridge/gen_pcie_root_port.c
+++ b/hw/pci-bridge/gen_pcie_root_port.c
@@ -15,7 +15,7 @@
 #include "qemu/module.h"
 #include "hw/pci/msix.h"
 #include "hw/pci/pcie_port.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "migration/vmstate.h"
 #include "qom/object.h"

diff --git a/hw/pci-bridge/pci_bridge_dev.c b/hw/pci-bridge/pci_bridge_dev.c
index cb4809f38b138cd6bc127231ed3a76c990b0e82f..0c1383562d94ce4964555210f065f13e69a89cdc 100644 (file)
--- a/hw/pci-bridge/pci_bridge_dev.c
+++ b/hw/pci-bridge/pci_bridge_dev.c
@@ -27,7 +27,7 @@
 #include "hw/pci/msi.h"
 #include "hw/pci/shpc.h"
 #include "hw/pci/slotid_cap.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "system/memory.h"
 #include "hw/pci/pci_bus.h"
 #include "hw/core/hotplug.h"

diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expander_bridge.c
index b3a5f16e22ae0fe30ea9f186574582d1d04ca9cd..08d40aa2eae933ea940d1ae38ca9be977307755a 100644 (file)
--- a/hw/pci-bridge/pci_expander_bridge.c
+++ b/hw/pci-bridge/pci_expander_bridge.c
@@ -16,7 +16,7 @@
 #include "hw/pci/pci_bus.h"
 #include "hw/pci/pci_host.h"
 #include "hw/pci/pcie_port.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/pci/pci_bridge.h"
 #include "hw/pci-bridge/pci_expander_bridge.h"
 #include "hw/cxl/cxl.h"

diff --git a/hw/pci-bridge/pcie_pci_bridge.c b/hw/pci-bridge/pcie_pci_bridge.c
index fce292a519bbaba4c115e39e67759e13d4556fae..e826fb2829fc4a38456f37f98cbb0e03774667e0 100644 (file)
--- a/hw/pci-bridge/pcie_pci_bridge.c
+++ b/hw/pci-bridge/pcie_pci_bridge.c
@@ -16,7 +16,7 @@
 #include "hw/pci/msi.h"
 #include "hw/pci/shpc.h"
 #include "hw/pci/slotid_cap.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qom/object.h"
 
 struct PCIEPCIBridge {

diff --git a/hw/pci-bridge/pcie_root_port.c b/hw/pci-bridge/pcie_root_port.c
index 22c2fdb71e79186919569eaf96ee236614a1ffd2..fe3ced56851a1bce2282a6f888dab9365066ee23 100644 (file)
--- a/hw/pci-bridge/pcie_root_port.c
+++ b/hw/pci-bridge/pcie_root_port.c
@@ -16,7 +16,7 @@
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "hw/pci/pcie_port.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 
 static void rp_aer_vector_update(PCIDevice *d)
 {

diff --git a/hw/pci-bridge/xio3130_downstream.c b/hw/pci-bridge/xio3130_downstream.c
index dc7d1aa7d77d6d2f77771ea1c4c060a1c61a6924..0c3fed3053b0e2b2ee2cf703c5f9e1f33ec1ff5b 100644 (file)
--- a/hw/pci-bridge/xio3130_downstream.c
+++ b/hw/pci-bridge/xio3130_downstream.c
@@ -24,7 +24,7 @@
 #include "hw/pci/msi.h"
 #include "hw/pci/pcie.h"
 #include "hw/pci/pcie_port.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"
 #include "qemu/module.h"

diff --git a/hw/pci-host/aspeed_pcie.c b/hw/pci-host/aspeed_pcie.c
index 5d837f638c2f64725abfb7af8b6a6d180688c30f..27f1078e3a504cf7998ec4286a13686936b73911 100644 (file)
--- a/hw/pci-host/aspeed_pcie.c
+++ b/hw/pci-host/aspeed_pcie.c
@@ -17,7 +17,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "qapi/error.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/registerfields.h"
 #include "hw/core/irq.h"
 #include "hw/pci/pci_host.h"

diff --git a/hw/pci-host/astro.c b/hw/pci-host/astro.c
index b54f6ef2d53d1d6b90819d560c776087dfa4da45..00a904277c0704c97e27219eba101b645a7a1ec8 100644 (file)
--- a/hw/pci-host/astro.c
+++ b/hw/pci-host/astro.c
@@ -28,7 +28,7 @@
 #include "hw/core/irq.h"
 #include "hw/pci/pci_device.h"
 #include "hw/pci/pci_bus.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/pci-host/astro.h"
 #include "hw/hppa/hppa_hardware.h"
 #include "migration/vmstate.h"

diff --git a/hw/pci-host/designware.c b/hw/pci-host/designware.c
index 5a80502abb7cb819729769d26f9b6bb16ea255f8..019e0253820bd273d45e2168301e5fab483fd43c 100644 (file)
--- a/hw/pci-host/designware.c
+++ b/hw/pci-host/designware.c
@@ -26,7 +26,7 @@
 #include "hw/pci/pci_bridge.h"
 #include "hw/pci/pci_host.h"
 #include "hw/pci/pcie_port.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/core/irq.h"
 #include "hw/pci-host/designware.h"

diff --git a/hw/pci-host/dino.c b/hw/pci-host/dino.c
index e6fdb927f5e41cb3581e1fee8620313fe2d31710..4e64e0f553a1bfcba6f9d651eeb4bfb2371e5f3a 100644 (file)
--- a/hw/pci-host/dino.c
+++ b/hw/pci-host/dino.c
@@ -17,7 +17,7 @@
 #include "hw/core/irq.h"
 #include "hw/pci/pci_device.h"
 #include "hw/pci/pci_bus.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/pci-host/dino.h"
 #include "migration/vmstate.h"
 #include "trace.h"

diff --git a/hw/pci-host/gpex.c b/hw/pci-host/gpex.c
index 3db4c8c9f05c180dcde2210b2ce1f9139855e962..b5074c05c0018392873ab577a4f109447f623d64 100644 (file)
--- a/hw/pci-host/gpex.c
+++ b/hw/pci-host/gpex.c
@@ -34,7 +34,7 @@
 #include "hw/core/irq.h"
 #include "hw/pci/pci_bus.h"
 #include "hw/pci-host/gpex.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"
 

diff --git a/hw/pci-host/grackle.c b/hw/pci-host/grackle.c
index 85a4b83228a8570ff417b0c933221003656483cb..9a58f0e9b560fa829a07bbb3dc91cef8a3039634 100644 (file)
--- a/hw/pci-host/grackle.c
+++ b/hw/pci-host/grackle.c
@@ -24,7 +24,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/pci/pci_device.h"
 #include "hw/core/irq.h"
 #include "qapi/error.h"

diff --git a/hw/pci-host/gt64120.c b/hw/pci-host/gt64120.c
index 3e497b5da5b443147643cd88a0b3b0f35a26da8f..2339f10a30ae93e46b436d100ae5794e9a279ee5 100644 (file)
--- a/hw/pci-host/gt64120.c
+++ b/hw/pci-host/gt64120.c
@@ -29,7 +29,7 @@
 #include "qemu/units.h"
 #include "qemu/log.h"
 #include "qemu/bswap.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/registerfields.h"
 #include "hw/pci/pci_device.h"
 #include "hw/pci/pci_host.h"

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

diff --git a/hw/pci-host/mv64361.c b/hw/pci-host/mv64361.c
index 9f080e4825aa07f828c7b82f8cdd98f3d58d44f0..636228c4074e63520514ad5b1b752b01f83b8e73 100644 (file)
--- a/hw/pci-host/mv64361.c
+++ b/hw/pci-host/mv64361.c
@@ -16,7 +16,7 @@
 #include "hw/pci/pci_host.h"
 #include "hw/core/irq.h"
 #include "hw/intc/i8259.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "system/address-spaces.h"
 #include "qemu/log.h"
 #include "qemu/error-report.h"

diff --git a/hw/pci-host/pnv_phb.c b/hw/pci-host/pnv_phb.c
index 4b0ced79b0890f9d9e18046cd0cd87ca6b027793..85fcc3b686859375c0b19e7f35daeaba6dd0673a 100644 (file)
--- a/hw/pci-host/pnv_phb.c
+++ b/hw/pci-host/pnv_phb.c
@@ -15,7 +15,7 @@
 #include "hw/pci-host/pnv_phb3.h"
 #include "hw/pci-host/pnv_phb4.h"
 #include "hw/ppc/pnv.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qom/object.h"
 #include "system/system.h"
 

diff --git a/hw/pci-host/pnv_phb3.c b/hw/pci-host/pnv_phb3.c
index 9808d575509ecf4cfe3becd5145e732796735c24..d6ab5153374f357de6e96f214b50b95e8002287b 100644 (file)
--- a/hw/pci-host/pnv_phb3.c
+++ b/hw/pci-host/pnv_phb3.c
@@ -19,7 +19,7 @@
 #include "hw/ppc/pnv.h"
 #include "hw/ppc/pnv_chip.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qom/object.h"
 #include "system/system.h"
 

diff --git a/hw/pci-host/pnv_phb3_msi.c b/hw/pci-host/pnv_phb3_msi.c
index f6bf4e323a9c8b54fa286c5c5b94e300d4ae37ae..66ba7b79134f90a40e391012bcf951a8dd335fe5 100644 (file)
--- a/hw/pci-host/pnv_phb3_msi.c
+++ b/hw/pci-host/pnv_phb3_msi.c
@@ -14,7 +14,7 @@
 #include "hw/ppc/pnv.h"
 #include "hw/pci/msi.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "system/reset.h"
 
 static uint64_t phb3_msi_ive_addr(PnvPHB3 *phb, int srcno)

diff --git a/hw/pci-host/pnv_phb4.c b/hw/pci-host/pnv_phb4.c
index 9f17fc1bb413e6460c5401f7d04459b419d599dd..396bc47817dd8006cbd92e7faafb01e283ab627f 100644 (file)
--- a/hw/pci-host/pnv_phb4.c
+++ b/hw/pci-host/pnv_phb4.c
@@ -19,7 +19,7 @@
 #include "hw/ppc/pnv.h"
 #include "hw/ppc/pnv_xscom.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qom/object.h"
 #include "trace.h"
 

diff --git a/hw/pci-host/pnv_phb4_pec.c b/hw/pci-host/pnv_phb4_pec.c
index 5bac1c42ed0f60996cc63bee7b7e8304d6a05ee2..58ec14ec2fc61f1a45abd25e2acaea027dbe6cc6 100644 (file)
--- a/hw/pci-host/pnv_phb4_pec.c
+++ b/hw/pci-host/pnv_phb4_pec.c
@@ -18,7 +18,7 @@
 #include "hw/pci/pci_bus.h"
 #include "hw/ppc/pnv.h"
 #include "hw/ppc/pnv_chip.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "system/system.h"
 
 #include <libfdt.h>

diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c
index a8e172136eb57ebb2434019e18f2a117a647427c..76623f78c466d2a1ab1d49477577b14f88b39ca5 100644 (file)
--- a/hw/pci-host/ppce500.c
+++ b/hw/pci-host/ppce500.c
@@ -16,7 +16,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/pci/pci_device.h"
 #include "hw/pci/pci_host.h"

diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c
index a708758d36155013cc70df416f803d560b5f88d9..bf56229051411309ad8df2928c9949bdb6a01fec 100644 (file)
--- a/hw/pci-host/q35.c
+++ b/hw/pci-host/q35.c
@@ -32,7 +32,7 @@
 #include "qemu/log.h"
 #include "hw/i386/pc.h"
 #include "hw/pci-host/q35.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"

diff --git a/hw/pci-host/raven.c b/hw/pci-host/raven.c
index a587f16131bc434908d7f79c6a42a4fdfad7be43..c50061996c746a070d4e310a76a2d2f509341710 100644 (file)
--- a/hw/pci-host/raven.c
+++ b/hw/pci-host/raven.c
@@ -30,7 +30,7 @@
 #include "hw/pci/pci_device.h"
 #include "hw/pci/pci_bus.h"
 #include "hw/pci/pci_host.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/intc/i8259.h"
 #include "hw/core/irq.h"
 #include "hw/core/or-irq.h"

diff --git a/hw/pci-host/remote.c b/hw/pci-host/remote.c
index e6d2af4502aecdef0df81336e9791a4593f62f92..feaaa9adaa19dbdac1f1342bde78474cbcfcb0d9 100644 (file)
--- a/hw/pci-host/remote.c
+++ b/hw/pci-host/remote.c
@@ -26,7 +26,7 @@
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_host.h"
 #include "hw/pci/pcie_host.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/pci-host/remote.h"
 #include "system/memory.h"
 

diff --git a/hw/pci-host/sabre.c b/hw/pci-host/sabre.c
index c2f99b76f8008686df6e7043eb978f752eee1bb0..87af933dc290c0d00ae92aecc269353e4de85081 100644 (file)
--- a/hw/pci-host/sabre.c
+++ b/hw/pci-host/sabre.c
@@ -28,7 +28,7 @@
 #include "hw/sysbus.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_host.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/pci/pci_bridge.h"
 #include "hw/pci/pci_bus.h"
 #include "hw/core/irq.h"

diff --git a/hw/pci-host/uninorth.c b/hw/pci-host/uninorth.c
index 7a25f3f39f584b25464881007f21a091ac0bd1fb..d39546b6f4221ec2d120e3e9ffe784155b648b4c 100644 (file)
--- a/hw/pci-host/uninorth.c
+++ b/hw/pci-host/uninorth.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qemu/module.h"
 #include "hw/pci/pci_device.h"
 #include "hw/pci/pci_host.h"

diff --git a/hw/pci-host/versatile.c b/hw/pci-host/versatile.c
index 40dce72e674e67ac0796e10fc90e82fbb78ce876..1fdae78210a5492e96568aa9b6b31c94b32e1619 100644 (file)
--- a/hw/pci-host/versatile.c
+++ b/hw/pci-host/versatile.c
@@ -15,7 +15,7 @@
 #include "hw/pci/pci_device.h"
 #include "hw/pci/pci_bus.h"
 #include "hw/pci/pci_host.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "qom/object.h"

diff --git a/hw/pci-host/xilinx-pcie.c b/hw/pci-host/xilinx-pcie.c
index ac6e61c83b086e8b1d1746ff18dcb1ed72e20e58..86c20377d196ad1d1ecc23300d6f55cac4026d81 100644 (file)
--- a/hw/pci-host/xilinx-pcie.c
+++ b/hw/pci-host/xilinx-pcie.c
@@ -22,7 +22,7 @@
 #include "qemu/units.h"
 #include "qapi/error.h"
 #include "hw/pci/pci_bridge.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/core/irq.h"
 #include "hw/pci-host/xilinx-pcie.h"
 

diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index a3118ac6d0d0501c45b76e48d4340cb037777673..2371a916809b4a15d7eb426d610f5e0e828c34c1 100644 (file)
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -30,7 +30,7 @@
 #include "hw/pci/pci_bridge.h"
 #include "hw/pci/pci_bus.h"
 #include "hw/pci/pci_host.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "migration/cpr.h"
 #include "migration/qemu-file-types.h"

diff --git a/hw/pci/pci_bridge.c b/hw/pci/pci_bridge.c
index 76255c4cd8929cf9f350af4be1a8448791d52afa..e85932e41a92f0eb5b7d6e19a499e18e57c6d024 100644 (file)
--- a/hw/pci/pci_bridge.c
+++ b/hw/pci/pci_bridge.c
@@ -38,7 +38,7 @@
 #include "qapi/error.h"
 #include "hw/acpi/acpi_aml_interface.h"
 #include "hw/acpi/pci.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 
 /* PCI bridge subsystem vendor ID helper functions */
 #define PCI_SSVID_SIZEOF        8

diff --git a/hw/pci/pci_host.c b/hw/pci/pci_host.c
index 7179d99178b3a61b137542c3eb23710436f66cda..05f1475dc745d6feff1759971aab6ffed824614c 100644 (file)
--- a/hw/pci/pci_host.c
+++ b/hw/pci/pci_host.c
@@ -22,7 +22,7 @@
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_bridge.h"
 #include "hw/pci/pci_host.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qemu/module.h"
 #include "hw/pci/pci_bus.h"
 #include "migration/vmstate.h"

diff --git a/hw/pci/pcie_port.c b/hw/pci/pcie_port.c
index 20b5e4cfb511f883447e1bbc3eaac69e3b63fad6..dbb6032160e0be1dad4f7610dd9e62c57e309bb0 100644 (file)
--- a/hw/pci/pcie_port.c
+++ b/hw/pci/pcie_port.c
@@ -20,7 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/pci/pcie_port.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qemu/module.h"
 #include "hw/core/hotplug.h"
 

diff --git a/hw/pci/pcie_sriov.c b/hw/pci/pcie_sriov.c
index c4f88f097571a50e6d43bd4d2d92ec5dc26279cc..34e0875d2103fb8cf685839edfe5a7fcdc82aaaa 100644 (file)
--- a/hw/pci/pcie_sriov.c
+++ b/hw/pci/pcie_sriov.c
@@ -14,7 +14,7 @@
 #include "hw/pci/pci_device.h"
 #include "hw/pci/pcie.h"
 #include "hw/pci/pci_bus.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qemu/range.h"
 #include "qapi/error.h"
 #include "trace.h"

diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 7c65757e2155efba0ba3b994280fcde8887095e3..7f164331c8edb89a1fcc7e2b991ec3fe06990c4f 100644 (file)
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -38,7 +38,7 @@
 #include "hw/ppc/openpic.h"
 #include "hw/ppc/openpic_kvm.h"
 #include "hw/ppc/ppc.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/core/loader.h"
 #include "elf.h"
 #include "hw/sysbus.h"

diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 909a4fe257dbb560039e8429b71daab6f464ce77..410a3ac392e219759501c5f2a3e43d8d0a80c687 100644 (file)
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -52,7 +52,7 @@
 #include "qapi/error.h"
 #include "exec/target_page.h"
 #include "hw/ppc/ppc.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/nvram/mac_nvram.h"
 #include "hw/core/boards.h"
 #include "hw/pci-host/uninorth.h"

diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index 8400db6c352e761d4855704ac7071352e4700b20..e679d3389853ae6b0dbcd0ceb926325e16b59ace 100644 (file)
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -30,7 +30,7 @@
 #include "qapi/error.h"
 #include "exec/target_page.h"
 #include "hw/ppc/ppc.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/core/boards.h"
 #include "hw/input/adb.h"
 #include "system/system.h"

diff --git a/hw/ppc/pegasos.c b/hw/ppc/pegasos.c
index 2de80a5fae94a0abf5115f4e72c9f0337bae0557..bf290a7dcd54002256eb6a1778cfad7938b4480b 100644 (file)
--- a/hw/ppc/pegasos.c
+++ b/hw/ppc/pegasos.c
@@ -20,7 +20,7 @@
 #include "hw/isa/vt82c686.h"
 #include "hw/ide/pci.h"
 #include "hw/i2c/smbus_eeprom.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "system/reset.h"
 #include "system/runstate.h"
 #include "system/qtest.h"

diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index 8a50e9f0d8509806985d327e971bba0d57c96994..f891c3a797c07c918144baa1c93f815a1659b1dc 100644 (file)
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -50,7 +50,7 @@
 #include "hw/pci-host/pnv_phb4.h"
 
 #include "hw/ppc/xics.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/ppc/pnv_chip.h"
 #include "hw/ppc/pnv_xscom.h"
 #include "hw/ppc/pnv_pnor.h"

diff --git a/hw/ppc/pnv_adu.c b/hw/ppc/pnv_adu.c
index 005fbda4750573720f5fd3d5853e335c1831f284..d686bfa62d9057404946957112a62e60dbc31c8a 100644 (file)
--- a/hw/ppc/pnv_adu.c
+++ b/hw/ppc/pnv_adu.c
@@ -17,7 +17,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/ppc/pnv.h"
 #include "hw/ppc/pnv_adu.h"
 #include "hw/ppc/pnv_chip.h"

diff --git a/hw/ppc/pnv_chiptod.c b/hw/ppc/pnv_chiptod.c
index 540d5e365f4c29183c5683b2e8808b0a3805e587..09a5a52ac72ea38b4197a50747dec3337deb5ff9 100644 (file)
--- a/hw/ppc/pnv_chiptod.c
+++ b/hw/ppc/pnv_chiptod.c
@@ -29,7 +29,7 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/ppc/fdt.h"
 #include "hw/ppc/ppc.h"
 #include "hw/ppc/pnv.h"

diff --git a/hw/ppc/pnv_core.c b/hw/ppc/pnv_core.c
index fb2dfc7ba212494184cd540fbd244a6efb269ae9..59a9eee597c17e7c5ff4acdb0df75df69ab90f8e 100644 (file)
--- a/hw/ppc/pnv_core.c
+++ b/hw/ppc/pnv_core.c
@@ -29,7 +29,7 @@
 #include "hw/ppc/pnv_core.h"
 #include "hw/ppc/pnv_xscom.h"
 #include "hw/ppc/xics.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "helper_regs.h"
 
 static const char *pnv_core_cpu_typename(PnvCore *pc)

diff --git a/hw/ppc/pnv_homer.c b/hw/ppc/pnv_homer.c
index fb394cc6e09da4fb09e6c15210291be17a59ef4c..1683513dacaebb2218a67713d3933d28009638ae 100644 (file)
--- a/hw/ppc/pnv_homer.c
+++ b/hw/ppc/pnv_homer.c
@@ -23,7 +23,7 @@
 #include "system/memory.h"
 #include "system/cpus.h"
 #include "hw/core/qdev.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/ppc/pnv.h"
 #include "hw/ppc/pnv_chip.h"
 #include "hw/ppc/pnv_homer.h"

diff --git a/hw/ppc/pnv_i2c.c b/hw/ppc/pnv_i2c.c
index 213e58b455cab7fc7c33d18b03bf1a1736416db3..c8e90c636f42f414d6cb87472ea712fc584f0b10 100644 (file)
--- a/hw/ppc/pnv_i2c.c
+++ b/hw/ppc/pnv_i2c.c
@@ -12,7 +12,7 @@
 #include "system/reset.h"
 
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 
 #include "hw/ppc/pnv.h"
 #include "hw/ppc/pnv_chip.h"

diff --git a/hw/ppc/pnv_lpc.c b/hw/ppc/pnv_lpc.c
index 538681bdb32a52bab836c6b9109869c4b3aa6f26..3b65c123164a1e3fee549833d0c6df0a14a246d7 100644 (file)
--- a/hw/ppc/pnv_lpc.c
+++ b/hw/ppc/pnv_lpc.c
@@ -24,7 +24,7 @@
 #include "qemu/module.h"
 #include "hw/core/irq.h"
 #include "hw/isa/isa.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/ppc/pnv.h"
 #include "hw/ppc/pnv_chip.h"
 #include "hw/ppc/pnv_lpc.h"

diff --git a/hw/ppc/pnv_n1_chiplet.c b/hw/ppc/pnv_n1_chiplet.c
index 053f6473f229a1f4bb3d713a0ded797ab12dce62..c75ac671d36b059e9142e0b3d6457d612facda67 100644 (file)
--- a/hw/ppc/pnv_n1_chiplet.c
+++ b/hw/ppc/pnv_n1_chiplet.c
@@ -8,7 +8,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/ppc/pnv.h"
 #include "hw/ppc/pnv_xscom.h"
 #include "hw/ppc/pnv_n1_chiplet.h"

diff --git a/hw/ppc/pnv_nest_pervasive.c b/hw/ppc/pnv_nest_pervasive.c
index 1b1b14fed95f8c21602ca9830f4ee0f701f8553c..01119e667c3df2d4283100c026b378a2559d89e7 100644 (file)
--- a/hw/ppc/pnv_nest_pervasive.c
+++ b/hw/ppc/pnv_nest_pervasive.c
@@ -8,7 +8,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/ppc/pnv.h"
 #include "hw/ppc/pnv_xscom.h"
 #include "hw/ppc/pnv_nest_pervasive.h"

diff --git a/hw/ppc/pnv_occ.c b/hw/ppc/pnv_occ.c
index 7e93e6a6b11c6b2e95dfe0ab39a9dba178d62453..64cab3e9dc82c6701eaf16abe950e919999bf693 100644 (file)
--- a/hw/ppc/pnv_occ.c
+++ b/hw/ppc/pnv_occ.c
@@ -22,7 +22,7 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/ppc/pnv.h"
 #include "hw/ppc/pnv_chip.h"
 #include "hw/ppc/pnv_xscom.h"

diff --git a/hw/ppc/pnv_pnor.c b/hw/ppc/pnv_pnor.c
index c7cbc525b336784cffc1a0940c3cd35ad25ad5ff..1083e42ab576ba69ebf03c2ecb5cc4c331f628bb 100644 (file)
--- a/hw/ppc/pnv_pnor.c
+++ b/hw/ppc/pnv_pnor.c
@@ -15,7 +15,7 @@
 #include "system/blockdev.h"
 #include "hw/core/loader.h"
 #include "hw/ppc/pnv_pnor.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 
 static uint64_t pnv_pnor_read(void *opaque, hwaddr addr, unsigned size)

diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c
index 1cea9375c0e43cfeffe6fe47123b74f0dc2d777f..264568cdfb1070e8fd03a55fc8d795937ad9366b 100644 (file)
--- a/hw/ppc/pnv_psi.c
+++ b/hw/ppc/pnv_psi.c
@@ -30,7 +30,7 @@
 #include "hw/ppc/fdt.h"
 #include "hw/ppc/pnv.h"
 #include "hw/ppc/pnv_xscom.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/ppc/pnv_psi.h"
 
 #include <libfdt.h>

diff --git a/hw/ppc/pnv_sbe.c b/hw/ppc/pnv_sbe.c
index 4798e129983b000cdbdc07e46e419779b409a113..27383ce6837e5fd2826fda779452adb2d3982ad0 100644 (file)
--- a/hw/ppc/pnv_sbe.c
+++ b/hw/ppc/pnv_sbe.c
@@ -22,7 +22,7 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/ppc/pnv.h"
 #include "hw/ppc/pnv_xscom.h"
 #include "hw/ppc/pnv_sbe.h"

diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
index 9e71037d84c27304c176893af4bce028b5142b70..491560575c0b5b0a26cef3db47a3534b1102675a 100644 (file)
--- a/hw/ppc/ppc440_bamboo.c
+++ b/hw/ppc/ppc440_bamboo.c
@@ -30,7 +30,7 @@
 #include "system/reset.h"
 #include "hw/sysbus.h"
 #include "hw/intc/ppc-uic.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
 
 #include <libfdt.h>

diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c
index fd9203d7e2a979e51fe29f694b6b42010efe025b..fc6dd332e881ae986903a8e284139f7f316d17c7 100644 (file)
--- a/hw/ppc/ppc440_uc.c
+++ b/hw/ppc/ppc440_uc.c
@@ -15,7 +15,7 @@
 #include "hw/core/irq.h"
 #include "hw/ppc/ppc4xx.h"
 #include "hw/pci-host/ppc4xx.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/pci/pci.h"
 #include "system/reset.h"
 #include "cpu.h"

diff --git a/hw/ppc/ppc4xx_devs.c b/hw/ppc/ppc4xx_devs.c
index f36c519c8bf64469a480ed7dad7cb5df65492bb3..1e6b6fec5da826a3547f3d8db6ab224eebc1fedd 100644 (file)
--- a/hw/ppc/ppc4xx_devs.c
+++ b/hw/ppc/ppc4xx_devs.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "hw/ppc/ppc4xx.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
 
 /*****************************************************************************/

diff --git a/hw/ppc/ppc4xx_sdram.c b/hw/ppc/ppc4xx_sdram.c
index 6cc2a82ac5c613d1010b3a279bbb78b26e5c10d9..b2c8f96d5f81072fa2d8b026461be128aa2831dd 100644 (file)
--- a/hw/ppc/ppc4xx_sdram.c
+++ b/hw/ppc/ppc4xx_sdram.c
@@ -36,7 +36,7 @@
 #include "qemu/error-report.h"
 #include "system/address-spaces.h" /* get_system_memory() */
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/ppc/ppc4xx.h"
 #include "trace.h"
 

diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index 90164face16b97f46f83e2a3809df1e7722b543b..c4efd1d390842176a276bd360e489cf8dc3feca3 100644 (file)
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -39,7 +39,7 @@
 #include "hw/core/loader.h"
 #include "hw/rtc/mc146818rtc.h"
 #include "hw/isa/pc87312.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "exec/target_page.h"
 #include "system/kvm.h"
 #include "system/reset.h"

diff --git a/hw/ppc/prep_systemio.c b/hw/ppc/prep_systemio.c
index d0e42e8731a0fa56b2078f2fc9127f55f7b3133a..bc8b0964e7599bad963c0408fd625f218f68bca3 100644 (file)
--- a/hw/ppc/prep_systemio.c
+++ b/hw/ppc/prep_systemio.c
@@ -26,7 +26,7 @@
 #include "qemu/log.h"
 #include "hw/core/irq.h"
 #include "hw/isa/isa.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "system/address-spaces.h"
 #include "qom/object.h"

diff --git a/hw/ppc/rs6000_mc.c b/hw/ppc/rs6000_mc.c
index a0964051d1e94c233a6dca1f433e01f35efa61df..d87afd6d5b4821c0a6e9627c04868b340a1a38b7 100644 (file)
--- a/hw/ppc/rs6000_mc.c
+++ b/hw/ppc/rs6000_mc.c
@@ -22,7 +22,7 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "hw/isa/isa.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "system/address-spaces.h"
 #include "qapi/error.h"

diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c
index 550aaa21fa246e1cf1784e36bca7f1efb318586d..b6e233747edebe5b60f5320f03de3c2db2d8c5ad 100644 (file)
--- a/hw/ppc/sam460ex.c
+++ b/hw/ppc/sam460ex.c
@@ -37,7 +37,7 @@
 #include "hw/ide/pci.h"
 #include "hw/usb/hcd-ehci.h"
 #include "hw/ppc/fdt.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/intc/ppc-uic.h"
 
 #include <libfdt.h>

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 7363e533e1564455294a07e8104abacfa0a3e35e..eb626547ebdc66ef201a96df792b3018c5b2a33f 100644 (file)
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -68,7 +68,7 @@
 #include "hw/ppc/spapr_nested.h"
 #include "hw/ppc/spapr_vio.h"
 #include "hw/ppc/vof.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/pci-host/spapr.h"
 #include "hw/pci/msi.h"
 

diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c
index 4952f9bd2cf570dd429f80faf6e2a97d03a0d635..41e37103c043e2f558d7c2146486bbe70223aa3f 100644 (file)
--- a/hw/ppc/spapr_cpu_core.c
+++ b/hw/ppc/spapr_cpu_core.c
@@ -10,7 +10,7 @@
 #include "qemu/osdep.h"
 #include "hw/cpu/core.h"
 #include "hw/ppc/spapr_cpu_core.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "target/ppc/cpu.h"
 #include "hw/ppc/spapr.h"

diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
index 32a2edbe5cc26d50772a28de5a68f20837497aa7..3a9c96d939b82bda41c04546bdc94c9b9dfa94f8 100644 (file)
--- a/hw/ppc/spapr_irq.c
+++ b/hw/ppc/spapr_irq.c
@@ -17,7 +17,7 @@
 #include "hw/ppc/spapr_xive.h"
 #include "hw/ppc/xics.h"
 #include "hw/ppc/xics_spapr.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "cpu-models.h"
 #include "system/kvm.h"
 

diff --git a/hw/ppc/spapr_nvdimm.c b/hw/ppc/spapr_nvdimm.c
index 72b4a6329fb4b18c37b30ac15d17364301f286bc..664742839151b5e89f8125bcfb634abc8e8663d3 100644 (file)
--- a/hw/ppc/spapr_nvdimm.c
+++ b/hw/ppc/spapr_nvdimm.c
@@ -34,7 +34,7 @@
 #include "block/thread-pool.h"
 #include "migration/vmstate.h"
 #include "qemu/pmem.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 
 /* DIMM health bitmap bitmap indicators. Taken from kernel's papr_scm.c */
 /* SCM device is unable to persist memory contents */

diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index 523edaa7b6c13847a91cffd208a888f87b7e3a9b..a7c064be33057c00b1f23701372f837f8ea8c1d0 100644 (file)
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -43,7 +43,7 @@
 #include "hw/pci/pci_bus.h"
 #include "hw/pci/pci_ids.h"
 #include "hw/ppc/spapr_drc.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "system/device_tree.h"
 #include "system/kvm.h"
 #include "system/hostmem.h"

diff --git a/hw/ppc/spapr_rng.c b/hw/ppc/spapr_rng.c
index 6fec6070370959c65d4ff94b306bd7cc9bdc868b..846ea3e3b6d5f7b813add7763e2cddb968290edc 100644 (file)
--- a/hw/ppc/spapr_rng.c
+++ b/hw/ppc/spapr_rng.c
@@ -25,7 +25,7 @@
 #include "system/device_tree.h"
 #include "system/rng.h"
 #include "hw/ppc/spapr.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "kvm_ppc.h"
 #include "qom/object.h"
 

diff --git a/hw/ppc/spapr_tpm_proxy.c b/hw/ppc/spapr_tpm_proxy.c
index 1297b3ad569c23200190172ab0a22e744341bb3d..a48dab7e7a679abe6b43518f0e85f97c14db5c5a 100644 (file)
--- a/hw/ppc/spapr_tpm_proxy.c
+++ b/hw/ppc/spapr_tpm_proxy.c
@@ -15,7 +15,7 @@
 #include "qemu/error-report.h"
 #include "system/reset.h"
 #include "hw/ppc/spapr.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "trace.h"
 
 #define TPM_SPAPR_BUFSIZE 4096

diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
index 8b5f4eb57a0c34a9a3e1305da14fdfa1380be689..cf2d10ecb2704b398d66dfab774ca62d8a01daf4 100644 (file)
--- a/hw/ppc/virtex_ml507.c
+++ b/hw/ppc/virtex_ml507.c
@@ -43,7 +43,7 @@
 #include "hw/intc/ppc-uic.h"
 #include "hw/ppc/ppc.h"
 #include "hw/ppc/ppc4xx.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 
 #include <libfdt.h>
 

diff --git a/hw/remote/proxy.c b/hw/remote/proxy.c
index 18e0f7a064f268418fbb6514fd1c22e34c606b9c..5081d67e7f40ea931ad21c45f9a1011b4748c178 100644 (file)
--- a/hw/remote/proxy.c
+++ b/hw/remote/proxy.c
@@ -12,7 +12,7 @@
 #include "hw/pci/pci.h"
 #include "qapi/error.h"
 #include "io/channel-util.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "monitor/monitor.h"
 #include "migration/blocker.h"
 #include "qemu/sockets.h"

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

diff --git a/hw/riscv/riscv-iommu-pci.c b/hw/riscv/riscv-iommu-pci.c
index cdb4a7a8f03eb08adaa05850841e615f85cb7772..5f7d3592047a8f2b1db51e7bba20cf0292e24fb3 100644 (file)
--- a/hw/riscv/riscv-iommu-pci.c
+++ b/hw/riscv/riscv-iommu-pci.c
@@ -21,7 +21,7 @@
 #include "hw/pci/msi.h"
 #include "hw/pci/msix.h"
 #include "hw/pci/pci_bus.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/riscv/riscv_hart.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"

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

diff --git a/hw/riscv/riscv-iommu.c b/hw/riscv/riscv-iommu.c
index f8656ec04b1bdff749131ae8f50a28f38f60fe6f..baaadadda10d9a46d6e81e024d92ca78a5b716c5 100644 (file)
--- a/hw/riscv/riscv-iommu.c
+++ b/hw/riscv/riscv-iommu.c
@@ -21,7 +21,7 @@
 #include "exec/target_page.h"
 #include "hw/pci/pci_bus.h"
 #include "hw/pci/pci_device.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/riscv/riscv_hart.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"

diff --git a/hw/riscv/riscv-iommu.h b/hw/riscv/riscv-iommu.h
index a31aa62144f4b6b85b1d6b6a7e28a4285958154e..2dabd86941baf5b74d1fefe6833f19df157fd5f7 100644 (file)
--- a/hw/riscv/riscv-iommu.h
+++ b/hw/riscv/riscv-iommu.h
@@ -20,7 +20,7 @@
 #define HW_RISCV_IOMMU_STATE_H
 
 #include "qom/object.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "system/dma.h"
 #include "hw/riscv/iommu.h"
 #include "hw/riscv/riscv-iommu-bits.h"

diff --git a/hw/riscv/riscv_hart.c b/hw/riscv/riscv_hart.c
index 33cbc9873e69df3a68c31267c6bf3456328cda69..31187487946f671e0b06d0dc955e97c393971f44 100644 (file)
--- a/hw/riscv/riscv_hart.c
+++ b/hw/riscv/riscv_hart.c
@@ -26,7 +26,7 @@
 #include "qemu/cutils.h"
 #include "hw/sysbus.h"
 #include "target/riscv/cpu.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/riscv/riscv_hart.h"
 #include "qemu/error-report.h"
 

diff --git a/hw/riscv/shakti_c.c b/hw/riscv/shakti_c.c
index d309ea2e39e4a3058134cebe3366c13d420434bb..49a39b30212d7cfcae5baeda9b8572207a6b290a 100644 (file)
--- a/hw/riscv/shakti_c.c
+++ b/hw/riscv/shakti_c.c
@@ -24,7 +24,7 @@
 #include "hw/intc/sifive_plic.h"
 #include "hw/intc/riscv_aclint.h"
 #include "system/system.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "system/address-spaces.h"
 #include "hw/riscv/boot.h"
 

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

diff --git a/hw/riscv/xiangshan_kmh.c b/hw/riscv/xiangshan_kmh.c
index e831954cb36f535b3de6fdb4d96e8435682e064c..436e51c1c593c8a0ff3a3364f563f74216fd5cd4 100644 (file)
--- a/hw/riscv/xiangshan_kmh.c
+++ b/hw/riscv/xiangshan_kmh.c
@@ -37,7 +37,7 @@
 #include "hw/intc/riscv_aclint.h"
 #include "hw/intc/riscv_aplic.h"
 #include "hw/intc/riscv_imsic.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/riscv/boot.h"
 #include "hw/riscv/xiangshan_kmh.h"
 #include "hw/riscv/riscv_hart.h"

diff --git a/hw/rtc/allwinner-rtc.c b/hw/rtc/allwinner-rtc.c
index a747bff534c62b62b0c740d698c3e041bd2af564..0ffd38cf78742fcca18191393c09b2fccafbdf6b 100644 (file)
--- a/hw/rtc/allwinner-rtc.c
+++ b/hw/rtc/allwinner-rtc.c
@@ -23,7 +23,7 @@
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/rtc/allwinner-rtc.h"
 #include "system/rtc.h"
 #include "trace.h"

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

diff --git a/hw/rtc/m48t59-isa.c b/hw/rtc/m48t59-isa.c
index 9e2f6563a0a5e260bde29d65f846e6a30d0d5198..ea0f307aa062caba92a5a22f3db141da6c221535 100644 (file)
--- a/hw/rtc/m48t59-isa.c
+++ b/hw/rtc/m48t59-isa.c
@@ -25,7 +25,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/isa/isa.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/rtc/m48t59.h"
 #include "m48t59-internal.h"
 #include "qapi/error.h"

diff --git a/hw/rtc/m48t59.c b/hw/rtc/m48t59.c
index 0be17b3e798f8a0cc4fadb967dcdfccccf099ead..be8efb8c0adfeac39ed5c2dcff2c5cbac215a329 100644 (file)
--- a/hw/rtc/m48t59.c
+++ b/hw/rtc/m48t59.c
@@ -25,7 +25,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/rtc/m48t59.h"
 #include "qemu/timer.h"
 #include "system/runstate.h"

diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c
index 4c4c1c84219e8bb5278e6fc6633b8cefcc611be8..56f8c79479e81c15dec101387776fcfbe33281cf 100644 (file)
--- a/hw/rtc/mc146818rtc.c
+++ b/hw/rtc/mc146818rtc.c
@@ -29,7 +29,7 @@
 #include "hw/acpi/acpi_aml_interface.h"
 #include "hw/intc/kvm_irqcount.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "qemu/timer.h"
 #include "system/system.h"

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

diff --git a/hw/rtc/rs5c372.c b/hw/rtc/rs5c372.c
index bb924534a7371e915362b245a734453b6ea73109..58f12b836d39d6a7f23ccc1c3fb42198648c5e07 100644 (file)
--- a/hw/rtc/rs5c372.c
+++ b/hw/rtc/rs5c372.c
@@ -10,7 +10,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/i2c/i2c.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/resettable.h"
 #include "migration/vmstate.h"
 #include "qemu/bcd.h"

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

diff --git a/hw/s390x/3270-ccw.c b/hw/s390x/3270-ccw.c
index 3f0d384fd809d971613b74cc10feb9acae861e2b..51c6828ff1759d35aeada786730393db97516445 100644 (file)
--- a/hw/s390x/3270-ccw.c
+++ b/hw/s390x/3270-ccw.c
@@ -15,7 +15,7 @@
 #include "qemu/module.h"
 #include "hw/s390x/css.h"
 #include "hw/s390x/css-bridge.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/s390x/3270-ccw.h"
 
 /* Handle READ ccw commands from guest */

diff --git a/hw/s390x/ccw-device.c b/hw/s390x/ccw-device.c
index 8be1813b9e7ec0f372a09acca5143aa08bdf610d..25c427327957040311c10d62dca90c65fee4b80d 100644 (file)
--- a/hw/s390x/ccw-device.c
+++ b/hw/s390x/ccw-device.c
@@ -11,7 +11,7 @@
 
 #include "qemu/osdep.h"
 #include "ccw-device.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qemu/module.h"
 #include "ipl.h"
 #include "qapi/visitor.h"

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

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

diff --git a/hw/s390x/css.c b/hw/s390x/css.c
index 53444f682889712e1f5394d84b25f852771ee9c6..d2c0af6a9bf5bcde411cbc4c5222ea424776938e 100644 (file)
--- a/hw/s390x/css.c
+++ b/hw/s390x/css.c
@@ -16,7 +16,7 @@
 #include "qemu/error-report.h"
 #include "system/address-spaces.h"
 #include "hw/s390x/ioinst.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/s390x/css.h"
 #include "trace.h"
 #include "hw/s390x/s390_flic.h"

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

diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
index 3eea2f0c9d9fc88bdc4b71590f79778c08f1a13a..ff415b6312d193608183c4588a3bc1e089b5e4f5 100644 (file)
--- a/hw/s390x/s390-pci-bus.c
+++ b/hw/s390x/s390-pci-bus.c
@@ -22,7 +22,7 @@
 #include "hw/s390x/s390-virtio-ccw.h"
 #include "hw/core/boards.h"
 #include "hw/pci/pci_bus.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/pci/pci_bridge.h"
 #include "hw/pci/msi.h"
 #include "qemu/error-report.h"

diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c
index 8eeecfd58fc37ce502a842e224da093bee148258..d974d97b5e7a2b550cd9822a1d33c2347513e48b 100644 (file)
--- a/hw/s390x/s390-skeys.c
+++ b/hw/s390x/s390-skeys.c
@@ -13,7 +13,7 @@
 #include "qemu/units.h"
 #include "exec/target_page.h"
 #include "hw/s390x/s390-virtio-ccw.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/s390x/storage-keys.h"
 #include "qapi/error.h"
 #include "qapi/qapi-commands-machine.h"

diff --git a/hw/s390x/s390-stattrib.c b/hw/s390x/s390-stattrib.c
index aa18537291486caf26271874a4b307b0bcdd45c2..f149af16ac13af059a639b5cbb161f0255787587 100644 (file)
--- a/hw/s390x/s390-stattrib.c
+++ b/hw/s390x/s390-stattrib.c
@@ -14,7 +14,7 @@
 #include "exec/target_page.h"
 #include "migration/qemu-file.h"
 #include "migration/register.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/s390x/storage-attributes.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"

diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index c5e0691a26d627c9d23cd3527d8f7a303b50030e..8314655ec2c71727cef288cfef967bccaf57dd54 100644 (file)
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -36,7 +36,7 @@
 #include "migration/register.h"
 #include "target/s390x/cpu_models.h"
 #include "hw/core/nmi.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/s390x/tod.h"
 #include "system/system.h"
 #include "system/cpus.h"

diff --git a/hw/s390x/vhost-scsi-ccw.c b/hw/s390x/vhost-scsi-ccw.c
index 8341b23a95ce4c7708c58af8ca622a9257601204..1e68459eb0e0c071bef5edbf12d8a7a30fc838f9 100644 (file)
--- a/hw/s390x/vhost-scsi-ccw.c
+++ b/hw/s390x/vhost-scsi-ccw.c
@@ -10,7 +10,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio.h"
 #include "qapi/error.h"
 #include "qemu/module.h"

diff --git a/hw/s390x/vhost-user-fs-ccw.c b/hw/s390x/vhost-user-fs-ccw.c
index cc1b8227fc0dd1216732b8b999228566683ec3c9..35a77e4cb71439fe38db91e3144ca4972e249ae7 100644 (file)
--- a/hw/s390x/vhost-user-fs-ccw.c
+++ b/hw/s390x/vhost-user-fs-ccw.c
@@ -8,7 +8,7 @@
  * directory.
  */
 #include "qemu/osdep.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
 #include "hw/virtio/vhost-user-fs.h"
 #include "virtio-ccw.h"

diff --git a/hw/s390x/vhost-vsock-ccw.c b/hw/s390x/vhost-vsock-ccw.c
index 552e9e86a4bd3e97ed9d6b098f0ca9598945e83e..efdfdeec84c2daff2c84e4f2e44ed8f63522e0b8 100644 (file)
--- a/hw/s390x/vhost-vsock-ccw.c
+++ b/hw/s390x/vhost-vsock-ccw.c
@@ -7,7 +7,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio.h"
 #include "qapi/error.h"
 #include "qemu/module.h"

diff --git a/hw/s390x/virtio-ccw-9p.c b/hw/s390x/virtio-ccw-9p.c
index 72bf6ec80c8a125ccca9d7c878a96044cf41e25a..d8612f7cd13f6b032fa096392128a4d17d313f65 100644 (file)
--- a/hw/s390x/virtio-ccw-9p.c
+++ b/hw/s390x/virtio-ccw-9p.c
@@ -10,7 +10,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio.h"
 #include "qapi/error.h"
 #include "qemu/module.h"

diff --git a/hw/s390x/virtio-ccw-balloon.c b/hw/s390x/virtio-ccw-balloon.c
index 399b40f366ecca4f68b755d4afdf2a4b90eaadc0..4f67310b6931c9520a0fc6e941a6e7436e15510d 100644 (file)
--- a/hw/s390x/virtio-ccw-balloon.c
+++ b/hw/s390x/virtio-ccw-balloon.c
@@ -10,7 +10,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio.h"
 #include "qapi/error.h"
 #include "qemu/module.h"

diff --git a/hw/s390x/virtio-ccw-blk.c b/hw/s390x/virtio-ccw-blk.c
index 7d8c4a75ced96e36abe11e219aa89c663228dcbd..939dcaeed38a8bd36386d112058f6c6491bbdf1c 100644 (file)
--- a/hw/s390x/virtio-ccw-blk.c
+++ b/hw/s390x/virtio-ccw-blk.c
@@ -10,7 +10,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio.h"
 #include "qapi/error.h"
 #include "qemu/module.h"

diff --git a/hw/s390x/virtio-ccw-crypto.c b/hw/s390x/virtio-ccw-crypto.c
index 75e714603b145caabdc84c9b8dfa9b5fa5d823a4..2c4ee2ca3940b33bdf56d5d0ec3285a76a884bbb 100644 (file)
--- a/hw/s390x/virtio-ccw-crypto.c
+++ b/hw/s390x/virtio-ccw-crypto.c
@@ -9,7 +9,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio.h"
 #include "qapi/error.h"
 #include "qemu/module.h"

diff --git a/hw/s390x/virtio-ccw-gpu.c b/hw/s390x/virtio-ccw-gpu.c
index edb6a47d376f3c22c20b52540db0786753179305..4120c6bcb9f09c34ef38622995996826cebf3a5e 100644 (file)
--- a/hw/s390x/virtio-ccw-gpu.c
+++ b/hw/s390x/virtio-ccw-gpu.c
@@ -9,7 +9,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio.h"
 #include "qapi/error.h"
 #include "qemu/module.h"

diff --git a/hw/s390x/virtio-ccw-input.c b/hw/s390x/virtio-ccw-input.c
index 2250d8cf981c7e698211c8e34bd883967eb14dde..a9ec60428ca93044f990a384ff06c0336db0401d 100644 (file)
--- a/hw/s390x/virtio-ccw-input.c
+++ b/hw/s390x/virtio-ccw-input.c
@@ -9,7 +9,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio.h"
 #include "qapi/error.h"
 #include "qemu/module.h"

diff --git a/hw/s390x/virtio-ccw-mem.c b/hw/s390x/virtio-ccw-mem.c
index daa485d189f7ae880d3a5843ea995e6797b12034..dea30aacfb32f22f28196ef435aebd93d23344ad 100644 (file)
--- a/hw/s390x/virtio-ccw-mem.c
+++ b/hw/s390x/virtio-ccw-mem.c
@@ -11,7 +11,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "virtio-ccw-mem.h"

diff --git a/hw/s390x/virtio-ccw-net.c b/hw/s390x/virtio-ccw-net.c
index a7d4afbeb9e4ec76fd4deb6538f912a530649720..30e7055ab2b1b7b90fcfc0d48f066f86c591685c 100644 (file)
--- a/hw/s390x/virtio-ccw-net.c
+++ b/hw/s390x/virtio-ccw-net.c
@@ -10,7 +10,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio.h"
 #include "qapi/error.h"
 #include "qemu/module.h"

diff --git a/hw/s390x/virtio-ccw-rng.c b/hw/s390x/virtio-ccw-rng.c
index 3263287d45a19f20584af8100e02f9b0e80b65ad..0647621e33da11b8579cae639adbfdaf71f79f3c 100644 (file)
--- a/hw/s390x/virtio-ccw-rng.c
+++ b/hw/s390x/virtio-ccw-rng.c
@@ -10,7 +10,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio.h"
 #include "qapi/error.h"
 #include "qemu/module.h"

diff --git a/hw/s390x/virtio-ccw-scsi.c b/hw/s390x/virtio-ccw-scsi.c
index 06b4c6c4a5a1fbab4c8f745869d98f05ed30dcc1..c181a2b7692002c5216f45be43332c137fe68250 100644 (file)
--- a/hw/s390x/virtio-ccw-scsi.c
+++ b/hw/s390x/virtio-ccw-scsi.c
@@ -10,7 +10,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio.h"
 #include "qapi/error.h"
 #include "qemu/module.h"

diff --git a/hw/s390x/virtio-ccw-serial.c b/hw/s390x/virtio-ccw-serial.c
index 0dac590c080445c5cc4a750b4c007d2eac0c882c..7ff07a084129275ec80d31211c4ad0f4c40c6cfd 100644 (file)
--- a/hw/s390x/virtio-ccw-serial.c
+++ b/hw/s390x/virtio-ccw-serial.c
@@ -12,7 +12,7 @@
 #include "qemu/osdep.h"
 #include "hw/virtio/virtio.h"
 #include "qemu/module.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio-serial.h"
 #include "virtio-ccw.h"
 

diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c
index 844643d916f30b2a9fe905e13d5c8a894c3729c9..f62e420a91e4b25ea468e220a4ada619a0b18769 100644 (file)
--- a/hw/scsi/megasas.c
+++ b/hw/scsi/megasas.c
@@ -20,7 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/pci/pci.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "system/dma.h"
 #include "system/block-backend.h"
 #include "system/rtc.h"

diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c
index 4ada35b7ec8fb6cb9b414290700bd38c78fd5401..e4a7b2fee4aafd320974169f3fcd3c4463797e2d 100644 (file)
--- a/hw/scsi/mptsas.c
+++ b/hw/scsi/mptsas.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/pci/pci.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "system/dma.h"
 #include "hw/pci/msi.h"
 #include "qemu/iov.h"

diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
index b9b115deedd215aeeb127247f199d86d77a7e4ce..f310ddafb96f1ec6948a7a47662ad63b23060110 100644 (file)
--- a/hw/scsi/scsi-bus.c
+++ b/hw/scsi/scsi-bus.c
@@ -4,7 +4,7 @@
 #include "qemu/module.h"
 #include "qemu/option.h"
 #include "qemu/hw-version.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/scsi/scsi.h"
 #include "migration/qemu-file-types.h"
 #include "migration/vmstate.h"

diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index b4782c6248d1cd8c11fc1b6bf6998c46d54ee200..9c78c9e18e21fb16e94ea6cfdac2db9219964944 100644 (file)
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -36,7 +36,7 @@
 #include "system/block-backend.h"
 #include "system/blockdev.h"
 #include "hw/block/block.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "system/dma.h"
 #include "system/system.h"

diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c
index 9e380a2109eaa4df06f907eb5164efced42e3ca1..2ac4fd66c37a4b4735d394601198d154b88f47ed 100644 (file)
--- a/hw/scsi/scsi-generic.c
+++ b/hw/scsi/scsi-generic.c
@@ -18,7 +18,7 @@
 #include "qemu/module.h"
 #include "hw/scsi/scsi.h"
 #include "migration/qemu-file-types.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/scsi/emulation.h"
 #include "system/block-backend.h"

diff --git a/hw/scsi/spapr_vscsi.c b/hw/scsi/spapr_vscsi.c
index a6591319db73e1d158adc964251823fb2fd62300..b4c8f94d22ad956141610feac43aa68f837e16d9 100644 (file)
--- a/hw/scsi/spapr_vscsi.c
+++ b/hw/scsi/spapr_vscsi.c
@@ -40,7 +40,7 @@
 #include "srp.h"
 #include "hw/ppc/spapr.h"
 #include "hw/ppc/spapr_vio.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "viosrp.h"
 #include "trace.h"
 

diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c
index 573a44b2b3ea225e49ecbf32ccc0d5a9d218044a..699863cc1091c736cd0131b5aeed2a92e28a69a0 100644 (file)
--- a/hw/scsi/vhost-scsi.c
+++ b/hw/scsi/vhost-scsi.c
@@ -27,7 +27,7 @@
 #include "hw/virtio/virtio-scsi.h"
 #include "hw/virtio/virtio-bus.h"
 #include "hw/core/fw-path-provider.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qemu/cutils.h"
 #include "system/system.h"
 

diff --git a/hw/scsi/vhost-user-scsi.c b/hw/scsi/vhost-user-scsi.c
index 2c79522b09a442c8c09cb7476e11675d89eb761b..89f06066b70b2686832a62200b8fd6d1908b3e83 100644 (file)
--- a/hw/scsi/vhost-user-scsi.c
+++ b/hw/scsi/vhost-user-scsi.c
@@ -20,7 +20,7 @@
 #include "qemu/error-report.h"
 #include "hw/core/fw-path-provider.h"
 #include "hw/core/qdev.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/virtio/vhost.h"
 #include "hw/virtio/vhost-backend.h"

diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
index 93e87c459c7a40b9112d3d8dcfe6a3d8e8100ef0..774968d8c700b135254f997864833563d5c6237a 100644 (file)
--- a/hw/scsi/virtio-scsi.c
+++ b/hw/scsi/virtio-scsi.c
@@ -24,7 +24,7 @@
 #include "qemu/module.h"
 #include "system/block-backend.h"
 #include "system/dma.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/scsi/scsi.h"
 #include "scsi/constants.h"
 #include "hw/virtio/iothread-vq-mapping.h"

diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c
index 7c98b1b8ea64582a9cd4dabff583aacd31b501f9..b3cdc255b4687a748935e5a5e4eede8261c05d0b 100644 (file)
--- a/hw/scsi/vmw_pvscsi.c
+++ b/hw/scsi/vmw_pvscsi.c
@@ -33,7 +33,7 @@
 #include "migration/vmstate.h"
 #include "scsi/constants.h"
 #include "hw/pci/msi.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "vmw_pvscsi.h"
 #include "trace.h"
 #include "qom/object.h"

diff --git a/hw/sd/allwinner-sdhost.c b/hw/sd/allwinner-sdhost.c
index 4c039b9520ec8c66843c26b9c5b2f0ad5dacec08..87bb7df903544abb1dc8f10927801cdc6f2fb9e4 100644 (file)
--- a/hw/sd/allwinner-sdhost.c
+++ b/hw/sd/allwinner-sdhost.c
@@ -24,7 +24,7 @@
 #include "qapi/error.h"
 #include "system/blockdev.h"
 #include "system/dma.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/core/irq.h"
 #include "hw/sd/allwinner-sdhost.h"
 #include "migration/vmstate.h"

diff --git a/hw/sd/aspeed_sdhci.c b/hw/sd/aspeed_sdhci.c
index 330e6a19c9afd5789d3cc972324442fed4111066..6684f8221a35b2c60b48c5c2c4e9134045798626 100644 (file)
--- a/hw/sd/aspeed_sdhci.c
+++ b/hw/sd/aspeed_sdhci.c
@@ -13,7 +13,7 @@
 #include "qapi/error.h"
 #include "hw/core/irq.h"
 #include "migration/vmstate.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "trace.h"
 
 #define ASPEED_SDHCI_INFO            0x00

diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index ff45c8e70ca874a0603412fd4f75437779b4bfd3..3df331d5611e7de337c9a8c696057d2a6cd82fe4 100644 (file)
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -42,7 +42,7 @@
 #include "migration/vmstate.h"
 #include "qapi/error.h"
 #include "qemu/bitmap.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "qemu/error-report.h"
 #include "qemu/timer.h"

diff --git a/hw/sd/sdhci-pci.c b/hw/sd/sdhci-pci.c
index 0e38bed49a9d03ad3e9abdfe111fd816a2547e31..27001e5e1ec469a05a55ab49199d705406fa30f6 100644 (file)
--- a/hw/sd/sdhci-pci.c
+++ b/hw/sd/sdhci-pci.c
@@ -19,7 +19,7 @@
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/sd/sdhci.h"
 #include "sdhci-internal.h"
 

diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index 39185f0a9873f9de3c0970b95ff3e35b6fae2fb9..9146e0cde0608e60cd5c89663558c636184dfcd6 100644 (file)
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -29,7 +29,7 @@
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "system/dma.h"
 #include "qemu/timer.h"
 #include "qemu/bitops.h"

diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c
index 3aacbd0387153dc95839f5898f4c2a115740a868..c6e350af2ddfd9907afae143599d0bb49078691d 100644 (file)
--- a/hw/sd/ssi-sd.c
+++ b/hw/sd/ssi-sd.c
@@ -19,7 +19,7 @@
 #include "system/blockdev.h"
 #include "hw/ssi/ssi.h"
 #include "migration/vmstate.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/sd/sd.h"
 #include "qapi/error.h"
 #include "qemu/crc-ccitt.h"

diff --git a/hw/sensor/isl_pmbus_vr.c b/hw/sensor/isl_pmbus_vr.c
index e8d29b08ff3a5f49c3631ef1f901e57ba29b17b7..0fad04def773666e2f657bde3030cdf17726cc43 100644 (file)
--- a/hw/sensor/isl_pmbus_vr.c
+++ b/hw/sensor/isl_pmbus_vr.c
@@ -8,7 +8,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/sensor/isl_pmbus_vr.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/visitor.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index 9e8c2fa8d126f61046ac03dfee7b57a377d56e7e..35db5cbbcd1973d32a274f5966be99faf2e0e384 100644 (file)
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -35,7 +35,7 @@
 #include "system/system.h"
 #include "hw/core/boards.h"
 #include "hw/pci/pci.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "net/net.h"
 #include "sh7750_regs.h"
 #include "hw/ide/mmio.h"

diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c
index 6cb42e34412d5ef10a4d3e7c878ce65aabe14fec..aff45320bc5aff05514f00fd75a3f13cd31620b5 100644 (file)
--- a/hw/sh4/sh7750.c
+++ b/hw/sh4/sh7750.c
@@ -30,7 +30,7 @@
 #include "hw/sh4/sh.h"
 #include "system/system.h"
 #include "target/sh4/cpu.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "sh7750_regs.h"
 #include "sh7750_regnames.h"

diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
index 50f1cf91706a69454e4b01a763783a1c068071c0..ec9a386b48d9da2eef5ae2f7ed94a25c124e10a5 100644 (file)
--- a/hw/sparc/leon3.c
+++ b/hw/sparc/leon3.c
@@ -33,7 +33,7 @@
 #include "hw/core/irq.h"
 #include "qemu/timer.h"
 #include "hw/core/ptimer.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "system/system.h"
 #include "system/qtest.h"
 #include "system/reset.h"

diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index fa524513036d6260cd5cdd958d941aa6025f8ac5..2e3952c917b946989e20965b6eb41741807c7c1c 100644 (file)
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -43,7 +43,7 @@
 #include "hw/core/boards.h"
 #include "hw/scsi/esp.h"
 #include "hw/nvram/sun_nvram.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/nvram/chrp_nvram.h"
 #include "hw/nvram/fw_cfg.h"
 #include "hw/char/escc.h"

diff --git a/hw/sparc/sun4m_iommu.c b/hw/sparc/sun4m_iommu.c
index 9ce2e3b7fc805a87aa4750d586fbee25d77614bd..10c4786dad67c63739fef36a3c57a333f46f2578 100644 (file)
--- a/hw/sparc/sun4m_iommu.c
+++ b/hw/sparc/sun4m_iommu.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/sparc/sun4m_iommu.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"

diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index c0fb421d2ba842edf23f33de2d7f2f45be9ac658..14b47c037bac606aa7cded447ac486bd3ffea267 100644 (file)
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -33,7 +33,7 @@
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_bridge.h"
 #include "hw/pci/pci_host.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/pci-host/sabre.h"
 #include "hw/char/serial-isa.h"
 #include "hw/char/serial-mm.h"

diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c
index 9819904a4ad4667524135d1e3d692a8d1e0d7872..6bef856c620fb250f25516840201ed797c37b7b7 100644 (file)
--- a/hw/ssi/aspeed_smc.c
+++ b/hw/ssi/aspeed_smc.c
@@ -34,7 +34,7 @@
 #include "trace.h"
 
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/ssi/aspeed_smc.h"
 
 /* CE Type Setting Register */

diff --git a/hw/ssi/ibex_spi_host.c b/hw/ssi/ibex_spi_host.c
index 63f4cce51291e707049a4a4c45b67991b29adec8..a7dc0c2f0323d2986172ce0e346beeb9a4f8ff24 100644 (file)
--- a/hw/ssi/ibex_spi_host.c
+++ b/hw/ssi/ibex_spi_host.c
@@ -29,7 +29,7 @@
 #include "hw/registerfields.h"
 #include "hw/ssi/ibex_spi_host.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "migration/vmstate.h"
 #include "trace.h"

diff --git a/hw/ssi/npcm7xx_fiu.c b/hw/ssi/npcm7xx_fiu.c
index bc5e4e20ccd7324846fb5d6e3d6e0de99a56d3dd..02707de350f01f63801cecc8b5593f579d0c5038 100644 (file)
--- a/hw/ssi/npcm7xx_fiu.c
+++ b/hw/ssi/npcm7xx_fiu.c
@@ -17,7 +17,7 @@
 #include "qemu/osdep.h"
 
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/ssi/npcm7xx_fiu.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"

diff --git a/hw/ssi/pnv_spi.c b/hw/ssi/pnv_spi.c
index e59386712b42f1f743cdc28e5f4527c522640f5e..1cf3a4416de5a2e94ad724768cc08251ac7d31ad 100644 (file)
--- a/hw/ssi/pnv_spi.c
+++ b/hw/ssi/pnv_spi.c
@@ -8,7 +8,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/ppc/pnv_xscom.h"
 #include "hw/ssi/pnv_spi.h"
 #include "hw/ssi/pnv_spi_regs.h"

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

diff --git a/hw/ssi/ssi.c b/hw/ssi/ssi.c
index d0de640fe64280d0aa9ffb2cbc9d9efc5b68ce16..3a4fade2d5ba232451224a882e2fb70276453b75 100644 (file)
--- a/hw/ssi/ssi.c
+++ b/hw/ssi/ssi.c
@@ -13,7 +13,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/ssi/ssi.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"

diff --git a/hw/ssi/xilinx_spi.c b/hw/ssi/xilinx_spi.c
index 9e8656b5560b4f5da859b5ba307870777994cf54..6dcdd63916a1c55257ab939e407a2eaacdfb9004 100644 (file)
--- a/hw/ssi/xilinx_spi.c
+++ b/hw/ssi/xilinx_spi.c
@@ -32,7 +32,7 @@
 #include "qemu/fifo8.h"
 
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/ssi/ssi.h"
 #include "qom/object.h"

diff --git a/hw/ssi/xilinx_spips.c b/hw/ssi/xilinx_spips.c
index 5fa9bf965ffde9e6348d94184be7d1abf6b2724a..e3c6035c16960eda4acf02119ebe57f17f79d773 100644 (file)
--- a/hw/ssi/xilinx_spips.c
+++ b/hw/ssi/xilinx_spips.c
@@ -26,7 +26,7 @@
 #include "hw/sysbus.h"
 #include "hw/core/irq.h"
 #include "hw/core/ptimer.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "qemu/bitops.h"

diff --git a/hw/ssi/xlnx-versal-ospi.c b/hw/ssi/xlnx-versal-ospi.c
index 88fafb5a2ed1b635f4f786ed74252561a7e544e2..93cdc9d39997f15fa08b4fa4107ae4e0c3ced8e1 100644 (file)
--- a/hw/ssi/xlnx-versal-ospi.c
+++ b/hw/ssi/xlnx-versal-ospi.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qemu/bitops.h"
 #include "qemu/log.h"
 #include "hw/core/irq.h"

diff --git a/hw/timer/a9gtimer.c b/hw/timer/a9gtimer.c
index a0b73fb731156e6570573cd06de2363312ecca09..a2363a89a5f5018c9b7ef371de8e16aea5f4ad46 100644 (file)
--- a/hw/timer/a9gtimer.c
+++ b/hw/timer/a9gtimer.c
@@ -23,7 +23,7 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/timer/a9gtimer.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"

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

diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c
index adec87cc8d2da74585ec817aa736b43eb6fc1c75..869db913d40cd685bf7c1e0a34228eefc626bb18 100644 (file)
--- a/hw/timer/arm_mptimer.c
+++ b/hw/timer/arm_mptimer.c
@@ -23,7 +23,7 @@
 #include "hw/hw.h"
 #include "hw/core/irq.h"
 #include "hw/core/ptimer.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/timer/arm_mptimer.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"

diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c
index 8d8b250698c67c1af13a883ffb9e9bb55cd6639f..c38e56f5b897e4c30317c53f03657efc34257d0d 100644 (file)
--- a/hw/timer/arm_timer.c
+++ b/hw/timer/arm_timer.c
@@ -13,7 +13,7 @@
 #include "qemu/timer.h"
 #include "hw/core/irq.h"
 #include "hw/core/ptimer.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qemu/module.h"
 #include "qemu/log.h"
 #include "qom/object.h"

diff --git a/hw/timer/aspeed_timer.c b/hw/timer/aspeed_timer.c
index b08a737bc975cfc3d96769b57959b6832345bc11..20adb7decbe337f876000f2856fe1a197ab76fbf 100644 (file)
--- a/hw/timer/aspeed_timer.c
+++ b/hw/timer/aspeed_timer.c
@@ -19,7 +19,7 @@
 #include "qemu/timer.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "trace.h"
 
 #define TIMER_NR_REGS 4

diff --git a/hw/timer/avr_timer16.c b/hw/timer/avr_timer16.c
index 0f1fda4218f61a715d93d63b78942c6da8bbb124..1a65a61ed2b75edaf37abcff94a176d1a9537ec6 100644 (file)
--- a/hw/timer/avr_timer16.c
+++ b/hw/timer/avr_timer16.c
@@ -35,7 +35,7 @@
 #include "qapi/error.h"
 #include "qemu/log.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/timer/avr_timer16.h"
 #include "trace.h"
 

diff --git a/hw/timer/cmsdk-apb-dualtimer.c b/hw/timer/cmsdk-apb-dualtimer.c
index 5f4848ef6181e6ab25996890f624447d4bceb94c..bcb6f8e43d7ebb7955dbd371b547b2ae3d4a2b82 100644 (file)
--- a/hw/timer/cmsdk-apb-dualtimer.c
+++ b/hw/timer/cmsdk-apb-dualtimer.c
@@ -23,7 +23,7 @@
 #include "qemu/module.h"
 #include "hw/sysbus.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/registerfields.h"
 #include "hw/core/qdev-clock.h"
 #include "hw/timer/cmsdk-apb-dualtimer.h"

diff --git a/hw/timer/grlib_gptimer.c b/hw/timer/grlib_gptimer.c
index 82d0d9d7622425c278b5b461a89a0fbc327bb681..dbce6f736fa98fd9b8115f02ee2af927945b06b7 100644 (file)
--- a/hw/timer/grlib_gptimer.c
+++ b/hw/timer/grlib_gptimer.c
@@ -30,7 +30,7 @@
 #include "qemu/timer.h"
 #include "hw/core/irq.h"
 #include "hw/core/ptimer.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qemu/module.h"
 
 #include "trace.h"

diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
index 1387c417ae1ebd4f367d64d863ef84efad14e0d1..82006df0e3460413c4b3aa640b8e9b7b9fc10828 100644 (file)
--- a/hw/timer/hpet.c
+++ b/hw/timer/hpet.c
@@ -29,7 +29,7 @@
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qemu/timer.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/timer/hpet.h"
 #include "hw/sysbus.h"
 #include "hw/rtc/mc146818rtc.h"

diff --git a/hw/timer/ibex_timer.c b/hw/timer/ibex_timer.c
index d2c4f86e038c3d98deced87fcd33ae3386b98b31..ee186521893ecc538f0ffd82f662c4ea4918d9cf 100644 (file)
--- a/hw/timer/ibex_timer.c
+++ b/hw/timer/ibex_timer.c
@@ -30,7 +30,7 @@
 #include "qemu/timer.h"
 #include "hw/timer/ibex_timer.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "target/riscv/cpu.h"
 #include "migration/vmstate.h"
 

diff --git a/hw/timer/mss-timer.c b/hw/timer/mss-timer.c
index 946e87c99a63fbe63857f535e14fdb1d3165b2e8..bd3f3e845fd87758eab2653c61623a684936adde 100644 (file)
--- a/hw/timer/mss-timer.c
+++ b/hw/timer/mss-timer.c
@@ -27,7 +27,7 @@
 #include "qemu/module.h"
 #include "qemu/log.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/timer/mss-timer.h"
 #include "migration/vmstate.h"
 

diff --git a/hw/timer/npcm7xx_timer.c b/hw/timer/npcm7xx_timer.c
index 0e62add74d32a2a6dc5087f0dd195c2fb2f971c1..16b62d3374bfb96d0a4cd16be1bac2d4e1a9736c 100644 (file)
--- a/hw/timer/npcm7xx_timer.c
+++ b/hw/timer/npcm7xx_timer.c
@@ -18,7 +18,7 @@
 
 #include "hw/core/irq.h"
 #include "hw/core/qdev-clock.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/timer/npcm7xx_timer.h"
 #include "migration/vmstate.h"
 #include "qemu/bitops.h"

diff --git a/hw/timer/nrf51_timer.c b/hw/timer/nrf51_timer.c
index 0688f49eefb9ff760e255d163f1f952bd950f3c1..b0443b94827b1f59a9bcfefb76cb2263bffe609e 100644 (file)
--- a/hw/timer/nrf51_timer.c
+++ b/hw/timer/nrf51_timer.c
@@ -17,7 +17,7 @@
 #include "hw/arm/nrf51.h"
 #include "hw/core/irq.h"
 #include "hw/timer/nrf51_timer.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "trace.h"
 

diff --git a/hw/timer/pxa2xx_timer.c b/hw/timer/pxa2xx_timer.c
index d18d98b23374e37e384ab9f51fe30f0368c700ae..b875c0505253ef00c41c7d164feb7190e6dd3a81 100644 (file)
--- a/hw/timer/pxa2xx_timer.c
+++ b/hw/timer/pxa2xx_timer.c
@@ -9,7 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qemu/timer.h"
 #include "system/runstate.h"
 #include "hw/sysbus.h"

diff --git a/hw/timer/renesas_cmt.c b/hw/timer/renesas_cmt.c
index c62dad690ff5f51b61a207357aec61ff4e626b42..35962e66c32dc7e189090c41b6e2d32283d59ccf 100644 (file)
--- a/hw/timer/renesas_cmt.c
+++ b/hw/timer/renesas_cmt.c
@@ -25,7 +25,7 @@
 #include "qemu/log.h"
 #include "hw/core/irq.h"
 #include "hw/registerfields.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/timer/renesas_cmt.h"
 #include "migration/vmstate.h"
 

diff --git a/hw/timer/renesas_tmr.c b/hw/timer/renesas_tmr.c
index 1fc539e9497ba6a686d593fa35ac4446271d65df..2e7d7d4543a612cbd88a46b74ca0acd7e2bfa0aa 100644 (file)
--- a/hw/timer/renesas_tmr.c
+++ b/hw/timer/renesas_tmr.c
@@ -25,7 +25,7 @@
 #include "qemu/log.h"
 #include "hw/core/irq.h"
 #include "hw/registerfields.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/timer/renesas_tmr.h"
 #include "migration/vmstate.h"
 

diff --git a/hw/timer/sifive_pwm.c b/hw/timer/sifive_pwm.c
index f1882ae6bc111ca5d0c068e4be70331f4837939f..8fda5445e74b09141b18709058c779ce1632c003 100644 (file)
--- a/hw/timer/sifive_pwm.c
+++ b/hw/timer/sifive_pwm.c
@@ -28,7 +28,7 @@
 #include "trace.h"
 #include "hw/core/irq.h"
 #include "hw/timer/sifive_pwm.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/registerfields.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"

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

diff --git a/hw/timer/sse-timer.c b/hw/timer/sse-timer.c
index 1de882f3eb353027f470708888694832778f6b40..50d1de580557efd8a5f431a34349280ea084e05f 100644 (file)
--- a/hw/timer/sse-timer.c
+++ b/hw/timer/sse-timer.c
@@ -45,7 +45,7 @@
 #include "hw/registerfields.h"
 #include "hw/core/clock.h"
 #include "hw/core/qdev-clock.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 
 REG32(CNTPCT_LO, 0x0)

diff --git a/hw/timer/stm32f2xx_timer.c b/hw/timer/stm32f2xx_timer.c
index 979b6ad5bae7d69eaee4f564965970b305b42273..0442ac64adcce24d09baeaaf7b0f3b13a8a098b4 100644 (file)
--- a/hw/timer/stm32f2xx_timer.c
+++ b/hw/timer/stm32f2xx_timer.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/timer/stm32f2xx_timer.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"

diff --git a/hw/timer/xilinx_timer.c b/hw/timer/xilinx_timer.c
index fbc10015916eaa333d3a63d11b45525c95cb4201..57a2c7101d1c10c5109d162f341b496757bb80dc 100644 (file)
--- a/hw/timer/xilinx_timer.c
+++ b/hw/timer/xilinx_timer.c
@@ -30,7 +30,7 @@
 #include "hw/sysbus.h"
 #include "hw/core/irq.h"
 #include "hw/core/ptimer.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/tpm/tpm_crb.c b/hw/tpm/tpm_crb.c
index bc7a78f898ca95724131adf2d72d838592b23e68..8723536f931c24f95a83a59f5c137a5ca4d6eda3 100644 (file)
--- a/hw/tpm/tpm_crb.c
+++ b/hw/tpm/tpm_crb.c
@@ -19,7 +19,7 @@
 #include "qemu/module.h"
 #include "qapi/error.h"
 #include "system/address-spaces.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/pci/pci_ids.h"
 #include "hw/acpi/tpm.h"
 #include "migration/vmstate.h"

diff --git a/hw/tpm/tpm_prop.h b/hw/tpm/tpm_prop.h
index c4df74805a7985ed664c40492bced921ed0c23c0..876f5c80fcdd975d689695942cd4066a8077aebc 100644 (file)
--- a/hw/tpm/tpm_prop.h
+++ b/hw/tpm/tpm_prop.h
@@ -23,7 +23,7 @@
 #define HW_TPM_PROP_H
 
 #include "system/tpm_backend.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 
 extern const PropertyInfo qdev_prop_tpm;
 

diff --git a/hw/tpm/tpm_spapr.c b/hw/tpm/tpm_spapr.c
index ea608ba4c800db285dae815fc4c2cc178dd19d5c..19075d1f012fe9480397e6adb184a8036bca8480 100644 (file)
--- a/hw/tpm/tpm_spapr.c
+++ b/hw/tpm/tpm_spapr.c
@@ -16,7 +16,7 @@
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 
 #include "system/tpm_backend.h"

diff --git a/hw/tpm/tpm_tis_common.c b/hw/tpm/tpm_tis_common.c
index 1615be29339f43ecce240ae72f1b3cdbfd3e9646..f594b15b8ab1e0d583bdccfda514da5252844e30 100644 (file)
--- a/hw/tpm/tpm_tis_common.c
+++ b/hw/tpm/tpm_tis_common.c
@@ -32,7 +32,7 @@
 
 #include "hw/acpi/tpm.h"
 #include "hw/pci/pci_ids.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "system/tpm_backend.h"
 #include "system/tpm_util.h"

diff --git a/hw/tpm/tpm_tis_isa.c b/hw/tpm/tpm_tis_isa.c
index dce83057a9486d72e51206eda6fde460c4fcb07d..61e95434f5b824fa99f0a2aff7f151e87ea631ed 100644 (file)
--- a/hw/tpm/tpm_tis_isa.c
+++ b/hw/tpm/tpm_tis_isa.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/isa/isa.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/acpi/tpm.h"
 #include "tpm_prop.h"

diff --git a/hw/tpm/tpm_tis_sysbus.c b/hw/tpm/tpm_tis_sysbus.c
index 2ffa85852acd55b0b83704d8241a91767123a9ca..07c304013012564dae2598c871cbfeae59184882 100644 (file)
--- a/hw/tpm/tpm_tis_sysbus.c
+++ b/hw/tpm/tpm_tis_sysbus.c
@@ -23,7 +23,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/acpi/tpm.h"
 #include "tpm_prop.h"

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

diff --git a/hw/tricore/tricore_testdevice.c b/hw/tricore/tricore_testdevice.c
index e8daf9529828e5006942e558ca8cafbdbc8c3953..d3ffc5fe9f3596e8999648c49ae0ca33004dc997 100644 (file)
--- a/hw/tricore/tricore_testdevice.c
+++ b/hw/tricore/tricore_testdevice.c
@@ -18,7 +18,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "hw/sysbus.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/tricore/tricore_testdevice.h"
 
 static void tricore_testdevice_write(void *opaque, hwaddr offset,

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

diff --git a/hw/usb/bus.c b/hw/usb/bus.c
index c1dd142965886fca040e88aa955dfb47337f4c75..3b6fbd46ac3f8ef9822aa6f7056a7fd7dc2a36c4 100644 (file)
--- a/hw/usb/bus.c
+++ b/hw/usb/bus.c
@@ -1,5 +1,5 @@
 #include "qemu/osdep.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/usb/usb.h"
 #include "qapi/error.h"
 #include "qapi/qapi-commands-machine.h"

diff --git a/hw/usb/canokey.c b/hw/usb/canokey.c
index acd4ea30d981b978f0ca2701f3ad12fb724b63fb..c3baedac2c2039dc82960a5ec768310c93969d11 100644 (file)
--- a/hw/usb/canokey.c
+++ b/hw/usb/canokey.c
@@ -13,7 +13,7 @@
 #include "qemu/module.h"
 #include "qapi/error.h"
 #include "hw/usb/usb.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "trace.h"
 #include "desc.h"
 #include "canokey.h"

diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c
index c21cefd82d2110d33d71f0e2d0f54f68ff7c43f6..985f21997aa85f6666dc983251136e26c8533175 100644 (file)
--- a/hw/usb/ccid-card-emulated.c
+++ b/hw/usb/ccid-card-emulated.c
@@ -34,7 +34,7 @@
 #include "qemu/main-loop.h"
 #include "qemu/module.h"
 #include "ccid.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
 #include "qom/object.h"
 

diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c
index c8aada0988d4fd2f32e28796b33b85909b9f6448..306dd7d914617128319f979791c3d01b97a7e457 100644 (file)
--- a/hw/usb/ccid-card-passthru.c
+++ b/hw/usb/ccid-card-passthru.c
@@ -13,7 +13,7 @@
 #include "qemu/units.h"
 #include <libcacard.h>
 #include "chardev/char-fe.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "migration/vmstate.h"
 #include "qemu/error-report.h"

diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c
index 988824ea750bd198baa24d611c250fb15e6530d6..dfda2dccc04102c288c73e4a0f317c02dedb88c7 100644 (file)
--- a/hw/usb/dev-audio.c
+++ b/hw/usb/dev-audio.c
@@ -31,7 +31,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/module.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/usb/usb.h"
 #include "migration/vmstate.h"
 #include "desc.h"

diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c
index 296e9d0d856f821dfad70d374e80a0a8e6b9e614..ae19d60203f086589c7798e4e553c05ab674bb8e 100644 (file)
--- a/hw/usb/dev-hid.c
+++ b/hw/usb/dev-hid.c
@@ -33,7 +33,7 @@
 #include "qemu/timer.h"
 #include "hw/input/hid.h"
 #include "hw/usb/hid.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qom/object.h"
 
 struct USBHIDState {

diff --git a/hw/usb/dev-hub.c b/hw/usb/dev-hub.c
index f418da14094a22908242054a97ee1008b8c78707..b45d571fa830beed33a8e2242faef919d0fc9629 100644 (file)
--- a/hw/usb/dev-hub.c
+++ b/hw/usb/dev-hub.c
@@ -26,7 +26,7 @@
 #include "qapi/error.h"
 #include "qemu/timer.h"
 #include "trace.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/usb/usb.h"
 #include "migration/vmstate.h"
 #include "desc.h"

diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c
index 04e8eedbf614443ea179ebc66047bf4f62e8fddc..1d8cfd32dc65c874d937bfcdd3b1d30874061bc3 100644 (file)
--- a/hw/usb/dev-mtp.c
+++ b/hw/usb/dev-mtp.c
@@ -22,7 +22,7 @@
 #include "qemu/module.h"
 #include "qemu/filemonitor.h"
 #include "trace.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/usb/usb.h"
 #include "migration/vmstate.h"
 #include "desc.h"

diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c
index 34cd906d6cc1783b75e47cef5e8ec59e2877aa7e..568a6ff24c6a2a192a7d4e539a3ccbf5c93e51fd 100644 (file)
--- a/hw/usb/dev-network.c
+++ b/hw/usb/dev-network.c
@@ -25,7 +25,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/usb/usb.h"
 #include "migration/vmstate.h"
 #include "desc.h"

diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c
index 17bdff9e820c438bdd6ef4dae7129e32159eb9e0..286c7711f64f67ed71b5448f3b831b6899cda940 100644 (file)
--- a/hw/usb/dev-serial.c
+++ b/hw/usb/dev-serial.c
@@ -13,7 +13,7 @@
 #include "qemu/cutils.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/usb/usb.h"
 #include "migration/vmstate.h"

diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c
index a1081e545aa451a6337c69c1adc29c4dcf9dd590..964c142d1066f2f7839f924dc65cea9a4276f1a3 100644 (file)
--- a/hw/usb/dev-smartcard-reader.c
+++ b/hw/usb/dev-smartcard-reader.c
@@ -40,7 +40,7 @@
 #include "qemu/cutils.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/usb/usb.h"
 #include "migration/vmstate.h"
 #include "desc.h"

diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c
index bbd97406f00573de3504de7fb370e5a9418bce99..040cf150518155d657ff70b14510a713d2dbbf59 100644 (file)
--- a/hw/usb/dev-storage.c
+++ b/hw/usb/dev-storage.c
@@ -16,7 +16,7 @@
 #include "hw/usb/usb.h"
 #include "hw/usb/msd.h"
 #include "desc.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/scsi/scsi.h"
 #include "migration/vmstate.h"
 #include "qemu/cutils.h"

diff --git a/hw/usb/dev-uas.c b/hw/usb/dev-uas.c
index 75f01c74038758960d083ac9ea492ca418606965..8576dfec96f778a55a395366fc0d1ff22abf3649 100644 (file)
--- a/hw/usb/dev-uas.c
+++ b/hw/usb/dev-uas.c
@@ -21,7 +21,7 @@
 #include "hw/usb/usb.h"
 #include "migration/vmstate.h"
 #include "desc.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/scsi/scsi.h"
 #include "scsi/constants.h"
 #include "qom/object.h"

diff --git a/hw/usb/hcd-dwc2.c b/hw/usb/hcd-dwc2.c
index 83864505bb8906bff7bcdf089a152ba71314c299..cd3b61158d17f62c7fee04277b5a1d7593dc0225 100644 (file)
--- a/hw/usb/hcd-dwc2.c
+++ b/hw/usb/hcd-dwc2.c
@@ -41,7 +41,7 @@
 #include "qemu/log.h"
 #include "qemu/error-report.h"
 #include "qemu/main-loop.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 
 #define USB_HZ_FS       12000000
 #define USB_HZ_HS       96000000

diff --git a/hw/usb/hcd-dwc3.c b/hw/usb/hcd-dwc3.c
index 98a342b8b82248f928f3dd2667581170271c6fe3..74dff39fda1314a1860d05b8889f6d281e875d97 100644 (file)
--- a/hw/usb/hcd-dwc3.c
+++ b/hw/usb/hcd-dwc3.c
@@ -33,7 +33,7 @@
 #include "qemu/bitops.h"
 #include "qom/object.h"
 #include "migration/vmstate.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/usb/hcd-dwc3.h"
 #include "qapi/error.h"
 

diff --git a/hw/usb/hcd-ehci-pci.c b/hw/usb/hcd-ehci-pci.c
index 38ad3406b32599349efdf61c33e7a0d5f7c885e5..9febcc10314811c6314b8fdbaf42e5a8c52ca2e2 100644 (file)
--- a/hw/usb/hcd-ehci-pci.c
+++ b/hw/usb/hcd-ehci-pci.c
@@ -16,7 +16,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/usb/hcd-ehci.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"

diff --git a/hw/usb/hcd-ehci-sysbus.c b/hw/usb/hcd-ehci-sysbus.c
index 0449f5fa6d6d03380173dd770d56e7f8d5c3af5a..b31032bbf39e92c807fc9b5e1e3bde0cd35533fe 100644 (file)
--- a/hw/usb/hcd-ehci-sysbus.c
+++ b/hw/usb/hcd-ehci-sysbus.c
@@ -16,7 +16,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/usb/hcd-ehci.h"
 #include "migration/vmstate.h"
 

diff --git a/hw/usb/hcd-ohci-pci.c b/hw/usb/hcd-ohci-pci.c
index 25c400698ee5d591054947c74408355dede0a42b..bdbbaaa87a3a25c5b41bdcd692d318ae9d217a88 100644 (file)
--- a/hw/usb/hcd-ohci-pci.c
+++ b/hw/usb/hcd-ohci-pci.c
@@ -26,7 +26,7 @@
 #include "hw/pci/pci_device.h"
 #include "hw/sysbus.h"
 #include "hw/core/qdev-dma.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "trace.h"
 #include "hcd-ohci.h"
 #include "qom/object.h"

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

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

diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c
index c243a4f42cc12c0b2f2d9c2ebad81f133f52a167..b2224c7f7660b9e9d24a29358ef1a47e5d6b43b5 100644 (file)
--- a/hw/usb/hcd-uhci.c
+++ b/hw/usb/hcd-uhci.c
@@ -32,7 +32,7 @@
 #include "migration/vmstate.h"
 #include "hw/pci/pci.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
 #include "qemu/timer.h"
 #include "qemu/iov.h"

diff --git a/hw/usb/hcd-xhci-nec.c b/hw/usb/hcd-xhci-nec.c
index 5fc853eb33067d60fb7f548ec955111ee4d2c08e..46839911f3fa9e776416b5ffcbb16020fcc64b9e 100644 (file)
--- a/hw/usb/hcd-xhci-nec.c
+++ b/hw/usb/hcd-xhci-nec.c
@@ -23,7 +23,7 @@
 #include "hw/usb/usb.h"
 #include "qemu/module.h"
 #include "hw/pci/pci.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 
 #include "hcd-xhci-pci.h"
 

diff --git a/hw/usb/hcd-xhci-pci.c b/hw/usb/hcd-xhci-pci.c
index b93c80b09d8237a1d2a5df0f5c7262fd1a292324..aa570506fc117b2a4ecafb38ae9254d5b36a3b60 100644 (file)
--- a/hw/usb/hcd-xhci-pci.c
+++ b/hw/usb/hcd-xhci-pci.c
@@ -24,7 +24,7 @@
  */
 #include "qemu/osdep.h"
 #include "hw/pci/pci.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/pci/msi.h"
 #include "hw/pci/msix.h"

diff --git a/hw/usb/hcd-xhci-sysbus.c b/hw/usb/hcd-xhci-sysbus.c
index 862673054a09f3c43c9a1fcab6a6bc4f535e64ca..19664c5985e1911b95975db5affe8d4fb59acc7d 100644 (file)
--- a/hw/usb/hcd-xhci-sysbus.c
+++ b/hw/usb/hcd-xhci-sysbus.c
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 #include "qemu/osdep.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "trace.h"
 #include "qapi/error.h"

diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index 292c378bfc98bf458f7f760cdb6f1f21f23a7633..2cdab3ba0e44a2f1b74fda64c4808c1b836fc77e 100644 (file)
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -25,7 +25,7 @@
 #include "qemu/module.h"
 #include "qemu/queue.h"
 #include "migration/vmstate.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "trace.h"
 #include "qapi/error.h"
 

diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c
index 38893b5e68070e3dac8a8b8e51f7db31bcb9632c..b9f3ad3f66dd7f3142433e86575f3ce78062d66b 100644 (file)
--- a/hw/usb/host-libusb.c
+++ b/hw/usb/host-libusb.c
@@ -55,7 +55,7 @@
 #include "system/system.h"
 #include "trace.h"
 
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/usb/usb.h"
 
 /* ------------------------------------------------------------------------ */

diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index 1a73db68f26793f4faab135ee2acca0eb67cfe0b..6fd04b7b4218a916e29013807854e45f8305b63e 100644 (file)
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -41,7 +41,7 @@
 #include <usbredirparser.h>
 #include <usbredirfilter.h>
 
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/usb/usb.h"
 #include "migration/qemu-file-types.h"

diff --git a/hw/usb/u2f-emulated.c b/hw/usb/u2f-emulated.c
index 783e7f1af0b095076726903793d20a345ac8558e..196d05a83a53e71db7665068d61fc8595e91f444 100644 (file)
--- a/hw/usb/u2f-emulated.c
+++ b/hw/usb/u2f-emulated.c
@@ -29,7 +29,7 @@
 #include "qemu/main-loop.h"
 #include "qapi/error.h"
 #include "hw/usb/usb.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 
 #include <u2f-emu/u2f-emu.h>
 

diff --git a/hw/usb/u2f-passthru.c b/hw/usb/u2f-passthru.c
index b3206fb7fe43ab10ac8e682e58080d9c78245927..59b5f9829d43571094a5a706cad465bdc57c8ddd 100644 (file)
--- a/hw/usb/u2f-passthru.c
+++ b/hw/usb/u2f-passthru.c
@@ -28,7 +28,7 @@
 #include "qemu/main-loop.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/usb/usb.h"
 #include "migration/vmstate.h"
 

diff --git a/hw/usb/xlnx-usb-subsystem.c b/hw/usb/xlnx-usb-subsystem.c
index 98967ef49f1cc52dcc4c6d68ca886e242da7ea17..7193dd4cd2c26294ce30bdc6e726b55ad4b817ca 100644 (file)
--- a/hw/usb/xlnx-usb-subsystem.c
+++ b/hw/usb/xlnx-usb-subsystem.c
@@ -28,7 +28,7 @@
 #include "qemu/bitops.h"
 #include "qom/object.h"
 #include "qapi/error.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/usb/xlnx-usb-subsystem.h"
 
 static void versal_usb2_realize(DeviceState *dev, Error **errp)

diff --git a/hw/vfio-user/pci.c b/hw/vfio-user/pci.c
index 353d07e7819b2003cc60c2dfc8a1327a95270323..64b8b3cb8cf5d66879af1703c4f2b5ae0c7418ca 100644 (file)
--- a/hw/vfio-user/pci.c
+++ b/hw/vfio-user/pci.c
@@ -11,7 +11,7 @@
 #include "qapi-visit-sockets.h"
 #include "qemu/error-report.h"
 
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/vfio/pci.h"
 #include "hw/vfio-user/device.h"
 #include "hw/vfio-user/proxy.h"

diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c
index 3368ac89150c6f3cc4a7fb90b0983b8bc223c477..e58a0169af98d2d561ec8f052f59df07d42ddb99 100644 (file)
--- a/hw/vfio/ap.c
+++ b/hw/vfio/ap.c
@@ -28,7 +28,7 @@
 #include "qemu/config-file.h"
 #include "kvm/kvm_s390x.h"
 #include "migration/vmstate.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/s390x/ap-bridge.h"
 #include "system/address-spaces.h"
 #include "qom/object.h"

diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c
index 4d9588e7aa1c0868fc2530d7e297676834d85259..2251facb3564be33da053f763d860c7ca4127de1 100644 (file)
--- a/hw/vfio/ccw.c
+++ b/hw/vfio/ccw.c
@@ -25,7 +25,7 @@
 #include "system/iommufd.h"
 #include "hw/s390x/s390-ccw.h"
 #include "hw/s390x/vfio-ccw.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/s390x/ccw-device.h"
 #include "system/address-spaces.h"
 #include "qemu/error-report.h"

diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c
index b5da6afbf5b0076442c81808e64c5abb6f775336..7b907b9360d1e1e520ae71139f4a95f4b3d994ef 100644 (file)
--- a/hw/vfio/pci-quirks.c
+++ b/hw/vfio/pci-quirks.c
@@ -23,7 +23,7 @@
 #include "qapi/visitor.h"
 #include <sys/ioctl.h>
 #include "hw/nvram/fw_cfg.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "pci.h"
 #include "pci-quirks.h"
 #include "trace.h"

diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index b46b1305a7b6e895e26bea687f1aa4513ca48b47..6b71605dd97ff14c0cd3132df93d04bb1c7be39f 100644 (file)
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -27,7 +27,7 @@
 #include "hw/pci/msi.h"
 #include "hw/pci/msix.h"
 #include "hw/pci/pci_bridge.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/vfio/vfio-cpr.h"
 #include "migration/vmstate.h"

diff --git a/hw/virtio/vdpa-dev-pci.c b/hw/virtio/vdpa-dev-pci.c
index 30681121465306feb0474d4ffc4bf99b9b0710dd..c047b0400db0448be85c85522c62fb9003786396 100644 (file)
--- a/hw/virtio/vdpa-dev-pci.c
+++ b/hw/virtio/vdpa-dev-pci.c
@@ -19,7 +19,7 @@
 #include "hw/virtio/virtio.h"
 #include "hw/virtio/vdpa-dev.h"
 #include "hw/pci/pci.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"

diff --git a/hw/virtio/vdpa-dev.c b/hw/virtio/vdpa-dev.c
index 57739385a96d8fb9bcb8f15460028b8c306605d8..3a6de7ebb436c10b027d417c1c5b7280104ef684 100644 (file)
--- a/hw/virtio/vdpa-dev.c
+++ b/hw/virtio/vdpa-dev.c
@@ -20,7 +20,7 @@
 #include "qemu/error-report.h"
 #include "qemu/cutils.h"
 #include "hw/core/qdev.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/virtio/vhost.h"
 #include "hw/virtio/virtio.h"

diff --git a/hw/virtio/vhost-scsi-pci.c b/hw/virtio/vhost-scsi-pci.c
index 7399acef8e246385b0f96ece98adb235aad7f8eb..a78e13e0381c88f0908a2f6a1dab5ebd8bffdd5f 100644 (file)
--- a/hw/virtio/vhost-scsi-pci.c
+++ b/hw/virtio/vhost-scsi-pci.c
@@ -17,7 +17,7 @@
 #include "qemu/osdep.h"
 
 #include "standard-headers/linux/virtio_pci.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/vhost-scsi.h"
 #include "qapi/error.h"
 #include "qemu/module.h"

diff --git a/hw/virtio/vhost-user-base.c b/hw/virtio/vhost-user-base.c
index ff67a020b471b2edfacc6d238ffc50b3ba36afc4..01ab9ca56b1388bfa75b0663b0afdc3e5e97bcb5 100644 (file)
--- a/hw/virtio/vhost-user-base.c
+++ b/hw/virtio/vhost-user-base.c
@@ -12,7 +12,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio-bus.h"
 #include "hw/virtio/vhost-user-base.h"
 #include "qemu/error-report.h"

diff --git a/hw/virtio/vhost-user-blk-pci.c b/hw/virtio/vhost-user-blk-pci.c
index 904369f5a3df470dcd5e6556a9ff5e142e4effe2..20d100f665dd5c9ff692aa86fdba7f9769667b93 100644 (file)
--- a/hw/virtio/vhost-user-blk-pci.c
+++ b/hw/virtio/vhost-user-blk-pci.c
@@ -22,7 +22,7 @@
 #include "hw/virtio/virtio.h"
 #include "hw/virtio/vhost-user-blk.h"
 #include "hw/pci/pci.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"

diff --git a/hw/virtio/vhost-user-fs-pci.c b/hw/virtio/vhost-user-fs-pci.c
index 1490c118bca1e4612f817c4edcb3c6d3caad1345..92ae2fc8a678838f9176281056ffc1136168b838 100644 (file)
--- a/hw/virtio/vhost-user-fs-pci.c
+++ b/hw/virtio/vhost-user-fs-pci.c
@@ -12,7 +12,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/vhost-user-fs.h"
 #include "hw/virtio/virtio-pci.h"
 #include "qom/object.h"

diff --git a/hw/virtio/vhost-user-fs.c b/hw/virtio/vhost-user-fs.c
index e77c69eb12e06d63a5513641ae5dc8b98c6172da..0acd9580b13496b73867bb2874961be23cd31a99 100644 (file)
--- a/hw/virtio/vhost-user-fs.c
+++ b/hw/virtio/vhost-user-fs.c
@@ -15,7 +15,7 @@
 #include <sys/ioctl.h>
 #include "standard-headers/linux/virtio_fs.h"
 #include "qapi/error.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/virtio/virtio-bus.h"
 #include "hw/virtio/virtio-access.h"

diff --git a/hw/virtio/vhost-user-gpio-pci.c b/hw/virtio/vhost-user-gpio-pci.c
index 9b165b54f8fb8603c455cb598f1ae086805d8104..9bd59e7ae7ede1e228c996c939c2a84d5b21ceeb 100644 (file)
--- a/hw/virtio/vhost-user-gpio-pci.c
+++ b/hw/virtio/vhost-user-gpio-pci.c
@@ -7,7 +7,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/vhost-user-gpio.h"
 #include "hw/virtio/virtio-pci.h"
 

diff --git a/hw/virtio/vhost-user-gpio.c b/hw/virtio/vhost-user-gpio.c
index a7fd49b10a330d76b3841001c3e130b760446016..d473f8707787636c0eec2fc88dd0483963a44efc 100644 (file)
--- a/hw/virtio/vhost-user-gpio.c
+++ b/hw/virtio/vhost-user-gpio.c
@@ -8,7 +8,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio-bus.h"
 #include "hw/virtio/vhost-user-gpio.h"
 #include "standard-headers/linux/virtio_ids.h"

diff --git a/hw/virtio/vhost-user-i2c-pci.c b/hw/virtio/vhost-user-i2c-pci.c
index 692cd66fde6c40238b2f01509b607ff7dcf718f0..5ddae8367bb06b043324e3159aed7271968b1c30 100644 (file)
--- a/hw/virtio/vhost-user-i2c-pci.c
+++ b/hw/virtio/vhost-user-i2c-pci.c
@@ -7,7 +7,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/vhost-user-i2c.h"
 #include "hw/virtio/virtio-pci.h"
 

diff --git a/hw/virtio/vhost-user-i2c.c b/hw/virtio/vhost-user-i2c.c
index ae007fe97d90fba8716b8bcc3f6bbb7a346fba3c..152b1f67401346ac9c06d58bc83a0999f1cef7c6 100644 (file)
--- a/hw/virtio/vhost-user-i2c.c
+++ b/hw/virtio/vhost-user-i2c.c
@@ -8,7 +8,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio-bus.h"
 #include "hw/virtio/vhost-user-i2c.h"
 #include "qemu/error-report.h"

diff --git a/hw/virtio/vhost-user-rng-pci.c b/hw/virtio/vhost-user-rng-pci.c
index 9f45fc6f3558e3f3bb89ed0a13fb59433345c8ab..cc289d0cb36cafa6a948aa8333f4c262789f3630 100644 (file)
--- a/hw/virtio/vhost-user-rng-pci.c
+++ b/hw/virtio/vhost-user-rng-pci.c
@@ -7,7 +7,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/vhost-user-rng.h"
 #include "hw/virtio/virtio-pci.h"
 

diff --git a/hw/virtio/vhost-user-rng.c b/hw/virtio/vhost-user-rng.c
index 61dadcda05495253d29a229d1e269934a7890d93..106c8f211aaaf7bb2d8ca9c96b0c6767b54a0c1c 100644 (file)
--- a/hw/virtio/vhost-user-rng.c
+++ b/hw/virtio/vhost-user-rng.c
@@ -10,7 +10,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio-bus.h"
 #include "hw/virtio/vhost-user-rng.h"
 #include "standard-headers/linux/virtio_ids.h"

diff --git a/hw/virtio/vhost-user-scmi-pci.c b/hw/virtio/vhost-user-scmi-pci.c
index 0ab56a50bb3c4925ad700ef60446f735a1dbc554..9a83e1f1ba85c6368f0edceb1ef49363f59c1892 100644 (file)
--- a/hw/virtio/vhost-user-scmi-pci.c
+++ b/hw/virtio/vhost-user-scmi-pci.c
@@ -6,7 +6,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/vhost-user-scmi.h"
 #include "hw/virtio/virtio-pci.h"
 

diff --git a/hw/virtio/vhost-user-scsi-pci.c b/hw/virtio/vhost-user-scsi-pci.c
index 367b8f27da5c6953205a7cc1e2fd00ba0a959afa..174552eb71b31c1bdab41af0652c04814fe52fb6 100644 (file)
--- a/hw/virtio/vhost-user-scsi-pci.c
+++ b/hw/virtio/vhost-user-scsi-pci.c
@@ -22,7 +22,7 @@
 #include "hw/virtio/virtio.h"
 #include "hw/virtio/virtio-scsi.h"
 #include "hw/pci/pci.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"

diff --git a/hw/virtio/vhost-user-snd-pci.c b/hw/virtio/vhost-user-snd-pci.c
index f5015fb6c4e9514f53edd304d57497ef5fcbcdf2..90f47bf7a5207a6a186b8f12d726edafc03222b8 100644 (file)
--- a/hw/virtio/vhost-user-snd-pci.c
+++ b/hw/virtio/vhost-user-snd-pci.c
@@ -7,7 +7,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/vhost-user-snd.h"
 #include "hw/virtio/virtio-pci.h"
 

diff --git a/hw/virtio/vhost-user-snd.c b/hw/virtio/vhost-user-snd.c
index 732411c655111a8e623f6efb296323b24aed7dd9..7129b77d9c03f4a27a91a8ac3b3672e50fb2847a 100644 (file)
--- a/hw/virtio/vhost-user-snd.c
+++ b/hw/virtio/vhost-user-snd.c
@@ -10,7 +10,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio-bus.h"
 #include "hw/virtio/vhost-user-snd.h"
 #include "standard-headers/linux/virtio_ids.h"

diff --git a/hw/virtio/vhost-user-test-device-pci.c b/hw/virtio/vhost-user-test-device-pci.c
index b4ed0efb50f280144e934c5f79fe1ba995c35223..7f6d75169032eb9e7cd37e262e38fe163c3630dc 100644 (file)
--- a/hw/virtio/vhost-user-test-device-pci.c
+++ b/hw/virtio/vhost-user-test-device-pci.c
@@ -8,7 +8,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/vhost-user-base.h"
 #include "hw/virtio/virtio-pci.h"
 

diff --git a/hw/virtio/vhost-user-test-device.c b/hw/virtio/vhost-user-test-device.c
index 1b98ea3e4883d7ae4e3e2145ce69b15259bc0e3d..a2f963fdf60ae7f014f7a319b9673d06a9fbfc3e 100644 (file)
--- a/hw/virtio/vhost-user-test-device.c
+++ b/hw/virtio/vhost-user-test-device.c
@@ -14,7 +14,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio-bus.h"
 #include "hw/virtio/vhost-user-base.h"
 #include "qemu/error-report.h"

diff --git a/hw/virtio/vhost-user-vsock-pci.c b/hw/virtio/vhost-user-vsock-pci.c
index adb877b6e059a5be93c63ef834babae34b92681b..bac96c96d8ae59d9d2ab1793aa24df883b74a55b 100644 (file)
--- a/hw/virtio/vhost-user-vsock-pci.c
+++ b/hw/virtio/vhost-user-vsock-pci.c
@@ -11,7 +11,7 @@
 #include "qemu/osdep.h"
 
 #include "hw/virtio/virtio-pci.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/vhost-user-vsock.h"
 #include "qom/object.h"
 

diff --git a/hw/virtio/vhost-user-vsock.c b/hw/virtio/vhost-user-vsock.c
index 993c28734829af0ae7a33a941996838445e502dd..e20e0aee4396d97e7e53f8cac706a4918fbc056e 100644 (file)
--- a/hw/virtio/vhost-user-vsock.c
+++ b/hw/virtio/vhost-user-vsock.c
@@ -12,7 +12,7 @@
 
 #include "qapi/error.h"
 #include "qemu/error-report.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/virtio/vhost-user-vsock.h"
 

diff --git a/hw/virtio/vhost-vsock-common.c b/hw/virtio/vhost-vsock-common.c
index c6c44d8989fb9fe804dfbfe7e1e0ba36b859b067..b33def900a71b1019e381dcde05738f56b3a83d2 100644 (file)
--- a/hw/virtio/vhost-vsock-common.c
+++ b/hw/virtio/vhost-vsock-common.c
@@ -13,7 +13,7 @@
 #include "qapi/error.h"
 #include "hw/virtio/virtio-bus.h"
 #include "qemu/error-report.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/vhost.h"
 #include "hw/virtio/vhost-vsock.h"
 #include "qemu/iov.h"

diff --git a/hw/virtio/vhost-vsock-pci.c b/hw/virtio/vhost-vsock-pci.c
index 0022a713d438a6bef23594580facff4db871fe0c..3a94d06f8c01af340d74439e905ea56c6c35f42e 100644 (file)
--- a/hw/virtio/vhost-vsock-pci.c
+++ b/hw/virtio/vhost-vsock-pci.c
@@ -14,7 +14,7 @@
 #include "qemu/osdep.h"
 
 #include "hw/virtio/virtio-pci.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/vhost-vsock.h"
 #include "qemu/module.h"
 #include "qom/object.h"

diff --git a/hw/virtio/vhost-vsock.c b/hw/virtio/vhost-vsock.c
index 7940b60d8a5e767400455c358f2c2de25b1351a3..da244eb16579376b801fb402ab63328d787ba4b6 100644 (file)
--- a/hw/virtio/vhost-vsock.c
+++ b/hw/virtio/vhost-vsock.c
@@ -17,7 +17,7 @@
 #include "hw/virtio/virtio-access.h"
 #include "qemu/error-report.h"
 #include "qemu/sockets.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/vhost-vsock.h"
 #include "monitor/monitor.h"
 

diff --git a/hw/virtio/virtio-9p-pci.c b/hw/virtio/virtio-9p-pci.c
index 594742ff656939f9574c62170f56417addc49302..4b501ac2a37b0b46307ac215cde6060ba2123522 100644 (file)
--- a/hw/virtio/virtio-9p-pci.c
+++ b/hw/virtio/virtio-9p-pci.c
@@ -17,7 +17,7 @@
 
 #include "hw/virtio/virtio-pci.h"
 #include "hw/9pfs/virtio-9p.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qemu/module.h"
 #include "qom/object.h"
 

diff --git a/hw/virtio/virtio-balloon-pci.c b/hw/virtio/virtio-balloon-pci.c
index 96e88b6b86d604dbce65b9d9ac7a453a5dc43ad2..0bb5931bbcc8b0abceaf315042dcbc7027816e1f 100644 (file)
--- a/hw/virtio/virtio-balloon-pci.c
+++ b/hw/virtio/virtio-balloon-pci.c
@@ -15,7 +15,7 @@
 #include "qemu/osdep.h"
 
 #include "hw/virtio/virtio-pci.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio-balloon.h"
 #include "qapi/error.h"
 #include "qemu/module.h"

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

diff --git a/hw/virtio/virtio-blk-pci.c b/hw/virtio/virtio-blk-pci.c
index fd33bbd7e8306c9f52b0999d5279db1e0e7b93b3..64a434c81b59d68335b132cfdd6e07db3f38f933 100644 (file)
--- a/hw/virtio/virtio-blk-pci.c
+++ b/hw/virtio/virtio-blk-pci.c
@@ -17,7 +17,7 @@
 
 #include "qemu/osdep.h"
 
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio-blk.h"
 #include "hw/virtio/virtio-pci.h"
 #include "qapi/error.h"

diff --git a/hw/virtio/virtio-crypto-pci.c b/hw/virtio/virtio-crypto-pci.c
index 868abc03a9e8ca9a44b0246027cba39a982fbb5c..7b7dd056169df010f639d2f4613b31cb6abc0c95 100644 (file)
--- a/hw/virtio/virtio-crypto-pci.c
+++ b/hw/virtio/virtio-crypto-pci.c
@@ -14,7 +14,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/pci/pci.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio.h"
 #include "hw/virtio/virtio-bus.h"
 #include "hw/virtio/virtio-pci.h"

diff --git a/hw/virtio/virtio-crypto.c b/hw/virtio/virtio-crypto.c
index 517f2089c5a422c5448c3d26ebe9fbe4c8d3adea..cbd1810fbc6fa85f0981846b7eb20aee803ac578 100644 (file)
--- a/hw/virtio/virtio-crypto.c
+++ b/hw/virtio/virtio-crypto.c
@@ -20,7 +20,7 @@
 
 #include "hw/virtio/virtio.h"
 #include "hw/virtio/virtio-crypto.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "standard-headers/linux/virtio_ids.h"
 #include "system/cryptodev-vhost.h"
 

diff --git a/hw/virtio/virtio-input-pci.c b/hw/virtio/virtio-input-pci.c
index 3be5358b4cd14e11cb6f691b0c7c87af997c1c44..cd3560846069c54456c85f904cff7bf2cffb6be4 100644 (file)
--- a/hw/virtio/virtio-input-pci.c
+++ b/hw/virtio/virtio-input-pci.c
@@ -9,7 +9,7 @@
 #include "qemu/osdep.h"
 
 #include "hw/virtio/virtio-pci.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio-input.h"
 #include "qemu/module.h"
 #include "qom/object.h"

diff --git a/hw/virtio/virtio-iommu-pci.c b/hw/virtio/virtio-iommu-pci.c
index dd4100033f1cf35475b3d65413c27763a55c1286..9d32b8a7b3cd064d5b7d7b564558926aa03f7a1c 100644 (file)
--- a/hw/virtio/virtio-iommu-pci.c
+++ b/hw/virtio/virtio-iommu-pci.c
@@ -13,7 +13,7 @@
 
 #include "hw/virtio/virtio-pci.h"
 #include "hw/virtio/virtio-iommu.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "qapi/error.h"
 #include "hw/core/boards.h"

diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c
index 3500f1b0820c7bb1c0bce02a86a8118901196b6f..4226a676d07a6b37e9f2ef0da176c5c0bc1b205e 100644 (file)
--- a/hw/virtio/virtio-iommu.c
+++ b/hw/virtio/virtio-iommu.c
@@ -23,7 +23,7 @@
 #include "qemu/range.h"
 #include "qemu/reserved-region.h"
 #include "exec/target_page.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio.h"
 #include "system/kvm.h"
 #include "system/reset.h"

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

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

diff --git a/hw/virtio/virtio-net-pci.c b/hw/virtio/virtio-net-pci.c
index f857a84f11c1640f0b300b85989155ac3d3c6d21..fd3e0303f5f5b08bc6d4cb44bff699a46c16bb3a 100644 (file)
--- a/hw/virtio/virtio-net-pci.c
+++ b/hw/virtio/virtio-net-pci.c
@@ -17,7 +17,7 @@
 
 #include "qemu/osdep.h"
 
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio-net.h"
 #include "hw/virtio/virtio-pci.h"
 #include "qapi/error.h"

diff --git a/hw/virtio/virtio-nsm-pci.c b/hw/virtio/virtio-nsm-pci.c
index ec243963e1ecc9bd6cc7c3ae56cca602e6841087..96e92be1b66e73c9578e9d9db7104bfe3def54ba 100644 (file)
--- a/hw/virtio/virtio-nsm-pci.c
+++ b/hw/virtio/virtio-nsm-pci.c
@@ -12,7 +12,7 @@
 
 #include "hw/virtio/virtio-pci.h"
 #include "hw/virtio/virtio-nsm.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "qom/object.h"

diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 7382e7db6fa48d247b573ec50a750ed459592d3e..b273eb269196b3985b0fad62a92fdfe2e85724f4 100644 (file)
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -25,7 +25,7 @@
 #include "migration/qemu-file-types.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_bus.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qemu/log.h"

diff --git a/hw/virtio/virtio-pmem.c b/hw/virtio/virtio-pmem.c
index 3416ea1827c54a53a8ff985107171ce0f754368b..854d08abf6e0db3ba90e6adc8cb7951bbcdfa4cd 100644 (file)
--- a/hw/virtio/virtio-pmem.c
+++ b/hw/virtio/virtio-pmem.c
@@ -17,7 +17,7 @@
 #include "qemu/iov.h"
 #include "qemu/main-loop.h"
 #include "hw/virtio/virtio-pmem.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio-access.h"
 #include "standard-headers/linux/virtio_ids.h"
 #include "standard-headers/linux/virtio_pmem.h"

diff --git a/hw/virtio/virtio-rng-pci.c b/hw/virtio/virtio-rng-pci.c
index 39b600356ea24d761f45a302ce0c0771227f1603..dcea260825ff4df64471838f3dfe9c75cd55afc9 100644 (file)
--- a/hw/virtio/virtio-rng-pci.c
+++ b/hw/virtio/virtio-rng-pci.c
@@ -13,7 +13,7 @@
 
 #include "hw/virtio/virtio-pci.h"
 #include "hw/virtio/virtio-rng.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "qom/object.h"

diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c
index 3df5d2576ec7df77af1eaa250beef9a8707687f6..66690a34dc9798df2a3d2b8dc0344e7668b69dab 100644 (file)
--- a/hw/virtio/virtio-rng.c
+++ b/hw/virtio/virtio-rng.c
@@ -15,7 +15,7 @@
 #include "qemu/module.h"
 #include "qemu/timer.h"
 #include "hw/virtio/virtio.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio-rng.h"
 #include "system/rng.h"
 #include "system/runstate.h"

diff --git a/hw/virtio/virtio-scsi-pci.c b/hw/virtio/virtio-scsi-pci.c
index af877592070ef6bdb4ef6c0de4fb45fbf9b47578..fd5102819ad967b0ac5c96ab54e419eec92c7043 100644 (file)
--- a/hw/virtio/virtio-scsi-pci.c
+++ b/hw/virtio/virtio-scsi-pci.c
@@ -15,7 +15,7 @@
 
 #include "qemu/osdep.h"
 
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio-scsi.h"
 #include "qemu/module.h"
 #include "hw/virtio/virtio-pci.h"

diff --git a/hw/virtio/virtio-serial-pci.c b/hw/virtio/virtio-serial-pci.c
index 3f212ffe52fc758c56245a623c61b48673331251..6d33d149dfd0f6fff04361c3a8fe46a3edcacc74 100644 (file)
--- a/hw/virtio/virtio-serial-pci.c
+++ b/hw/virtio/virtio-serial-pci.c
@@ -17,7 +17,7 @@
 
 #include "qemu/osdep.h"
 
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio-serial.h"
 #include "qemu/module.h"
 #include "hw/virtio/virtio-pci.h"

diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index 257cda506a40403ea1c0dbcc0de38b9854372193..5b64eb4d67f338e5787f449f198cd2c3d1c9e7ce 100644 (file)
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -28,7 +28,7 @@
 #include "migration/qemu-file-types.h"
 #include "qemu/atomic.h"
 #include "hw/virtio/virtio-bus.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/virtio/virtio-access.h"
 #include "system/dma.h"
 #include "system/iothread.h"

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

diff --git a/hw/watchdog/cmsdk-apb-watchdog.c b/hw/watchdog/cmsdk-apb-watchdog.c
index f1dd7d66eee14d1829ffd7b590b519657d9d1ead..90d14e342b03042eb769e98aa76c020475b0a98f 100644 (file)
--- a/hw/watchdog/cmsdk-apb-watchdog.c
+++ b/hw/watchdog/cmsdk-apb-watchdog.c
@@ -28,7 +28,7 @@
 #include "system/watchdog.h"
 #include "hw/sysbus.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/registerfields.h"
 #include "hw/core/qdev-clock.h"
 #include "hw/watchdog/cmsdk-apb-watchdog.h"

diff --git a/hw/watchdog/sbsa_gwdt.c b/hw/watchdog/sbsa_gwdt.c
index ce84849df0e1edc38e4f2d6df9ca7666a43512f2..7ade5c6f1874aefb29875e22899d3cc4de46e0ca 100644 (file)
--- a/hw/watchdog/sbsa_gwdt.c
+++ b/hw/watchdog/sbsa_gwdt.c
@@ -18,7 +18,7 @@
 #include "qemu/osdep.h"
 #include "system/reset.h"
 #include "system/watchdog.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/watchdog/sbsa_gwdt.h"
 #include "qemu/timer.h"
 #include "migration/vmstate.h"

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

diff --git a/hw/watchdog/wdt_imx2.c b/hw/watchdog/wdt_imx2.c
index 10151a15d089d63f72df0ae9d656098c9966a355..c83d4107c19f9cef620a6eb99fd8476bf65ef7de 100644 (file)
--- a/hw/watchdog/wdt_imx2.c
+++ b/hw/watchdog/wdt_imx2.c
@@ -14,7 +14,7 @@
 #include "qemu/module.h"
 #include "system/watchdog.h"
 #include "migration/vmstate.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 
 #include "hw/watchdog/wdt_imx2.h"
 #include "trace.h"

diff --git a/hw/xen/xen-bus.c b/hw/xen/xen-bus.c
index 6bd2e546f6b98c4b891e61d4e54e8aede6131fa3..e3c51030f35e3c63fe555321d6701b5fa9170a0f 100644 (file)
--- a/hw/xen/xen-bus.c
+++ b/hw/xen/xen-bus.c
@@ -9,7 +9,7 @@
 #include "qemu/main-loop.h"
 #include "qemu/module.h"
 #include "qemu/uuid.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "hw/xen/xen.h"
 #include "hw/xen/xen-backend.h"

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

diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c
index 006b5b55f249d34599c2b6d94bf32174b878e555..c1b92d90cf9a7a7a3af093213d67d75bc697bf95 100644 (file)
--- a/hw/xen/xen_pt.c
+++ b/hw/xen/xen_pt.c
@@ -58,7 +58,7 @@
 #include <sys/ioctl.h>
 
 #include "hw/pci/pci.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/xen/xen_pt.h"
 #include "hw/xen/xen_igd.h"

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

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

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

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

diff --git a/include/hw/ide/ide-dev.h b/include/hw/ide/ide-dev.h
index 92e88687800660eb0c316fd6f996e404a78734fb..617e8159c7705716a9b57246e582cc689874cc2e 100644 (file)
--- a/include/hw/ide/ide-dev.h
+++ b/include/hw/ide/ide-dev.h
@@ -21,7 +21,7 @@
 #define IDE_DEV_H
 
 #include "system/dma.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/block/block.h"
 
 typedef struct IDEDevice IDEDevice;

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

diff --git a/include/hw/net/ne2000-isa.h b/include/hw/net/ne2000-isa.h
index 73bae10ad1a6036be566b6535693adb9601beb8d..1e14d1afc0b40fec549f410e9bc1af5a019ace45 100644 (file)
--- a/include/hw/net/ne2000-isa.h
+++ b/include/hw/net/ne2000-isa.h
@@ -11,7 +11,7 @@
 #define HW_NET_NE2000_ISA_H
 
 #include "hw/isa/isa.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "net/net.h"
 #include "qapi/error.h"
 

diff --git a/include/hw/nubus/nubus.h b/include/hw/nubus/nubus.h
index 7825840dcacd209029908ca4e3109c629132ed6a..105ddddd0d8bd167c7f1acb331fe3853188e7ecb 100644 (file)
--- a/include/hw/nubus/nubus.h
+++ b/include/hw/nubus/nubus.h
@@ -9,7 +9,7 @@
 #ifndef HW_NUBUS_NUBUS_H
 #define HW_NUBUS_NUBUS_H
 
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "system/address-spaces.h"
 #include "qom/object.h"

diff --git a/include/hw/qdev-properties-system.h b/include/hw/qdev-properties-system.h
index 45687be005f19b4b45fcc9357433da80031da449..ec39ef3bd6e16f305ffa9226b8b8e3860e7c067a 100644 (file)
--- a/include/hw/qdev-properties-system.h
+++ b/include/hw/qdev-properties-system.h
@@ -1,7 +1,7 @@
 #ifndef HW_QDEV_PROPERTIES_SYSTEM_H
 #define HW_QDEV_PROPERTIES_SYSTEM_H
 
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 
 bool qdev_prop_sanitize_s390x_loadparm(uint8_t *loadparm, const char *str,
                                        Error **errp);

diff --git a/include/hw/timer/i8254.h b/include/hw/timer/i8254.h
index f7148d92865f8744217fbcfcf2ae87267e8fd9f9..65775b789dfebaaac1cf9a9866883383463497b0 100644 (file)
--- a/include/hw/timer/i8254.h
+++ b/include/hw/timer/i8254.h
@@ -25,7 +25,7 @@
 #ifndef HW_I8254_H
 #define HW_I8254_H
 
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/isa/isa.h"
 #include "qapi/error.h"
 #include "qom/object.h"

diff --git a/migration/options.h b/migration/options.h
index a7b3262d1eded0c776d9cb3d328b693460afa80a..d6f1742e5b9ff0be81a73dbd030b99e4538e2bf6 100644 (file)
--- a/migration/options.h
+++ b/migration/options.h
@@ -14,7 +14,7 @@
 #ifndef QEMU_MIGRATION_OPTIONS_H
 #define QEMU_MIGRATION_OPTIONS_H
 
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "migration/client-options.h"
 

diff --git a/net/net.c b/net/net.c
index 8aefdb3424f59f6121d7994e75e3d60ccf54227e..4930b573ed34f24a7035d3749ced8dd2fd8f249f 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -27,7 +27,7 @@
 #include "net/net.h"
 #include "clients.h"
 #include "hub.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "net/slirp.h"
 #include "net/eth.h"
 #include "util.h"

diff --git a/rust/hw/core/wrapper.h b/rust/hw/core/wrapper.h
index 44f8583bff97ca90f5276ecbd11fd2ccfe6af9ed..8fda78924d8117688b1fe6974a8c23d5a22c5e7e 100644 (file)
--- a/rust/hw/core/wrapper.h
+++ b/rust/hw/core/wrapper.h
@@ -27,6 +27,6 @@ typedef enum memory_order {
 #include "hw/sysbus.h"
 #include "hw/core/clock.h"
 #include "hw/core/qdev-clock.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/core/irq.h"

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

diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c
index c8773d864d923b5c337537bfa31ec95fbedeb3ea..8e74e24c1909afecae475e6d31f5451a897d401c 100644 (file)
--- a/system/qdev-monitor.c
+++ b/system/qdev-monitor.c
@@ -40,7 +40,7 @@
 #include "system/block-backend.h"
 #include "migration/misc.h"
 #include "qemu/cutils.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/core/clock.h"
 #include "hw/core/boards.h"
 

diff --git a/system/vl.c b/system/vl.c
index 659c6506fc78b7434db13f8bfe21603b00bdb23f..2417f82c3ec5dd5f60c244e886bb23af58444beb 100644 (file)
--- a/system/vl.c
+++ b/system/vl.c
@@ -30,7 +30,7 @@
 #include "qemu/target-info.h"
 #include "exec/cpu-common.h"
 #include "exec/page-vary.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/compat-policy.h"
 #include "qapi/error.h"
 #include "qobject/qdict.h"

diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index 09e89272edc0f4966d67468dea0d6f9b96805cb7..caf7980b1fc5244c5c2f130e79ba869456c20c88 100644 (file)
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -34,7 +34,7 @@
 #include "internals.h"
 #include "cpu-features.h"
 #include "exec/target_page.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #if !defined(CONFIG_USER_ONLY)
 #include "hw/core/loader.h"
 #include "hw/core/boards.h"

diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c
index ae84d8e420508e75016636d4383a52a359966cad..bf303813701972648fa6751ffe352ba074ca6442 100644 (file)
--- a/target/arm/cpu64.c
+++ b/target/arm/cpu64.c
@@ -31,7 +31,7 @@
 #include "kvm_arm.h"
 #include "hvf_arm.h"
 #include "qapi/visitor.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "internals.h"
 #include "cpu-features.h"
 

diff --git a/target/arm/tcg/cpu64.c b/target/arm/tcg/cpu64.c
index 6871956382f746c10c7edf8b6c506ec74d0af6d6..917db5bb09a012349e340eff51db254e2d260079 100644 (file)
--- a/target/arm/tcg/cpu64.c
+++ b/target/arm/tcg/cpu64.c
@@ -23,7 +23,7 @@
 #include "cpu.h"
 #include "qemu/module.h"
 #include "qapi/visitor.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qemu/units.h"
 #include "internals.h"
 #include "cpu-features.h"

diff --git a/target/avr/cpu.c b/target/avr/cpu.c
index a6df71d0205747ad2c4476f7b7c094aba621c26c..52237da3ce93613ab9c4c98579e1642dba816022 100644 (file)
--- a/target/avr/cpu.c
+++ b/target/avr/cpu.c
@@ -26,7 +26,7 @@
 #include "cpu.h"
 #include "disas/dis-asm.h"
 #include "tcg/debug-assert.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "accel/tcg/cpu-ops.h"
 
 static void avr_cpu_set_pc(CPUState *cs, vaddr value)

diff --git a/target/hexagon/cpu.c b/target/hexagon/cpu.c
index a5a04173ab8fd8ea29ef9f1a22b5f9524aace9fa..8ac4f49aa3b09ee1240ae8151a1a77d4cfdf3828 100644 (file)
--- a/target/hexagon/cpu.c
+++ b/target/hexagon/cpu.c
@@ -21,7 +21,7 @@
 #include "internal.h"
 #include "exec/translation-block.h"
 #include "qapi/error.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "fpu/softfloat-helpers.h"
 #include "tcg/tcg.h"
 #include "exec/gdbstub.h"

diff --git a/target/i386/cpu-apic.c b/target/i386/cpu-apic.c
index 564c1288e47d06cbfdce1adfd3770576458149e1..eeee62b52a24101dce7ee701af2631cf63696ac1 100644 (file)
--- a/target/i386/cpu-apic.c
+++ b/target/i386/cpu-apic.c
@@ -15,7 +15,7 @@
 #include "system/kvm.h"
 #include "system/xen.h"
 #include "system/address-spaces.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/i386/apic_internal.h"
 #include "cpu-internal.h"
 

diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 4216ca9ec1d9473e1a8c8e12d4f662c1f72d811d..fe52538723bfaf4b38ec3ef9a907d95388ab9872 100644 (file)
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -34,7 +34,7 @@
 #include "qemu/error-report.h"
 #include "qapi/qapi-visit-machine.h"
 #include "standard-headers/asm-x86/kvm_para.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/i386/topology.h"
 #include "exec/watchpoint.h"
 #ifndef CONFIG_USER_ONLY

diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c
index d74c3c3766b9ffbaffc14983b1aca4cfc3d0cbb1..e01e044239bf8119aabd9c76c3e3a2e2661e6e11 100644 (file)
--- a/target/loongarch/cpu.c
+++ b/target/loongarch/cpu.c
@@ -14,7 +14,7 @@
 #include "system/tcg.h"
 #include "system/kvm.h"
 #include "kvm/kvm_loongarch.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "exec/translation-block.h"
 #include "cpu.h"
 #include "cpu-mmu.h"

diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c
index 22231f09e602a6a12a2b94047b85dfbb488799bd..53649ec6567d09bf13af4c7e58bd9eb750712b93 100644 (file)
--- a/target/microblaze/cpu.c
+++ b/target/microblaze/cpu.c
@@ -26,7 +26,7 @@
 #include "qapi/error.h"
 #include "cpu.h"
 #include "qemu/module.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "accel/tcg/cpu-ldst.h"
 #include "exec/gdbstub.h"
 #include "exec/translation-block.h"

diff --git a/target/mips/cpu.c b/target/mips/cpu.c
index 894799c02c7d440e9aa841ace1c6562dadef14cc..f74a9d5f615a77337c9cab25a7c6749085a09722 100644 (file)
--- a/target/mips/cpu.c
+++ b/target/mips/cpu.c
@@ -29,7 +29,7 @@
 #include "qemu/module.h"
 #include "system/kvm.h"
 #include "system/qtest.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/core/qdev-clock.h"
 #include "fpu_helper.h"
 #ifndef CONFIG_USER_ONLY

diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c
index a3b14cceada1bd7dd39032d4f3aabb9f5ad4a3eb..929254827d66840d0273e9d5a1da746cdecdacfc 100644 (file)
--- a/target/ppc/cpu_init.c
+++ b/target/ppc/cpu_init.c
@@ -34,7 +34,7 @@
 #include "qapi/error.h"
 #include "qobject/qnull.h"
 #include "qapi/visitor.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/ppc/ppc.h"
 #include "mmu-book3s-v3.h"
 #include "qemu/cutils.h"

diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
index 73d4280d7c84a9d4c7cecd3e067d312adc13b035..8f26d8b8b0766069c1fba4db7ae1b9c30f0f552d 100644 (file)
--- a/target/riscv/cpu.c
+++ b/target/riscv/cpu.c
@@ -27,7 +27,7 @@
 #include "qapi/error.h"
 #include "qapi/visitor.h"
 #include "qemu/error-report.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/core/qdev-prop-internal.h"
 #include "migration/vmstate.h"
 #include "fpu/softfloat-helpers.h"

diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h
index 36e7f100374d86f7330b0b5854b21547dc5bc44d..b54cd78f8f7162a92d22c0a51d77bd88ad9bea16 100644 (file)
--- a/target/riscv/cpu.h
+++ b/target/riscv/cpu.h
@@ -22,7 +22,7 @@
 
 #include "hw/core/cpu.h"
 #include "hw/registerfields.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "exec/cpu-common.h"
 #include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"

diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
index f05ce317da17dc876ea27bd65dabfad9f7598a6c..be99b2ab94c48b40e96efbd1d37a94e0f7d71e29 100644 (file)
--- a/target/s390x/cpu.c
+++ b/target/s390x/cpu.c
@@ -30,7 +30,7 @@
 #include "trace.h"
 #include "qapi/qapi-types-machine.h"
 #include "system/hw_accel.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/resettable.h"
 #include "fpu/softfloat-helpers.h"

diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c
index c9773f15401a985a90ddc7bca8ab7098d044563f..bfc6fb9d00d20f61c0aa4d844ae30edc198be1b7 100644 (file)
--- a/target/sparc/cpu.c
+++ b/target/sparc/cpu.c
@@ -24,7 +24,7 @@
 #include "qemu/qemu-print.h"
 #include "accel/tcg/cpu-mmu-index.h"
 #include "exec/translation-block.h"
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qapi/visitor.h"
 #include "tcg/tcg.h"
 #include "fpu/softfloat.h"

diff --git a/tests/unit/test-qdev-global-props.c b/tests/unit/test-qdev-global-props.c
index 33062762a67c8359927ced3592db71cc7b1a1dbc..8ea362cbb90219d801430a3fb633873d5d8fe67e 100644 (file)
--- a/tests/unit/test-qdev-global-props.c
+++ b/tests/unit/test-qdev-global-props.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 
-#include "hw/qdev-properties.h"
+#include "hw/core/qdev-properties.h"
 #include "qom/object.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"