include: move hw/qdev-properties-system.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 07aea375165793604d76bac02ad23bdca604d325..bc5c7afb3cdbd24daf1713fb0ddf79d6b18fc6c3 100644 (file)
--- a/backends/spdm-socket.c
+++ b/backends/spdm-socket.c
@@ -14,7 +14,7 @@
 #include "system/spdm-socket.h"
 #include "qapi/error.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/qdev-properties-system.h"
 #include "hw/core/qdev-prop-internal.h"
 
 static bool read_bytes(const int socket, uint8_t *buffer,

diff --git a/hw/acpi/vmclock.c b/hw/acpi/vmclock.c
index 55c9f95066224cab85b289398e2d172776931a6e..d51cab2e20a1f779d32a8b2b438370d19ace6ee8 100644 (file)
--- a/hw/acpi/vmclock.c
+++ b/hw/acpi/vmclock.c
@@ -18,7 +18,7 @@
 #include "hw/acpi/vmclock.h"
 #include "hw/nvram/fw_cfg.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/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 fcf9a94daf1a28f75eb619cb43e7edcb09e08b02..e87c02569647ecc89ea6070c63dca658c3c1393e 100644 (file)
--- a/hw/acpi/vmgenid.c
+++ b/hw/acpi/vmgenid.c
@@ -18,7 +18,7 @@
 #include "hw/acpi/vmgenid.h"
 #include "hw/nvram/fw_cfg.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/qdev-properties-system.h"
 #include "migration/vmstate.h"
 #include "system/reset.h"
 

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

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

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

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

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

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

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

diff --git a/hw/char/avr_usart.c b/hw/char/avr_usart.c
index c3515b6f7d08c0dc89a06c98386a8de13ffd95e0..30e135a244bee4ee45cf0fb589cbea471271c732 100644 (file)
--- a/hw/char/avr_usart.c
+++ b/hw/char/avr_usart.c
@@ -24,7 +24,7 @@
 #include "qemu/log.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/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 47e24c5bba1befdde4c472bb94fb2063941db9f3..d1e114f2dea7ecdd5eb722b6a3adb5ea76f1aa3d 100644 (file)
--- a/hw/char/bcm2835_aux.c
+++ b/hw/char/bcm2835_aux.c
@@ -24,7 +24,7 @@
 #include "hw/char/bcm2835_aux.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/qdev-properties-system.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c
index 58c4c95fdedde81cffda6ce5edd5e8bf9da11c35..c24ece5fe8837ed68758e14f7ba9eb945e8802a7 100644 (file)
--- a/hw/char/cadence_uart.c
+++ b/hw/char/cadence_uart.c
@@ -32,7 +32,7 @@
 #include "hw/char/cadence_uart.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-clock.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/qdev-properties-system.h"
 #include "trace.h"
 
 #ifdef CADENCE_UART_ERR_DEBUG

diff --git a/hw/char/cmsdk-apb-uart.c b/hw/char/cmsdk-apb-uart.c
index a5ec61a00440226192b46a80be6050151cdaf0cd..c3645a553ec6ae467b489b7f1f72450191780c00 100644 (file)
--- a/hw/char/cmsdk-apb-uart.c
+++ b/hw/char/cmsdk-apb-uart.c
@@ -27,7 +27,7 @@
 #include "chardev/char-serial.h"
 #include "hw/char/cmsdk-apb-uart.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/qdev-properties-system.h"
 
 REG32(DATA, 0)
 REG32(STATE, 4)

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

diff --git a/hw/char/digic-uart.c b/hw/char/digic-uart.c
index 04dec0df8a60595b58d544c960d5df2601c9c011..8a704dfcf50386c3c658eb7ce35771a795994388 100644 (file)
--- a/hw/char/digic-uart.c
+++ b/hw/char/digic-uart.c
@@ -35,7 +35,7 @@
 
 #include "hw/char/digic-uart.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/qdev-properties-system.h"
 
 enum {
     ST_RX_RDY = (1 << 0),

diff --git a/hw/char/diva-gsp.c b/hw/char/diva-gsp.c
index 1dafc1e80c3062c9dcfcafe5f2fe3dddbda8a8aa..280d0413c6e8d3bdc853e73f6f9fd959e349e433 100644 (file)
--- a/hw/char/diva-gsp.c
+++ b/hw/char/diva-gsp.c
@@ -21,7 +21,7 @@
 #include "hw/core/irq.h"
 #include "hw/pci/pci_device.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/qdev-properties-system.h"
 #include "migration/vmstate.h"
 
 #define PCI_DEVICE_ID_HP_DIVA           0x1048

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

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

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

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

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

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

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

diff --git a/hw/char/max78000_uart.c b/hw/char/max78000_uart.c
index 59ec24a15e84edd61ebf9d5f8e7c6aff373fad3f..85fc6eed3e5e08a8312e82f8f493c5486931cce2 100644 (file)
--- a/hw/char/max78000_uart.c
+++ b/hw/char/max78000_uart.c
@@ -10,7 +10,7 @@
 #include "hw/char/max78000_uart.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/qdev-properties-system.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "migration/vmstate.h"

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

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

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

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

diff --git a/hw/char/renesas_sci.c b/hw/char/renesas_sci.c
index 3c1cc43954bb06badaa6f8bab6e08015d17f1689..f1c5d5ae6b36b3a26b03fc703c0309c0edea15fe 100644 (file)
--- a/hw/char/renesas_sci.c
+++ b/hw/char/renesas_sci.c
@@ -26,7 +26,7 @@
 #include "hw/core/irq.h"
 #include "hw/registerfields.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/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 ed08cf42da2f49d98db01405f41fe75fb3cfdae6..9a16896d2284a85e22a6d1683d5abf34c7cd028e 100644 (file)
--- a/hw/char/sclpconsole-lm.c
+++ b/hw/char/sclpconsole-lm.c
@@ -23,7 +23,7 @@
 #include "migration/vmstate.h"
 #include "hw/s390x/event-facility.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/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 ab444fe1fa4faeff953e9e0fc71b3c50a222f0e2..179d12745cc586af7bd6367e4dd55c221f10a976 100644 (file)
--- a/hw/char/sclpconsole.c
+++ b/hw/char/sclpconsole.c
@@ -20,7 +20,7 @@
 #include "hw/s390x/sclp.h"
 #include "migration/vmstate.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/qdev-properties-system.h"
 #include "hw/s390x/event-facility.h"
 #include "chardev/char-fe.h"
 #include "qom/object.h"

diff --git a/hw/char/serial-pci-multi.c b/hw/char/serial-pci-multi.c
index f0af12c14f9d7a86de1b5051f8aeb0166bf19854..17796b93dd7aa8d77156331c725bb27192e7fde6 100644 (file)
--- a/hw/char/serial-pci-multi.c
+++ b/hw/char/serial-pci-multi.c
@@ -33,7 +33,7 @@
 #include "hw/core/irq.h"
 #include "hw/pci/pci_device.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/qdev-properties-system.h"
 #include "migration/vmstate.h"
 
 #define PCI_SERIAL_MAX_PORTS 4

diff --git a/hw/char/serial.c b/hw/char/serial.c
index cbff68a71119ab318e6c3c86f4bb2a147a4a5ac3..adbd1d1d4ab2805112f6e551eee0cd1864f5b157 100644 (file)
--- a/hw/char/serial.c
+++ b/hw/char/serial.c
@@ -36,7 +36,7 @@
 #include "qemu/error-report.h"
 #include "trace.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/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 9cd79fce3346493f4e7911d0633aa3a14861eebb..b3bed2bb7bfb3df919ef7ba8ea57b1bb4b8b29bf 100644 (file)
--- a/hw/char/sh_serial.c
+++ b/hw/char/sh_serial.c
@@ -30,7 +30,7 @@
 #include "hw/core/irq.h"
 #include "hw/core/qdev.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/qdev-properties-system.h"
 #include "hw/sh4/sh.h"
 #include "chardev/char-fe.h"
 #include "qapi/error.h"

diff --git a/hw/char/shakti_uart.c b/hw/char/shakti_uart.c
index 51e45351d958ea9de77536bd365c57ddb9ad1cb1..2d1bc9cb8e22df9b48c8849d1495be5696821987 100644 (file)
--- a/hw/char/shakti_uart.c
+++ b/hw/char/shakti_uart.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "hw/char/shakti_uart.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/qdev-properties-system.h"
 #include "qemu/log.h"
 
 static uint64_t shakti_uart_read(void *opaque, hwaddr addr, unsigned size)

diff --git a/hw/char/sifive_uart.c b/hw/char/sifive_uart.c
index 473374d3de100e61b3ced50b4ccd0513054acd8c..af17cf9a6ceec63b07042622a6093e5a3b5e6930 100644 (file)
--- a/hw/char/sifive_uart.c
+++ b/hw/char/sifive_uart.c
@@ -24,7 +24,7 @@
 #include "chardev/char-fe.h"
 #include "hw/core/irq.h"
 #include "hw/char/sifive_uart.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/qdev-properties-system.h"
 
 #define TX_INTERRUPT_TRIGGER_DELAY_NS 100
 

diff --git a/hw/char/spapr_vty.c b/hw/char/spapr_vty.c
index 17a17c47c369c1fcddaafcb3dbf82a8486c42c83..1dd9fb155cb6e2090e6e35b209b8cc93b84c1473 100644 (file)
--- a/hw/char/spapr_vty.c
+++ b/hw/char/spapr_vty.c
@@ -7,7 +7,7 @@
 #include "hw/ppc/spapr.h"
 #include "hw/ppc/spapr_vio.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/qdev-properties-system.h"
 #include "qom/object.h"
 
 #define VTERM_BUFSIZE   16

diff --git a/hw/char/stm32f2xx_usart.c b/hw/char/stm32f2xx_usart.c
index 2c19ec69cc87935749b5fd709937a233c15c837a..2bf0161fa58992ada26332e2045ba4c175d5f31b 100644 (file)
--- a/hw/char/stm32f2xx_usart.c
+++ b/hw/char/stm32f2xx_usart.c
@@ -26,7 +26,7 @@
 #include "hw/char/stm32f2xx_usart.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/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 8b208ba9b6a579c4d1d95645281f2ba753450140..664d03d6b961ec3546e3d216342d4f3c673e1239 100644 (file)
--- a/hw/char/stm32l4x5_usart.c
+++ b/hw/char/stm32l4x5_usart.c
@@ -27,7 +27,7 @@
 #include "hw/core/irq.h"
 #include "hw/core/qdev-clock.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/qdev-properties-system.h"
 #include "hw/registerfields.h"
 #include "trace.h"
 

diff --git a/hw/char/terminal3270.c b/hw/char/terminal3270.c
index 821a75c37a283e72ffeecc6a02b45f8c644f076c..1d857bad9bcdd1a3481413686204432363923ddc 100644 (file)
--- a/hw/char/terminal3270.c
+++ b/hw/char/terminal3270.c
@@ -16,7 +16,7 @@
 #include "qemu/module.h"
 #include "chardev/char-fe.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/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 8c2a6a9d1d3a0cb4e8b19736935e43bac3ddf375..25db0f019b858c81cc129dc3fae70c9b99036d19 100644 (file)
--- a/hw/char/virtio-console.c
+++ b/hw/char/virtio-console.c
@@ -16,7 +16,7 @@
 #include "qemu/module.h"
 #include "trace.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/qdev-properties-system.h"
 #include "hw/virtio/virtio-serial.h"
 #include "qapi/error.h"
 #include "qapi/qapi-events-char.h"

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

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

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

diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c
index 639d932b0941465f02e6edab4d043465b0acc67c..86b53a23ade559ca3bad0a1c263e270ff3cb82e7 100644 (file)
--- a/hw/hyperv/vmbus.c
+++ b/hw/hyperv/vmbus.c
@@ -14,7 +14,7 @@
 #include "qapi/error.h"
 #include "migration/vmstate.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/qdev-properties-system.h"
 #include "hw/hyperv/hyperv.h"
 #include "hw/hyperv/vmbus.h"
 #include "hw/hyperv/vmbus-bridge.h"

diff --git a/hw/i386/kvm/i8254.c b/hw/i386/kvm/i8254.c
index 14b78f30a832cba3a2105135ea9190416cbc90b4..81e742f86674d75261dc59d2dff2cbb45c3cee51 100644 (file)
--- a/hw/i386/kvm/i8254.c
+++ b/hw/i386/kvm/i8254.c
@@ -32,7 +32,7 @@
 #include "system/runstate.h"
 #include "hw/timer/i8254.h"
 #include "hw/timer/i8254_internal.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/qdev-properties-system.h"
 #include "system/kvm.h"
 #include "target/i386/kvm/kvm_i386.h"
 #include "qom/object.h"

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

diff --git a/hw/ipmi/ipmi_bmc_extern.c b/hw/ipmi/ipmi_bmc_extern.c
index fb90a7d7c30285bee794356a6e0fe435d3b51681..fa08ed6c21748ad306507bb10012f63f517d4edd 100644 (file)
--- a/hw/ipmi/ipmi_bmc_extern.c
+++ b/hw/ipmi/ipmi_bmc_extern.c
@@ -35,7 +35,7 @@
 #include "chardev/char-fe.h"
 #include "hw/ipmi/ipmi.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/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 b86943c3245ad3a6532ee521dfd4b533bbbd670c..3d4fe1a699a895f77ef3680c509515331a5a6f50 100644 (file)
--- a/hw/ipmi/ipmi_bmc_sim.c
+++ b/hw/ipmi/ipmi_bmc_sim.c
@@ -30,7 +30,7 @@
 #include "qemu/module.h"
 #include "hw/core/loader.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/qdev-properties-system.h"
 #include "migration/vmstate.h"
 
 #define IPMI_NETFN_CHASSIS            0x00

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

diff --git a/hw/misc/allwinner-sid.c b/hw/misc/allwinner-sid.c
index 17faf67e606458a66f09c7d886d338038071faf3..92a0c7918bce0cd92a9325ef4ecbe8d2dcef0d33 100644 (file)
--- a/hw/misc/allwinner-sid.c
+++ b/hw/misc/allwinner-sid.c
@@ -26,7 +26,7 @@
 #include "qemu/guest-random.h"
 #include "qapi/error.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/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 bd7f59fec97d452e0be14c049678711ed6b92d56..423e0a844fa44b3a5b872912a0e85edc932cf98c 100644 (file)
--- a/hw/misc/allwinner-sramc.c
+++ b/hw/misc/allwinner-sramc.c
@@ -25,7 +25,7 @@
 #include "qemu/module.h"
 #include "qapi/error.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/qdev-properties-system.h"
 #include "hw/misc/allwinner-sramc.h"
 #include "trace.h"
 

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

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

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

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

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

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

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

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

diff --git a/hw/net/xilinx_ethlite.c b/hw/net/xilinx_ethlite.c
index 39e64a46e26dad31c75c02241a1c93e98084efb5..72b14811a9d496ae2b4c0e794c8c082486bd1979 100644 (file)
--- a/hw/net/xilinx_ethlite.c
+++ b/hw/net/xilinx_ethlite.c
@@ -34,7 +34,7 @@
 #include "hw/sysbus.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/qdev-properties-system.h"
 #include "hw/misc/unimp.h"
 #include "net/net.h"
 #include "trace.h"

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

diff --git a/hw/nvram/mac_nvram.c b/hw/nvram/mac_nvram.c
index b048db0777a3f88115aebb0e87f1c8d9db00955e..efadb3c943c1abbcc4817f0e3e6e6baf36043d2d 100644 (file)
--- a/hw/nvram/mac_nvram.c
+++ b/hw/nvram/mac_nvram.c
@@ -28,7 +28,7 @@
 #include "hw/nvram/chrp_nvram.h"
 #include "hw/nvram/mac_nvram.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/qdev-properties-system.h"
 #include "system/block-backend.h"
 #include "migration/vmstate.h"
 #include "qemu/cutils.h"

diff --git a/hw/nvram/spapr_nvram.c b/hw/nvram/spapr_nvram.c
index c9202ddfcd43b3f91074894bf7d8ff9b3ac77166..58d81f77c88194749f9b1f3565612fda07d44d95 100644 (file)
--- a/hw/nvram/spapr_nvram.c
+++ b/hw/nvram/spapr_nvram.c
@@ -37,7 +37,7 @@
 #include "hw/ppc/spapr.h"
 #include "hw/ppc/spapr_vio.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/qdev-properties-system.h"
 #include "qom/object.h"
 
 struct SpaprNvram {

diff --git a/hw/nvram/xlnx-bbram.c b/hw/nvram/xlnx-bbram.c
index aad445b9018360fc0af6a6f7ff827498f356fc2a..60ede7e40fb7e0c6a106f771ecff93403a00e10a 100644 (file)
--- a/hw/nvram/xlnx-bbram.c
+++ b/hw/nvram/xlnx-bbram.c
@@ -32,7 +32,7 @@
 #include "system/blockdev.h"
 #include "migration/vmstate.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/qdev-properties-system.h"
 #include "hw/nvram/xlnx-efuse.h"
 
 #ifndef XLNX_BBRAM_ERR_DEBUG

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

diff --git a/hw/pci-bridge/cxl_downstream.c b/hw/pci-bridge/cxl_downstream.c
index 1265e40c395a3c6c20c8d4b67133e749e5965d46..f7b131e67e8eaf939841f728d8ba8aabca690773 100644 (file)
--- a/hw/pci-bridge/cxl_downstream.c
+++ b/hw/pci-bridge/cxl_downstream.c
@@ -14,7 +14,7 @@
 #include "hw/pci/pcie.h"
 #include "hw/pci/pcie_port.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/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 df359dee670507df38caccef3364098a60d51de9..616d5d934cc590aabfdd172b3e88ee2c5c9cbc68 100644 (file)
--- a/hw/pci-bridge/cxl_root_port.c
+++ b/hw/pci-bridge/cxl_root_port.c
@@ -24,7 +24,7 @@
 #include "hw/pci/pcie_port.h"
 #include "hw/pci/msi.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/qdev-properties-system.h"
 #include "hw/sysbus.h"
 #include "qapi/error.h"
 #include "hw/cxl/cxl.h"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/hw/virtio/vhost-user-vsock.c b/hw/virtio/vhost-user-vsock.c
index e20e0aee4396d97e7e53f8cac706a4918fbc056e..c2cd376e7326b19cdd3d34fb1464c4dcd12194a8 100644 (file)
--- a/hw/virtio/vhost-user-vsock.c
+++ b/hw/virtio/vhost-user-vsock.c
@@ -13,7 +13,7 @@
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/qdev-properties-system.h"
 #include "hw/virtio/vhost-user-vsock.h"
 
 static const int user_feature_bits[] = {

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

diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c
index c1b92d90cf9a7a7a3af093213d67d75bc697bf95..0fe9c0aada840c14b50f6d88ff5146bbf0313594 100644 (file)
--- a/hw/xen/xen_pt.c
+++ b/hw/xen/xen_pt.c
@@ -59,7 +59,7 @@
 
 #include "hw/pci/pci.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/qdev-properties-system.h"
 #include "hw/xen/xen_pt.h"
 #include "hw/xen/xen_igd.h"
 #include "hw/xen/xen.h"

diff --git a/include/hw/block/block.h b/include/hw/block/block.h
index b4d914624ee01bb3f77cea75dbbe618a63e8cb62..7dc19d8a453fff1e711a678b3b2336551ec3f9a1 100644 (file)
--- a/include/hw/block/block.h
+++ b/include/hw/block/block.h
@@ -13,7 +13,7 @@
 
 #include "exec/hwaddr.h"
 #include "qapi/qapi-types-block-core.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/qdev-properties-system.h"
 
 /* Configuration */
 

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

diff --git a/include/net/net.h b/include/net/net.h
index 72b476ee1dc499513f2403424eba3524e59ff1fd..45bc86fc86b65eb587786fb219794dd06aceae16 100644 (file)
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -4,7 +4,7 @@
 #include "qemu/queue.h"
 #include "qapi/qapi-types-net.h"
 #include "net/queue.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/qdev-properties-system.h"
 
 #define MAC_FMT "%02X:%02X:%02X:%02X:%02X:%02X"
 #define MAC_ARG(x) ((uint8_t *)(x))[0], ((uint8_t *)(x))[1], \

diff --git a/include/qemu/audio.h b/include/qemu/audio.h
index c56af895d6229dd8af64cbe183a692c45e75721f..a92e0b70ef07f66932ef4ed670e25319127e8878 100644 (file)
--- a/include/qemu/audio.h
+++ b/include/qemu/audio.h
@@ -27,7 +27,7 @@
 
 #include "qemu/queue.h"
 #include "qapi/qapi-types-audio.h"
-#include "hw/qdev-properties-system.h"
+#include "hw/core/qdev-properties-system.h"
 #ifdef CONFIG_GIO
 #include "gio/gio.h"
 #endif

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

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

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