Include hw/qdev-properties.h less

In my "build everything" tree, changing hw/qdev-properties.h triggers
a recompile of some 2700 out of 6600 objects (not counting tests and
objects that don't depend on qemu/osdep.h).

Many places including hw/qdev-properties.h (directly or via hw/qdev.h)
actually need only hw/qdev-core.h.  Include hw/qdev-core.h there
instead.

hw/qdev.h is actually pointless: all it does is include hw/qdev-core.h
and hw/qdev-properties.h, which in turn includes hw/qdev-core.h.
Replace the remaining uses of hw/qdev.h by hw/qdev-properties.h.

While there, delete a few superfluous inclusions of hw/qdev-core.h.

Touching hw/qdev-properties.h now recompiles some 1200 objects.

Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: "Daniel P. Berrangé" <berrange@redhat.com>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20190812052359.30071-22-armbru@redhat.com>

diff --git a/backends/vhost-user.c b/backends/vhost-user.c
index 2b055544a7397b89fbbf95fec4a035639f6c2520..0a13506c982541de278a9db797e3e69f57cd4a04 100644 (file)
--- a/backends/vhost-user.c
+++ b/backends/vhost-user.c
@@ -12,7 +12,6 @@
 
 
 #include "qemu/osdep.h"
-#include "hw/qdev.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/error-report.h"

diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c
index a3288cbe56adae814ed7b02eafaba37aa40f149b..b5a7c03f26d5c74228105f5f28eba9f42a95e6f1 100644 (file)
--- a/hw/9pfs/virtio-9p-device.c
+++ b/hw/9pfs/virtio-9p-device.c
@@ -17,6 +17,7 @@
 #include "virtio-9p.h"
 #include "fsdev/qemu-fsdev.h"
 #include "coth.h"
+#include "hw/qdev-properties.h"
 #include "hw/virtio/virtio-access.h"
 #include "qemu/iov.h"
 #include "qemu/module.h"

diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index ec47a9143b0052c02c21ec6a00abc61e35e2e70f..3ff35a49e40c1f3ce99186fecd321aed00c387da 100644 (file)
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -25,6 +25,7 @@
 #include "hw/isa/apm.h"
 #include "hw/i2c/pm_smbus.h"
 #include "hw/pci/pci.h"
+#include "hw/qdev-properties.h"
 #include "hw/acpi/acpi.h"
 #include "sysemu/reset.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/acpi/vmgenid.c b/hw/acpi/vmgenid.c
index 1e38e21cb7540bd26ce7c78f136884c36272bf47..4eae426969a841a8c80a43599dec2a074811f17c 100644 (file)
--- a/hw/acpi/vmgenid.c
+++ b/hw/acpi/vmgenid.c
@@ -18,6 +18,7 @@
 #include "hw/acpi/aml-build.h"
 #include "hw/acpi/vmgenid.h"
 #include "hw/nvram/fw_cfg.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "sysemu/reset.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
index 4b2d8b657436e70792f7c7abb8afc2882329687d..7a3c48f00266745331aba5ad4f83c80aba1293dc 100644 (file)
--- a/hw/arm/armv7m.c
+++ b/hw/arm/armv7m.c
@@ -14,6 +14,7 @@
 #include "hw/sysbus.h"
 #include "hw/arm/boot.h"
 #include "hw/loader.h"
+#include "hw/qdev-properties.h"
 #include "elf.h"
 #include "sysemu/qtest.h"
 #include "sysemu/reset.h"

diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index 843b70824729a5b5ea7e50bf1ed8b2ac4f5e5b60..7a2e885e0b9cb58224f0ad29c16651fe05155d07 100644 (file)
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -20,6 +20,7 @@
 #include "hw/i2c/smbus_eeprom.h"
 #include "hw/misc/pca9552.h"
 #include "hw/misc/tmp105.h"
+#include "hw/qdev-properties.h"
 #include "qemu/log.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/arm/digic.c b/hw/arm/digic.c
index 9015b60c230a2f70d11213d38e9d269c9d01b1d1..4f524658756851311cd45c9438ac3b9594934b5c 100644 (file)
--- a/hw/arm/digic.c
+++ b/hw/arm/digic.c
@@ -24,6 +24,7 @@
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "hw/arm/digic.h"
+#include "hw/qdev-properties.h"
 #include "sysemu/sysemu.h"
 
 #define DIGIC4_TIMER_BASE(n)    (0xc0210000 + (n) * 0x100)

diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c
index 9aa5ec3f5d16342cdb86f2698289eb6fa739da56..0e403f3e78faced20f70bf90f6582121c01b9f91 100644 (file)
--- a/hw/arm/exynos4210.c
+++ b/hw/arm/exynos4210.c
@@ -32,6 +32,7 @@
 #include "hw/sysbus.h"
 #include "hw/arm/boot.h"
 #include "hw/loader.h"
+#include "hw/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 7624e16084a1938f9c5cae0b873bcde14b483251..f69358a5ba8dca9616af89670f2668798a5d7007 100644 (file)
--- a/hw/arm/exynos4_boards.c
+++ b/hw/arm/exynos4_boards.c
@@ -33,6 +33,7 @@
 #include "exec/address-spaces.h"
 #include "hw/arm/exynos4210.h"
 #include "hw/net/lan9118.h"
+#include "hw/qdev-properties.h"
 #include "hw/boards.h"
 #include "hw/irq.h"
 

diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c
index 869ee89b157dcd235777d43fa492ed81c6106e6a..098e84c84d37d475d58d5ef2913bde0e2d978496 100644 (file)
--- a/hw/arm/fsl-imx25.c
+++ b/hw/arm/fsl-imx25.c
@@ -29,6 +29,7 @@
 #include "sysemu/sysemu.h"
 #include "exec/address-spaces.h"
 #include "hw/boards.h"
+#include "hw/qdev-properties.h"
 #include "chardev/char.h"
 
 static void fsl_imx25_init(Object *obj)

diff --git a/hw/arm/fsl-imx31.c b/hw/arm/fsl-imx31.c
index 662fe78f1b2d15b3eae3c1c0dc681c6fd9206760..093ad409840d18609dd01ec9f9167cd51a473823 100644 (file)
--- a/hw/arm/fsl-imx31.c
+++ b/hw/arm/fsl-imx31.c
@@ -26,6 +26,7 @@
 #include "sysemu/sysemu.h"
 #include "exec/address-spaces.h"
 #include "hw/boards.h"
+#include "hw/qdev-properties.h"
 #include "chardev/char.h"
 
 static void fsl_imx31_init(Object *obj)

diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c
index de45833097df72c87cefecaad4b9f0c4afcbbc05..8c397ef04ba0ece381a9fa9bab58570833dca0d0 100644 (file)
--- a/hw/arm/fsl-imx6.c
+++ b/hw/arm/fsl-imx6.c
@@ -23,6 +23,7 @@
 #include "qapi/error.h"
 #include "hw/arm/fsl-imx6.h"
 #include "hw/boards.h"
+#include "hw/qdev-properties.h"
 #include "sysemu/sysemu.h"
 #include "chardev/char.h"
 #include "qemu/error-report.h"

diff --git a/hw/arm/mcimx6ul-evk.c b/hw/arm/mcimx6ul-evk.c
index 1f6f4aed97c35639437d7813dd87fd93a4e4efbe..0276875f023c432035c3b73d5775e7eab480149a 100644 (file)
--- a/hw/arm/mcimx6ul-evk.c
+++ b/hw/arm/mcimx6ul-evk.c
@@ -14,6 +14,7 @@
 #include "qapi/error.h"
 #include "hw/arm/fsl-imx6ul.h"
 #include "hw/boards.h"
+#include "hw/qdev-properties.h"
 #include "sysemu/sysemu.h"
 #include "qemu/error-report.h"
 #include "sysemu/qtest.h"

diff --git a/hw/arm/mcimx7d-sabre.c b/hw/arm/mcimx7d-sabre.c
index 72eab03a0cbe04a26f78017e353fe5938f4a42b0..97b8bb788a1b7578afd8422c0c6ebf80bd19ad42 100644 (file)
--- a/hw/arm/mcimx7d-sabre.c
+++ b/hw/arm/mcimx7d-sabre.c
@@ -16,6 +16,7 @@
 #include "qapi/error.h"
 #include "hw/arm/fsl-imx7.h"
 #include "hw/boards.h"
+#include "hw/qdev-properties.h"
 #include "sysemu/sysemu.h"
 #include "qemu/error-report.h"
 #include "sysemu/qtest.h"

diff --git a/hw/arm/microbit.c b/hw/arm/microbit.c
index e9a891f7d370bdf9b4a50a85af958deddffd9720..ef213695bdbd4bbc1eab70b9afeeac22d9206a5d 100644 (file)
--- a/hw/arm/microbit.c
+++ b/hw/arm/microbit.c
@@ -17,6 +17,7 @@
 
 #include "hw/arm/nrf51_soc.h"
 #include "hw/i2c/microbit_i2c.h"
+#include "hw/qdev-properties.h"
 
 typedef struct {
     MachineState parent;

diff --git a/hw/arm/msf2-som.c b/hw/arm/msf2-som.c
index 2c9984bb3b879f21427d9bf81e82d056b7d8d408..dbd35b6defe05aca2e1f1fae54c6b42a4ebe2d5c 100644 (file)
--- a/hw/arm/msf2-som.c
+++ b/hw/arm/msf2-som.c
@@ -27,6 +27,7 @@
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "hw/boards.h"
+#include "hw/qdev-properties.h"
 #include "hw/arm/boot.h"
 #include "exec/address-spaces.h"
 #include "hw/arm/msf2-soc.h"

diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
index a3cfdc307715c4bd12592351db5f953e77005320..92fbe74d741ab7b015e477f71c7c93dfa2e96eb5 100644 (file)
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@@ -22,6 +22,7 @@
 #include "hw/hw.h"
 #include "qemu/timer.h"
 #include "hw/ptimer.h"
+#include "hw/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 f57fc38f920ab3de5d8e80b4382d87d724e966ad..e770d9cac8b6117b15f7da35d9ae28a2d9a9d2e2 100644 (file)
--- a/hw/arm/netduino2.c
+++ b/hw/arm/netduino2.c
@@ -25,6 +25,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/boards.h"
+#include "hw/qdev-properties.h"
 #include "qemu/error-report.h"
 #include "hw/arm/stm32f205_soc.h"
 #include "hw/arm/boot.h"

diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c
index 3f3eca52e231def3c8fdef890c1486483cf1a49a..af99ff45228e05806612e595034db0ebb055d9e0 100644 (file)
--- a/hw/arm/nseries.c
+++ b/hw/arm/nseries.c
@@ -35,6 +35,7 @@
 #include "hw/input/tsc2xxx.h"
 #include "hw/misc/cbus.h"
 #include "hw/misc/tmp105.h"
+#include "hw/qdev-properties.h"
 #include "hw/block/flash.h"
 #include "hw/hw.h"
 #include "hw/bt.h"

diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c
index ce9247118e6477d0bbd02c1396d49fb71a32f9b9..19fca4159ac142e844f1b415d98b882dd4754ded 100644 (file)
--- a/hw/arm/omap1.c
+++ b/hw/arm/omap1.c
@@ -26,6 +26,7 @@
 #include "hw/boards.h"
 #include "hw/hw.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/omap.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c
index af5e3d0ba7a43f24fe626595af9e684d7530962b..dccb5707f8de854d0c09638bdd8b3b903f1478f6 100644 (file)
--- a/hw/arm/omap2.c
+++ b/hw/arm/omap2.c
@@ -26,6 +26,7 @@
 #include "sysemu/reset.h"
 #include "hw/boards.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/omap.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c
index 4e99c30e1124f8bf5ec57260e570969f0873bcf8..cdafde2f7674b907269f461ef18ba8e7b9782a21 100644 (file)
--- a/hw/arm/pxa2xx.c
+++ b/hw/arm/pxa2xx.c
@@ -20,6 +20,7 @@
 #include "hw/char/serial.h"
 #include "hw/i2c/i2c.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "hw/ssi/ssi.h"
 #include "chardev/char-fe.h"
 #include "sysemu/blockdev.h"

diff --git a/hw/arm/pxa2xx_gpio.c b/hw/arm/pxa2xx_gpio.c
index aa2c89dcf947e18e40194a084e85e813332ff4a3..86a0e86c4c6c77da75d8e425859cacf0dcb44563 100644 (file)
--- a/hw/arm/pxa2xx_gpio.c
+++ b/hw/arm/pxa2xx_gpio.c
@@ -11,6 +11,7 @@
 #include "cpu.h"
 #include "hw/hw.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/arm/pxa.h"

diff --git a/hw/arm/sabrelite.c b/hw/arm/sabrelite.c
index 934f4c926190db5616f6e16d900fc933c8147515..a6185c169e73d702765a1d5b23abddeb47d9f8ae 100644 (file)
--- a/hw/arm/sabrelite.c
+++ b/hw/arm/sabrelite.c
@@ -14,6 +14,7 @@
 #include "qapi/error.h"
 #include "hw/arm/fsl-imx6.h"
 #include "hw/boards.h"
+#include "hw/qdev-properties.h"
 #include "sysemu/sysemu.h"
 #include "qemu/error-report.h"
 #include "sysemu/qtest.h"

diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c
index 9c67d5c6f9e736b8844abe7b114557462ec61368..2a0e2ed1d071da1a78150652b1e1750102586071 100644 (file)
--- a/hw/arm/sbsa-ref.c
+++ b/hw/arm/sbsa-ref.c
@@ -36,6 +36,7 @@
 #include "hw/intc/arm_gicv3_common.h"
 #include "hw/loader.h"
 #include "hw/pci-host/gpex.h"
+#include "hw/qdev-properties.h"
 #include "hw/usb.h"
 #include "net/net.h"
 

diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c
index 2eabb9c814c94a323189599f4379f424a545a3a3..ee010c48b2a0311661ccf816e7e8cc8b1400f3b1 100644 (file)
--- a/hw/arm/spitz.c
+++ b/hw/arm/spitz.c
@@ -16,6 +16,7 @@
 #include "hw/arm/boot.h"
 #include "sysemu/sysemu.h"
 #include "hw/pcmcia.h"
+#include "hw/qdev-properties.h"
 #include "hw/i2c/i2c.h"
 #include "hw/irq.h"
 #include "hw/ssi/ssi.h"

diff --git a/hw/arm/stm32f205_soc.c b/hw/arm/stm32f205_soc.c
index c08041a1c55a1cbe6167a91fb7bc2fb3ac1506b1..be8b7df67920f9d977500328cd01fdb1abb42ae0 100644 (file)
--- a/hw/arm/stm32f205_soc.c
+++ b/hw/arm/stm32f205_soc.c
@@ -28,6 +28,7 @@
 #include "hw/arm/boot.h"
 #include "exec/address-spaces.h"
 #include "hw/arm/stm32f205_soc.h"
+#include "hw/qdev-properties.h"
 
 /* At the moment only Timer 2 to 5 are modelled */
 static const uint32_t timer_addr[STM_NUM_TIMERS] = { 0x40000000, 0x40000400,

diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c
index ca377df9e3c5b3099fb6b18616011cb0e628314d..dc65d88a657319a3efea38b34c53279f4504a48a 100644 (file)
--- a/hw/arm/strongarm.c
+++ b/hw/arm/strongarm.c
@@ -32,6 +32,7 @@
 #include "cpu.h"
 #include "hw/boards.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "strongarm.h"

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 0e5152ed3bcf72e3d7c5c071ed1056267002e965..e9fddec058def0e93c52af3699ad3764649f5c22 100644 (file)
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -54,6 +54,7 @@
 #include "hw/pci-host/gpex.h"
 #include "hw/arm/sysbus-fdt.h"
 #include "hw/platform-bus.h"
+#include "hw/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 9af584fb12fc0327911e1ba90d23bdc994cc2f7d..115ee51c7ca2d1d8b23b488c555501d90ef6a29e 100644 (file)
--- a/hw/audio/ac97.c
+++ b/hw/audio/ac97.c
@@ -21,6 +21,7 @@
 #include "hw/audio/soundhw.h"
 #include "audio/audio.h"
 #include "hw/pci/pci.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"
 #include "sysemu/dma.h"

diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c
index 62e59ccee68aee300c5ad742179a7591918a124d..2f4aacbf43d8a7b3e8631e24c1a92ae88cd0152f 100644 (file)
--- a/hw/audio/adlib.c
+++ b/hw/audio/adlib.c
@@ -28,6 +28,7 @@
 #include "hw/audio/soundhw.h"
 #include "audio/audio.h"
 #include "hw/isa/isa.h"
+#include "hw/qdev-properties.h"
 
 //#define DEBUG
 

diff --git a/hw/audio/cs4231a.c b/hw/audio/cs4231a.c
index 383200e1e2f776da57f3fdb8f96170db7eb93271..d77a4e713e3f0471affb293c98f8fe08ee3f0ca8 100644 (file)
--- a/hw/audio/cs4231a.c
+++ b/hw/audio/cs4231a.c
@@ -27,7 +27,7 @@
 #include "audio/audio.h"
 #include "hw/irq.h"
 #include "hw/isa/isa.h"
-#include "hw/qdev.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"
 #include "qemu/timer.h"

diff --git a/hw/audio/gus.c b/hw/audio/gus.c
index 787e04774a345e192e94b66f8d08e7fca392cc55..dbfe7cf63428ed5732bdd2bbf787c0f24ce4bb2d 100644 (file)
--- a/hw/audio/gus.c
+++ b/hw/audio/gus.c
@@ -29,6 +29,7 @@
 #include "audio/audio.h"
 #include "hw/irq.h"
 #include "hw/isa/isa.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "gusemu.h"
 #include "gustate.h"

diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c
index 4c33c477e1fbce057ad7e3a9f3226f80d58d4438..4fee0673d9ca193b9bc216ccb2f22b95cd2cdf9e 100644 (file)
--- a/hw/audio/hda-codec.c
+++ b/hw/audio/hda-codec.c
@@ -19,6 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/pci/pci.h"
+#include "hw/qdev-properties.h"
 #include "intel-hda.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"

diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c
index 5a1fcded559fb7d20121dd2e77655900d6a6de6a..6ecd383540f4537ea033f5473357ff4105e42642 100644 (file)
--- a/hw/audio/intel-hda.c
+++ b/hw/audio/intel-hda.c
@@ -19,6 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/pci/pci.h"
+#include "hw/qdev-properties.h"
 #include "hw/pci/msi.h"
 #include "qemu/timer.h"
 #include "qemu/bitops.h"

diff --git a/hw/audio/intel-hda.h b/hw/audio/intel-hda.h
index 53b78da4df0cdb96a46973c4fc66c77e61bd127e..eee6fee5af3fc057289f1f5489ac638b273c85af 100644 (file)
--- a/hw/audio/intel-hda.h
+++ b/hw/audio/intel-hda.h
@@ -1,7 +1,7 @@
 #ifndef HW_INTEL_HDA_H
 #define HW_INTEL_HDA_H
 
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 
 /* --------------------------------------------------------------------- */
 /* hda bus                                                               */

diff --git a/hw/audio/marvell_88w8618.c b/hw/audio/marvell_88w8618.c
index 158a456a41118208bd76dd699dd5938beb1f7897..883ef74c8b832007ea1e77a3e8b4b09393217c86 100644 (file)
--- a/hw/audio/marvell_88w8618.c
+++ b/hw/audio/marvell_88w8618.c
@@ -14,6 +14,7 @@
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "hw/audio/wm8750.h"
 #include "audio/audio.h"
 #include "qapi/error.h"

diff --git a/hw/audio/pl041.c b/hw/audio/pl041.c
index 3c371397de088aaa31253b829d90f9095ab65b73..ca9139907880cec2d38191b64bace69858942c80 100644 (file)
--- a/hw/audio/pl041.c
+++ b/hw/audio/pl041.c
@@ -22,6 +22,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/irq.h"
+#include "hw/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 818659546ff5295c71765e9f324e01b65fe7b27a..3ad01f3599b4c0c832db9909aac65c55e67d6666 100644 (file)
--- a/hw/audio/sb16.c
+++ b/hw/audio/sb16.c
@@ -27,7 +27,7 @@
 #include "audio/audio.h"
 #include "hw/irq.h"
 #include "hw/isa/isa.h"
-#include "hw/qdev.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qemu/timer.h"
 #include "qemu/host-utils.h"

diff --git a/hw/block/fdc.c b/hw/block/fdc.c
index e80439482c3848f871b041cf8e72742a8e065e7b..ac5d31e8c151f48f4d5aadf6da380ec073b6d0fc 100644 (file)
--- a/hw/block/fdc.c
+++ b/hw/block/fdc.c
@@ -34,6 +34,7 @@
 #include "qemu/timer.h"
 #include "hw/irq.h"
 #include "hw/isa/isa.h"
+#include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/block/block.h"

diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c
index c213e2ed7bc6421e117ebc139a9682c4f88158c2..47159de3a4431b119b9e7212635d68baa1862dcb 100644 (file)
--- a/hw/block/m25p80.c
+++ b/hw/block/m25p80.c
@@ -24,6 +24,7 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "sysemu/block-backend.h"
+#include "hw/qdev-properties.h"
 #include "hw/ssi/ssi.h"
 #include "migration/vmstate.h"
 #include "qemu/bitops.h"

diff --git a/hw/block/nand.c b/hw/block/nand.c
index 4a0d4677c34a64c188c3e68bb4a4fe0dec6b2617..e396004315e4b1446007b0dbe6b8aa1136c99e29 100644 (file)
--- a/hw/block/nand.c
+++ b/hw/block/nand.c
@@ -20,9 +20,9 @@
 
 #include "qemu/osdep.h"
 #include "hw/hw.h"
+#include "hw/qdev-properties.h"
 #include "hw/block/flash.h"
 #include "sysemu/block-backend.h"
-#include "hw/qdev.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"

diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index e08853fe5e9ad818708e05e59165c5a8b3994868..12d825425016629dd9c07feabc8e0917fca56b14 100644 (file)
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -30,6 +30,7 @@
 #include "hw/block/block.h"
 #include "hw/pci/msix.h"
 #include "hw/pci/pci.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "sysemu/sysemu.h"
 #include "qapi/error.h"

diff --git a/hw/block/onenand.c b/hw/block/onenand.c
index 18123f049942e6da83c0c1a4469e28c83c630613..fcc5a69b90a169b5cd0efb46eb812a23648c39a2 100644 (file)
--- a/hw/block/onenand.c
+++ b/hw/block/onenand.c
@@ -23,6 +23,7 @@
 #include "hw/hw.h"
 #include "hw/block/flash.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "sysemu/block-backend.h"
 #include "exec/memory.h"
 #include "hw/sysbus.h"

diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c
index 7bfe9de2a378837bac1061ce79dd4bb86314e488..de6efe1893a38e9184ffec62216ff81ca753de58 100644 (file)
--- a/hw/block/pflash_cfi01.c
+++ b/hw/block/pflash_cfi01.c
@@ -39,6 +39,7 @@
 #include "qemu/osdep.h"
 #include "hw/block/block.h"
 #include "hw/block/flash.h"
+#include "hw/qdev-properties.h"
 #include "sysemu/block-backend.h"
 #include "qapi/error.h"
 #include "qemu/timer.h"

diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c
index 18ea50f4bacf64fafc8e33fbaa5a09485408c37a..4baca701b7c2796761cfd3bc799e96766d8b4d63 100644 (file)
--- a/hw/block/pflash_cfi02.c
+++ b/hw/block/pflash_cfi02.c
@@ -35,6 +35,7 @@
 #include "qemu/osdep.h"
 #include "hw/block/block.h"
 #include "hw/block/flash.h"
+#include "hw/qdev-properties.h"
 #include "qapi/error.h"
 #include "qemu/bitmap.h"
 #include "qemu/timer.h"

diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c
index 85bc4017e7e9986e1141dd74c539a73dacbdffd5..7b44cca6d92e6592d122b8be13adfc4243de8ed3 100644 (file)
--- a/hw/block/vhost-user-blk.c
+++ b/hw/block/vhost-user-blk.c
@@ -22,6 +22,7 @@
 #include "qemu/cutils.h"
 #include "qom/object.h"
 #include "hw/qdev-core.h"
+#include "hw/qdev-properties.h"
 #include "hw/virtio/vhost.h"
 #include "hw/virtio/vhost-user-blk.h"
 #include "hw/virtio/virtio.h"

diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index 1f40834d2742e6578625eaa9fbc49fdeeb341cf7..8cc2a232e0015b7b0454cd095a55d851e14b79f7 100644 (file)
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -18,6 +18,7 @@
 #include "qemu/error-report.h"
 #include "trace.h"
 #include "hw/block/block.h"
+#include "hw/qdev-properties.h"
 #include "sysemu/blockdev.h"
 #include "hw/virtio/virtio-blk.h"
 #include "dataplane/virtio-blk.h"

diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c
index aef39536aca9978fd8cedf5149a533d379d97354..f77343db6064f8b8af433cc21e65932e88a74707 100644 (file)
--- a/hw/block/xen-block.c
+++ b/hw/block/xen-block.c
@@ -20,6 +20,7 @@
 #include "qapi/qmp/qstring.h"
 #include "hw/xen/xen_common.h"
 #include "hw/block/xen_blkif.h"
+#include "hw/qdev-properties.h"
 #include "hw/xen/xen-block.h"
 #include "hw/xen/xen-backend.h"
 #include "sysemu/blockdev.h"

diff --git a/hw/char/bcm2835_aux.c b/hw/char/bcm2835_aux.c
index 45fc34d92d8f7023059cf52310562ae1ab9ddcfc..3f855196e3a1a31c453fed80366a418b617ed41d 100644 (file)
--- a/hw/char/bcm2835_aux.c
+++ b/hw/char/bcm2835_aux.c
@@ -23,6 +23,7 @@
 #include "qemu/osdep.h"
 #include "hw/char/bcm2835_aux.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/char/debugcon.c b/hw/char/debugcon.c
index b38d82891f64b709c15d1d5d10267a3c5be0fb6a..5c592e091b1a9ebe40b24df31f25fc77b27d3fc0 100644 (file)
--- a/hw/char/debugcon.c
+++ b/hw/char/debugcon.c
@@ -29,6 +29,7 @@
 #include "qemu/module.h"
 #include "chardev/char-fe.h"
 #include "hw/isa/isa.h"
+#include "hw/qdev-properties.h"
 
 #define TYPE_ISA_DEBUGCON_DEVICE "isa-debugcon"
 #define ISA_DEBUGCON_DEVICE(obj) \

diff --git a/hw/char/digic-uart.c b/hw/char/digic-uart.c
index cc501678ce50fda8053838fa7d563b858ba5e3c0..974a2619dd875a95256dd5ff4bdd52ce2d201046 100644 (file)
--- a/hw/char/digic-uart.c
+++ b/hw/char/digic-uart.c
@@ -34,6 +34,7 @@
 #include "qemu/module.h"
 
 #include "hw/char/digic-uart.h"
+#include "hw/qdev-properties.h"
 
 enum {
     ST_RX_RDY = (1 << 0),

diff --git a/hw/char/escc.c b/hw/char/escc.c
index 35c6952bbd0bd37d1da19f8cb60db7274cd4a431..e185522e276bdd2982d4097acd3a5862ae3d1d58 100644 (file)
--- a/hw/char/escc.c
+++ b/hw/char/escc.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"

diff --git a/hw/char/etraxfs_ser.c b/hw/char/etraxfs_ser.c
index e93f31c76a7bd7d875dfaa9f6989164bf57011d0..15ac12ef22d353a7c847e762906fa0d319c60446 100644 (file)
--- a/hw/char/etraxfs_ser.c
+++ b/hw/char/etraxfs_ser.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "chardev/char-fe.h"
 #include "qemu/log.h"

diff --git a/hw/char/exynos4210_uart.c b/hw/char/exynos4210_uart.c
index 9bd826b33d5f9351f0c565175f7f6bed01dca4a6..49e279d5dfbf53ac227068a40a77e99d0dbc025b 100644 (file)
--- a/hw/char/exynos4210_uart.c
+++ b/hw/char/exynos4210_uart.c
@@ -30,6 +30,7 @@
 
 #include "hw/arm/exynos4210.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 
 #undef DEBUG_UART
 #undef DEBUG_UART_EXTEND

diff --git a/hw/char/grlib_apbuart.c b/hw/char/grlib_apbuart.c
index 13013e8a1cfa7ad4d11ba736b21e6d22b7e756a5..fe3cbf41a31d64c9636fd78fb5903feed2871627 100644 (file)
--- a/hw/char/grlib_apbuart.c
+++ b/hw/char/grlib_apbuart.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "hw/sparc/grlib.h"
 #include "hw/sysbus.h"
 #include "qemu/module.h"

diff --git a/hw/char/imx_serial.c b/hw/char/imx_serial.c
index bf3f07d7603fcfca535ce16d3c75eec44e2b71a2..e49baa994ce3a5b7f7dd4d5d4833350c13e72b1f 100644 (file)
--- a/hw/char/imx_serial.c
+++ b/hw/char/imx_serial.c
@@ -21,6 +21,7 @@
 #include "qemu/osdep.h"
 #include "hw/char/imx_serial.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "sysemu/sysemu.h"
 #include "qemu/log.h"

diff --git a/hw/char/ipoctal232.c b/hw/char/ipoctal232.c
index 1171dc20cf255f4f371270df2ef6e0cd453b5284..66c163ba26a205eac3641e0c8b8a31fa478df4a6 100644 (file)
--- a/hw/char/ipoctal232.c
+++ b/hw/char/ipoctal232.c
@@ -11,6 +11,7 @@
 #include "qemu/osdep.h"
 #include "hw/ipack/ipack.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qemu/bitops.h"
 #include "qemu/module.h"

diff --git a/hw/char/lm32_juart.c b/hw/char/lm32_juart.c
index 69dd7ac72beaccdfafb9727738fba9607cf4c292..e0b1bd655502e77e58c1f789d5819865441bb783 100644 (file)
--- a/hw/char/lm32_juart.c
+++ b/hw/char/lm32_juart.c
@@ -25,6 +25,7 @@
 #include "chardev/char-fe.h"
 
 #include "hw/char/lm32_juart.h"
+#include "hw/qdev-properties.h"
 
 enum {
     LM32_JUART_MIN_SAVE_VERSION = 0,

diff --git a/hw/char/lm32_uart.c b/hw/char/lm32_uart.c
index 00832fba866e9fb396d0221f4aa4345dd08da992..32f29c44cfc0dd87f257faf180d9773310d5e144 100644 (file)
--- a/hw/char/lm32_uart.c
+++ b/hw/char/lm32_uart.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "trace.h"

diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c
index 1712b2296e0be8d9d4891bebf0e7ed5a9f8e2aba..58323baf43ef88c01e226d6ff02ae6ef4bcf18fd 100644 (file)
--- a/hw/char/mcf_uart.c
+++ b/hw/char/mcf_uart.c
@@ -11,6 +11,7 @@
 #include "hw/sysbus.h"
 #include "qemu/module.h"
 #include "hw/m68k/mcf.h"
+#include "hw/qdev-properties.h"
 #include "chardev/char-fe.h"
 
 typedef struct {

diff --git a/hw/char/milkymist-uart.c b/hw/char/milkymist-uart.c
index e90f84d53e755832be651ce338514127d6fd2ef5..c358ca07f34bbf3876c85d8368d39e63b1b51fc9 100644 (file)
--- a/hw/char/milkymist-uart.c
+++ b/hw/char/milkymist-uart.c
@@ -23,6 +23,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "trace.h"

diff --git a/hw/char/nrf51_uart.c b/hw/char/nrf51_uart.c
index bb886f12aa3e8f8b98245106134e3f685f03bb5a..2777afe366c2101624a32837247a14a5b9aeefc4 100644 (file)
--- a/hw/char/nrf51_uart.c
+++ b/hw/char/nrf51_uart.c
@@ -17,6 +17,7 @@
 #include "qemu/module.h"
 #include "hw/char/nrf51_uart.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "trace.h"
 

diff --git a/hw/char/parallel-isa.c b/hw/char/parallel-isa.c
index a043832e728fcc47493f88e1786db31315e1e0cd..bcc577f61ccfc8c0b0881e6703c202169119326d 100644 (file)
--- a/hw/char/parallel-isa.c
+++ b/hw/char/parallel-isa.c
@@ -8,9 +8,11 @@
  *
  * SPDX-License-Identifier: MIT
  */
+
 #include "qemu/osdep.h"
 #include "sysemu/sysemu.h"
 #include "hw/isa/isa.h"
+#include "hw/qdev-properties.h"
 #include "hw/char/parallel.h"
 
 static void parallel_init(ISABus *bus, int index, Chardev *chr)

diff --git a/hw/char/parallel.c b/hw/char/parallel.c
index 3980eb5909e298e33061abf9cbeb3c79b0acf14f..40174eeda129141ab42040aaad355d7e2b4a054b 100644 (file)
--- a/hw/char/parallel.c
+++ b/hw/char/parallel.c
@@ -30,6 +30,7 @@
 #include "chardev/char-fe.h"
 #include "hw/irq.h"
 #include "hw/isa/isa.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/char/parallel.h"
 #include "sysemu/reset.h"

diff --git a/hw/char/sclpconsole-lm.c b/hw/char/sclpconsole-lm.c
index d904265cda558ce9fdc6ed27d8784eb19eb1b5fd..392606259d5fa43ce4b4aecfd354f5eb44abe14a 100644 (file)
--- a/hw/char/sclpconsole-lm.c
+++ b/hw/char/sclpconsole-lm.c
@@ -14,7 +14,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev.h"
 #include "qemu/thread.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"
@@ -23,6 +22,7 @@
 #include "hw/s390x/sclp.h"
 #include "migration/vmstate.h"
 #include "hw/s390x/event-facility.h"
+#include "hw/qdev-properties.h"
 #include "hw/s390x/ebcdic.h"
 
 #define SIZE_BUFFER 4096

diff --git a/hw/char/sclpconsole.c b/hw/char/sclpconsole.c
index f3669766bf8cd675b25d2d3535f7c42698630a1c..da126f0133f2112499a75fa139b967bcb6eb2507 100644 (file)
--- a/hw/char/sclpconsole.c
+++ b/hw/char/sclpconsole.c
@@ -13,13 +13,13 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev.h"
 #include "qemu/thread.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"
 
 #include "hw/s390x/sclp.h"
 #include "migration/vmstate.h"
+#include "hw/qdev-properties.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 d3080b76e447af5a07a9f37b43894c635518506d..5a0ae02ee719a5448029d6d0016dcea10cb23068 100644 (file)
--- a/hw/char/serial-isa.c
+++ b/hw/char/serial-isa.c
@@ -28,6 +28,7 @@
 #include "qemu/module.h"
 #include "hw/char/serial.h"
 #include "hw/isa/isa.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 
 #define ISA_SERIAL(obj) OBJECT_CHECK(ISASerialState, (obj), TYPE_ISA_SERIAL)

diff --git a/hw/char/serial-pci-multi.c b/hw/char/serial-pci-multi.c
index 867e7840b420a14e5d01bb2abc6eb951c3e97507..5f13b5663bc76323598a4a67bedd1c7d2efe353e 100644 (file)
--- a/hw/char/serial-pci-multi.c
+++ b/hw/char/serial-pci-multi.c
@@ -32,6 +32,7 @@
 #include "hw/char/serial.h"
 #include "hw/irq.h"
 #include "hw/pci/pci.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 
 #define PCI_SERIAL_MAX_PORTS 4

diff --git a/hw/char/serial-pci.c b/hw/char/serial-pci.c
index ee537890c29a65695df198968f7ba89ce29915d5..cb9b76e22bb1f7253129e8a9d9f14e427540011c 100644 (file)
--- a/hw/char/serial-pci.c
+++ b/hw/char/serial-pci.c
@@ -31,6 +31,7 @@
 #include "hw/char/serial.h"
 #include "hw/irq.h"
 #include "hw/pci/pci.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 
 typedef struct PCISerialState {

diff --git a/hw/char/spapr_vty.c b/hw/char/spapr_vty.c
index b3995a9e0c0aaeda6fe35af856359caffc7cb762..7f860fcce7453d235e24b6fd2cf94b6ce4022918 100644 (file)
--- a/hw/char/spapr_vty.c
+++ b/hw/char/spapr_vty.c
@@ -3,12 +3,12 @@
 #include "qemu/module.h"
 #include "qapi/error.h"
 #include "cpu.h"
-#include "hw/qdev.h"
 #include "migration/vmstate.h"
 #include "chardev/char-fe.h"
 #include "hw/irq.h"
 #include "hw/ppc/spapr.h"
 #include "hw/ppc/spapr_vio.h"
+#include "hw/qdev-properties.h"
 
 #define VTERM_BUFSIZE   16
 

diff --git a/hw/char/stm32f2xx_usart.c b/hw/char/stm32f2xx_usart.c
index f43eb74fb1c648f537adf3235c374c7e93b64981..4ec843de38270bc39ccdf2ae613624d27136fcf6 100644 (file)
--- a/hw/char/stm32f2xx_usart.c
+++ b/hw/char/stm32f2xx_usart.c
@@ -25,6 +25,7 @@
 #include "qemu/osdep.h"
 #include "hw/char/stm32f2xx_usart.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
 

diff --git a/hw/char/terminal3270.c b/hw/char/terminal3270.c
index 3785886c2546b079a4f7e85bed05b88c32f068e7..6859c1bcb2b9e53c1b8824ab7baee8c4694d2df2 100644 (file)
--- a/hw/char/terminal3270.c
+++ b/hw/char/terminal3270.c
@@ -15,6 +15,7 @@
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "chardev/char-fe.h"
+#include "hw/qdev-properties.h"
 #include "hw/s390x/3270-ccw.h"
 
 /* Enough spaces for different window sizes. */

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

diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c
index 272cfb6049df08aa090bbad1e3fa108be3fdfab4..4e0ed829aeac79cd650ab9b16eff5a7a838b505d 100644 (file)
--- a/hw/char/virtio-serial-bus.c
+++ b/hw/char/virtio-serial-bus.c
@@ -27,6 +27,7 @@
 #include "monitor/monitor.h"
 #include "qemu/error-report.h"
 #include "qemu/queue.h"
+#include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "trace.h"
 #include "hw/virtio/virtio-serial.h"

diff --git a/hw/char/xilinx_uartlite.c b/hw/char/xilinx_uartlite.c
index fa7451fd67dcd895302884d5c2b1632a2212bde8..2c4727506868ee494728d2076cfc863421320d24 100644 (file)
--- a/hw/char/xilinx_uartlite.c
+++ b/hw/char/xilinx_uartlite.c
@@ -25,6 +25,7 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "qemu/module.h"
 #include "chardev/char-fe.h"

diff --git a/hw/core/bus.c b/hw/core/bus.c
index 17bc1edcde61354d95ad605ff3a38cfdf2a4b1bc..7f3d2a3dbda72fe0a5dfea3ff1f1b8c1f62850c3 100644 (file)
--- a/hw/core/bus.c
+++ b/hw/core/bus.c
@@ -18,9 +18,9 @@
  */
 
 #include "qemu/osdep.h"
+#include "hw/qdev-properties.h"
 #include "qemu/ctype.h"
 #include "qemu/module.h"
-#include "hw/qdev.h"
 #include "qapi/error.h"
 
 void qbus_set_hotplug_handler(BusState *bus, Object *handler, Error **errp)

diff --git a/hw/core/generic-loader.c b/hw/core/generic-loader.c
index 579fe5ed325ad6f2eca56fb0b7c301bf389ab4b7..06d8d6466e3ee72233f013b790af21d212c18388 100644 (file)
--- a/hw/core/generic-loader.c
+++ b/hw/core/generic-loader.c
@@ -36,6 +36,7 @@
 #include "sysemu/dma.h"
 #include "sysemu/reset.h"
 #include "hw/loader.h"
+#include "hw/qdev-properties.h"
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "hw/core/generic-loader.h"

diff --git a/hw/core/or-irq.c b/hw/core/or-irq.c
index 02949dae1a33d850e4569acd2120ebfa40e55e4c..18d63831cd3edf093e69e0ad8794f451245ee9f7 100644 (file)
--- a/hw/core/or-irq.c
+++ b/hw/core/or-irq.c
@@ -25,6 +25,7 @@
 #include "qemu/osdep.h"
 #include "hw/irq.h"
 #include "hw/or-irq.h"
+#include "hw/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 5fecb29239ebc6b0fd8918ab3f5bc1535f499928..9c9a9c271fdef471ef295f7efee3b1bf8390f190 100644 (file)
--- a/hw/core/platform-bus.c
+++ b/hw/core/platform-bus.c
@@ -21,6 +21,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/platform-bus.h"
+#include "hw/qdev-properties.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/core/qdev-fw.c b/hw/core/qdev-fw.c
index aa35e9d0acaddf507381d02d9eb3d5312bdd93f7..a31958355ff64b894a6e27bafd713ef47b2bc650 100644 (file)
--- a/hw/core/qdev-fw.c
+++ b/hw/core/qdev-fw.c
@@ -16,8 +16,8 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev.h"
 #include "hw/fw-path-provider.h"
+#include "hw/qdev-core.h"
 
 const char *qdev_fw_name(DeviceState *dev)
 {

diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c
index ba412dd2cabea0961b84443c17afb65e066a9c3d..fceab9afd5ea0422d987b051bbb1977acc06026e 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 "net/net.h"
-#include "hw/qdev.h"
+#include "hw/qdev-properties.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "sysemu/block-backend.h"

diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index 8510ad14b0536d636eb37480726b4bb9e082504b..ac28890e5adb2dff1d7c058e0b2a06c748de1b62 100644 (file)
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -1,6 +1,6 @@
 #include "qemu/osdep.h"
 #include "net/net.h"
-#include "hw/qdev.h"
+#include "hw/qdev-properties.h"
 #include "qapi/error.h"
 #include "hw/pci/pci.h"
 #include "qapi/qapi-types-block.h"

diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index b1fe40d20dd29951335577fe1ff146c85c6b2978..8c055df1cbe34b5ae2de80251718b93806bc2b7d 100644 (file)
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -26,7 +26,6 @@
    this API directly.  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev.h"
 #include "sysemu/sysemu.h"
 #include "qapi/error.h"
 #include "qapi/qapi-events-qdev.h"
@@ -36,6 +35,7 @@
 #include "qemu/option.h"
 #include "hw/hotplug.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "hw/boards.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"

diff --git a/hw/core/register.c b/hw/core/register.c
index bb5ab9d4790c7785580d7c3915cb1ec02360bd09..3c77396587385112ff63fd95f537ce311a4f5c8f 100644 (file)
--- a/hw/core/register.c
+++ b/hw/core/register.c
@@ -17,7 +17,6 @@
 
 #include "qemu/osdep.h"
 #include "hw/register.h"
-#include "hw/qdev.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
 

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

diff --git a/hw/core/vm-change-state-handler.c b/hw/core/vm-change-state-handler.c
index f814813bdd82f997c1a8e4fd86e725bab8ef24c1..e27ea45977498f59671f3ef164052396a922813d 100644 (file)
--- a/hw/core/vm-change-state-handler.c
+++ b/hw/core/vm-change-state-handler.c
@@ -16,7 +16,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 
 static int qdev_get_dev_tree_depth(DeviceState *dev)
 {

diff --git a/hw/cpu/a15mpcore.c b/hw/cpu/a15mpcore.c
index fc19ed021474c7bc509178855c42fcdc800b4a63..7e9983aa19a877443cfacb0d72b706a16b1ae2ae 100644 (file)
--- a/hw/cpu/a15mpcore.c
+++ b/hw/cpu/a15mpcore.c
@@ -23,6 +23,7 @@
 #include "qemu/module.h"
 #include "hw/cpu/a15mpcore.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "sysemu/kvm.h"
 #include "kvm_arm.h"
 

diff --git a/hw/cpu/a9mpcore.c b/hw/cpu/a9mpcore.c
index 9dda4d8888c928c00d412a917d01478daa9f12ed..cd1e165fafffa9957d820460427a8a66785b6730 100644 (file)
--- a/hw/cpu/a9mpcore.c
+++ b/hw/cpu/a9mpcore.c
@@ -13,6 +13,7 @@
 #include "qemu/module.h"
 #include "hw/cpu/a9mpcore.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "qom/cpu.h"
 
 static void a9mp_priv_set_irq(void *opaque, int irq, int level)

diff --git a/hw/cpu/arm11mpcore.c b/hw/cpu/arm11mpcore.c
index c611a6ff324a87ad4554ace4c296ee603787983c..e78f5d080c33a6bbaa155a09f674fc6a54c552ce 100644 (file)
--- a/hw/cpu/arm11mpcore.c
+++ b/hw/cpu/arm11mpcore.c
@@ -13,6 +13,7 @@
 #include "hw/cpu/arm11mpcore.h"
 #include "hw/intc/realview_gic.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 
 
 static void mpcore_priv_set_irq(void *opaque, int irq, int level)

diff --git a/hw/cpu/cluster.c b/hw/cpu/cluster.c
index 6f5f037b3c9952c87895264151ef306e253fd271..74d8d43c00b14c4351747d29e157d58bcc02a581 100644 (file)
--- a/hw/cpu/cluster.c
+++ b/hw/cpu/cluster.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/cpu/cluster.h"
+#include "hw/qdev-properties.h"
 #include "qom/cpu.h"
 #include "qapi/error.h"
 #include "qemu/module.h"

diff --git a/hw/cpu/realview_mpcore.c b/hw/cpu/realview_mpcore.c
index 34da446d94363270de8d0524a90f99bc747159c6..ae2c9913f6f4906f99fd4905662e92e60550e024 100644 (file)
--- a/hw/cpu/realview_mpcore.c
+++ b/hw/cpu/realview_mpcore.c
@@ -14,6 +14,7 @@
 #include "hw/cpu/arm11mpcore.h"
 #include "hw/intc/realview_gic.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 
 #define TYPE_REALVIEW_MPCORE_RIRQ "realview_mpcore"
 #define REALVIEW_MPCORE_RIRQ(obj) \

diff --git a/hw/display/ati.c b/hw/display/ati.c
index df978a420ddfcbb5e6a774be270343da56e758a0..35f49a591b7b305a18218c13f0051f805b53e5ef 100644 (file)
--- a/hw/display/ati.c
+++ b/hw/display/ati.c
@@ -19,6 +19,7 @@
 #include "qemu/osdep.h"
 #include "ati_int.h"
 #include "ati_regs.h"
+#include "hw/qdev-properties.h"
 #include "vga_regs.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/display/bcm2835_fb.c b/hw/display/bcm2835_fb.c
index e606893f282151ba8ab9a9796fc2a11f162055bd..8f856878cd5b13c0616af1d417bfd2df560f18c0 100644 (file)
--- a/hw/display/bcm2835_fb.c
+++ b/hw/display/bcm2835_fb.c
@@ -31,6 +31,7 @@
 #include "framebuffer.h"
 #include "ui/pixel_ops.h"
 #include "hw/misc/bcm2835_mbox_defs.h"
+#include "hw/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 1ddba5b16f2109be06908d733ce29a9f106bdcb0..dc1bd1641d3428247204993da0c3d0981504b9a1 100644 (file)
--- a/hw/display/bochs-display.c
+++ b/hw/display/bochs-display.c
@@ -9,6 +9,7 @@
 #include "qemu/module.h"
 #include "qemu/units.h"
 #include "hw/pci/pci.h"
+#include "hw/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 29a8735a38569e9a5661d3582576dbefacb09a55..f90baae4de846602d919756e560b5a8b3e9c4fec 100644 (file)
--- a/hw/display/cg3.c
+++ b/hw/display/cg3.c
@@ -32,6 +32,7 @@
 #include "migration/vmstate.h"
 #include "hw/irq.h"
 #include "hw/loader.h"
+#include "hw/qdev-properties.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
 

diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c
index 0f5465bc147a77d4642bfb17dbcd3b7263722d1f..cd283e53b4e49e64979858d96f0fce19e92ae182 100644 (file)
--- a/hw/display/cirrus_vga.c
+++ b/hw/display/cirrus_vga.c
@@ -39,6 +39,7 @@
 #include "qapi/error.h"
 #include "trace.h"
 #include "hw/pci/pci.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "ui/pixel_ops.h"
 #include "cirrus_vga_internal.h"

diff --git a/hw/display/cirrus_vga_isa.c b/hw/display/cirrus_vga_isa.c
index 49f409b638b43d5064f014f6f000767ef2843c4d..7ef8e59224b67239c4d19dfe6bb7a054a00e8e00 100644 (file)
--- a/hw/display/cirrus_vga_isa.c
+++ b/hw/display/cirrus_vga_isa.c
@@ -27,6 +27,7 @@
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "hw/loader.h"
+#include "hw/qdev-properties.h"
 #include "hw/isa/isa.h"
 #include "cirrus_vga_internal.h"
 

diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c
index 1757b777e20b21a6ca4ce84a36e13d8c9305b6a4..839d26eca10678e5ead3ffdefa7cff8f7785cec7 100644 (file)
--- a/hw/display/g364fb.c
+++ b/hw/display/g364fb.c
@@ -21,6 +21,7 @@
 #include "qemu/units.h"
 #include "hw/hw.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "ui/console.h"

diff --git a/hw/display/i2c-ddc.c b/hw/display/i2c-ddc.c
index 3ac85216a5913b447ff7cef2a7fc29783b735f0e..fc70b7930cf2dc79211a309950e15f8c9a71240e 100644 (file)
--- a/hw/display/i2c-ddc.c
+++ b/hw/display/i2c-ddc.c
@@ -20,6 +20,7 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "hw/i2c/i2c.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/display/i2c-ddc.h"
 

diff --git a/hw/display/milkymist-vgafb.c b/hw/display/milkymist-vgafb.c
index 9a9a481ebd69e7ce18bd4b33b69b7abe8980ceca..8b0da4660a0a5d25f9e7a83fbdfcc67ef022c0e3 100644 (file)
--- a/hw/display/milkymist-vgafb.c
+++ b/hw/display/milkymist-vgafb.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/hw.h"
+#include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "trace.h"
 #include "ui/console.h"

diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index 539ede12c098afd21fc5520410a3938f82fb915b..971c2d0568438af326d0c97d1ae6824a2abf3c77 100644 (file)
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -29,6 +29,7 @@
 #include "qemu/main-loop.h"
 #include "qemu/module.h"
 #include "sysemu/sysemu.h"
+#include "hw/qdev-properties.h"
 #include "migration/blocker.h"
 #include "migration/vmstate.h"
 #include "trace.h"

diff --git a/hw/display/ramfb-standalone.c b/hw/display/ramfb-standalone.c
index 56215ef88cff88b78a11739a5b628ac774d4ea19..ebd623a669e57c2c4864b000f2c4a1155ef61730 100644 (file)
--- a/hw/display/ramfb-standalone.c
+++ b/hw/display/ramfb-standalone.c
@@ -2,6 +2,7 @@
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "hw/loader.h"
+#include "hw/qdev-properties.h"
 #include "hw/isa/isa.h"
 #include "hw/display/ramfb.h"
 #include "ui/console.h"

diff --git a/hw/display/sm501.c b/hw/display/sm501.c
index 603396358d9b64be68e93b25bd5e1a8d4906e893..d9e5762e367a76c25f9e6e1376b207535c0dec7f 100644 (file)
--- a/hw/display/sm501.c
+++ b/hw/display/sm501.c
@@ -34,6 +34,7 @@
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/pci/pci.h"
+#include "hw/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 f9b1ae56ec9514a0110917c56b14c7c8515ca536..14e829d3fa6f2a8d41ff9430ac18500ec592eab9 100644 (file)
--- a/hw/display/tcx.c
+++ b/hw/display/tcx.c
@@ -28,6 +28,7 @@
 #include "ui/console.h"
 #include "ui/pixel_ops.h"
 #include "hw/loader.h"
+#include "hw/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 189a4afc15264040cb09c38be6b48c0207047c9a..873e5e9706a0c0cb4a763789dbbc1694ea6d20c5 100644 (file)
--- a/hw/display/vga-isa.c
+++ b/hw/display/vga-isa.c
@@ -31,6 +31,7 @@
 #include "qemu/module.h"
 #include "qemu/timer.h"
 #include "hw/loader.h"
+#include "hw/qdev-properties.h"
 
 #define TYPE_ISA_VGA "isa-vga"
 #define ISA_VGA(obj) OBJECT_CHECK(ISAVGAState, (obj), TYPE_ISA_VGA)

diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c
index 86299f5e97d715a32f03148758a869b3dd1f50ac..a27b88122d4288c3a6c65561927f0213c1051f7f 100644 (file)
--- a/hw/display/vga-pci.c
+++ b/hw/display/vga-pci.c
@@ -26,6 +26,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/pci/pci.h"
+#include "hw/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 7181d9cdba1855ce0d58069b4810cdaeebe0112c..279877886e16a8770e34f320b9eefce621a7ee77 100644 (file)
--- a/hw/display/vhost-user-gpu.c
+++ b/hw/display/vhost-user-gpu.c
@@ -11,6 +11,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "hw/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-pci.c b/hw/display/virtio-gpu-pci.c
index e4c7eb6193653e058432b2a953c3e547f36c130f..25e4038874ed091d5d74311cf1180a42473e252a 100644 (file)
--- a/hw/display/virtio-gpu-pci.c
+++ b/hw/display/virtio-gpu-pci.c
@@ -15,6 +15,7 @@
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "hw/pci/pci.h"
+#include "hw/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 ed9207196394dd72ba7566640e332d964693d35b..6de9689a30f72b60e1710d0a5beaca237e76d20f 100644 (file)
--- a/hw/display/virtio-gpu.c
+++ b/hw/display/virtio-gpu.c
@@ -24,6 +24,7 @@
 #include "hw/virtio/virtio-gpu-pixman.h"
 #include "hw/virtio/virtio-bus.h"
 #include "hw/display/edid.h"
+#include "hw/qdev-properties.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "qapi/error.h"

diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c
index e5227fac2892467a4a6cb51c83e73f4662fadf1b..cc6e66ea1c2cfe1f76c05ceebbbf22e27b129274 100644 (file)
--- a/hw/display/virtio-vga.c
+++ b/hw/display/virtio-vga.c
@@ -1,5 +1,6 @@
 #include "qemu/osdep.h"
 #include "hw/pci/pci.h"
+#include "hw/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 f0b136eb162bbb783ecbbcba8dd5098180c185b2..23dc8910cc564ee316327b1afa4fdfed2ff2f1a3 100644 (file)
--- a/hw/display/vmware_vga.c
+++ b/hw/display/vmware_vga.c
@@ -30,6 +30,7 @@
 #include "trace.h"
 #include "ui/vnc.h"
 #include "hw/pci/pci.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 
 #undef VERBOSE

diff --git a/hw/dma/i82374.c b/hw/dma/i82374.c
index 3f0db4a021e3ba026828bb51470a673259b1dc44..b788b3681aa6be04b2fb8e5dbb3b873ac144a8e6 100644 (file)
--- a/hw/dma/i82374.c
+++ b/hw/dma/i82374.c
@@ -26,6 +26,7 @@
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "hw/isa/isa.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/dma/i8257.h"
 

diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c
index c626bd958a3e5c66e9ac2f0ca28d2c17805296e9..792f617eb43c3b2b722bfc90571661f1c7907317 100644 (file)
--- a/hw/dma/i8257.c
+++ b/hw/dma/i8257.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/isa/isa.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/dma/i8257.h"
 #include "qemu/main-loop.h"

diff --git a/hw/dma/pl080.c b/hw/dma/pl080.c
index 3713d5dadd00ce61521aff5fd3647aeb43490747..52ba23f4bf37decf8e0cba17e79f9cda1fb59f16 100644 (file)
--- a/hw/dma/pl080.c
+++ b/hw/dma/pl080.c
@@ -16,6 +16,7 @@
 #include "hw/dma/pl080.h"
 #include "hw/hw.h"
 #include "hw/irq.h"
+#include "hw/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 28830a42a32ed9ca1859efeffd4310f326ccac62..f2bb2d9ac16c28acd8f422a41b1631c37dc079cd 100644 (file)
--- a/hw/dma/pl330.c
+++ b/hw/dma/pl330.c
@@ -17,6 +17,7 @@
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"

diff --git a/hw/dma/pxa2xx_dma.c b/hw/dma/pxa2xx_dma.c
index 1124051730498296ad272947b64295628b56af8b..18e7a0b6949837d36734018e3d99f6da6fbab91d 100644 (file)
--- a/hw/dma/pxa2xx_dma.c
+++ b/hw/dma/pxa2xx_dma.c
@@ -11,6 +11,7 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "hw/arm/pxa.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"

diff --git a/hw/dma/sparc32_dma.c b/hw/dma/sparc32_dma.c
index 16d53b92dd054ab1569e2779325e8a30a76f30ed..0e5bbcdc7f81e5c2f8f3d060d6e4740cf2e5e3e6 100644 (file)
--- a/hw/dma/sparc32_dma.c
+++ b/hw/dma/sparc32_dma.c
@@ -27,6 +27,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/irq.h"
+#include "hw/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 2c2d567a95c491b3ec16ad2f32ed25948a8ece84..d176df6d44905d0022375acb12e5713115dd8f08 100644 (file)
--- a/hw/dma/xilinx_axidma.c
+++ b/hw/dma/xilinx_axidma.c
@@ -29,6 +29,7 @@
 #include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/ptimer.h"
+#include "hw/qdev-properties.h"
 #include "qemu/log.h"
 #include "qemu/main-loop.h"
 #include "qemu/module.h"

diff --git a/hw/dma/xlnx-zdma.c b/hw/dma/xlnx-zdma.c
index 2dbdfc573917bcd01822d32a30e42e45f7cb5f58..75b660988ffcf7be34a8c260d6d313507dadb92c 100644 (file)
--- a/hw/dma/xlnx-zdma.c
+++ b/hw/dma/xlnx-zdma.c
@@ -29,6 +29,7 @@
 #include "qemu/osdep.h"
 #include "hw/dma/xlnx-zdma.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qemu/bitops.h"
 #include "qemu/log.h"

diff --git a/hw/gpio/imx_gpio.c b/hw/gpio/imx_gpio.c
index 8792fb5ad4bbd405c51ef60c44eaa860b32e3857..ac8304ec56adbfcd57917b3f0a345b0764080237 100644 (file)
--- a/hw/gpio/imx_gpio.c
+++ b/hw/gpio/imx_gpio.c
@@ -20,6 +20,7 @@
 #include "qemu/osdep.h"
 #include "hw/gpio/imx_gpio.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/gpio/max7310.c b/hw/gpio/max7310.c
index 87b0f2474725f79e9501336b83db872af31ab1c2..bebb4030d276704c110947ef214a711c4d61fe9a 100644 (file)
--- a/hw/gpio/max7310.c
+++ b/hw/gpio/max7310.c
@@ -10,6 +10,7 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/i2c/i2c.h"
+#include "hw/hw.h"
 #include "hw/irq.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"

diff --git a/hw/gpio/omap_gpio.c b/hw/gpio/omap_gpio.c
index 46a721779ce6bbe27583f81e6e1731cde98d2933..41e1aa798cbe797ece6bd6fe3de43c8bd0d1fa46 100644 (file)
--- a/hw/gpio/omap_gpio.c
+++ b/hw/gpio/omap_gpio.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "hw/arm/omap.h"
 #include "hw/sysbus.h"
 #include "qemu/error-report.h"

diff --git a/hw/hyperv/hyperv_testdev.c b/hw/hyperv/hyperv_testdev.c
index 0d343a8bc07882fffb80b2dabc072c9690a4372e..88a5a637822a1a7ed7dcbb8bab554a611dd0a245 100644 (file)
--- a/hw/hyperv/hyperv_testdev.c
+++ b/hw/hyperv/hyperv_testdev.c
@@ -15,7 +15,6 @@
 #include "qemu/main-loop.h"
 #include "qemu/module.h"
 #include "qemu/queue.h"
-#include "hw/qdev.h"
 #include "hw/isa/isa.h"
 #include "hw/hyperv/hyperv.h"
 

diff --git a/hw/i2c/core.c b/hw/i2c/core.c
index 25b792fdd00ff0f6dc744a6670e42029ad48592a..92cd489069ad4e6136b564291fe95511847991cf 100644 (file)
--- a/hw/i2c/core.c
+++ b/hw/i2c/core.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/i2c/i2c.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"
 #include "trace.h"

diff --git a/hw/i2c/omap_i2c.c b/hw/i2c/omap_i2c.c
index 34f34e3b0500a6087849da3b40898f0eedaa4330..3ba965a58f3436b858f01a0fe7378b8d1593ba4d 100644 (file)
--- a/hw/i2c/omap_i2c.c
+++ b/hw/i2c/omap_i2c.c
@@ -22,6 +22,7 @@
 #include "qemu/module.h"
 #include "hw/i2c/i2c.h"
 #include "hw/irq.h"
+#include "hw/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 8642f0036d9859dbf68af9ff78f4bbe6975bcbcd..54c86a011200904c5efbb7a229f33a854624a010 100644 (file)
--- a/hw/i2c/smbus_eeprom.c
+++ b/hw/i2c/smbus_eeprom.c
@@ -28,6 +28,7 @@
 #include "hw/boards.h"
 #include "hw/i2c/i2c.h"
 #include "hw/i2c/smbus_slave.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/i2c/smbus_eeprom.h"
 

diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
index 50fe5cc1a9cefb70e4397f8eb939768eee9912c6..75ca6f9c70b2f48f41f90b2d02028bad8511d9bd 100644 (file)
--- a/hw/i386/intel_iommu.c
+++ b/hw/i386/intel_iommu.c
@@ -28,6 +28,7 @@
 #include "intel_iommu_internal.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_bus.h"
+#include "hw/qdev-properties.h"
 #include "hw/i386/pc.h"
 #include "hw/i386/apic-msidef.h"
 #include "hw/boards.h"

diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c
index d98cf9d5d109e4bfe0e863a64bfb0f9abd418dda..d6a5325f0bdb7bf97ac4034f18ea107e6c5c9eda 100644 (file)
--- a/hw/i386/kvm/clock.c
+++ b/hw/i386/kvm/clock.c
@@ -24,6 +24,7 @@
 #include "migration/vmstate.h"
 #include "hw/sysbus.h"
 #include "hw/kvm/clock.h"
+#include "hw/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 99ef530967fe39f6c83b06d1a41d83e444aa5f7c..f94729c56553e68e30c609914a123d6bf133c7fd 100644 (file)
--- a/hw/i386/kvm/ioapic.c
+++ b/hw/i386/kvm/ioapic.c
@@ -14,6 +14,7 @@
 #include "monitor/monitor.h"
 #include "hw/i386/pc.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "hw/i386/ioapic_internal.h"
 #include "hw/i386/apic_internal.h"
 #include "sysemu/kvm.h"

diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 060b47f84594129d3688329d9399b4bf2aa22773..8777c9618b433ee2dbaadc8801a6f1a826808f9d 100644 (file)
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -40,6 +40,7 @@
 #include "kvm_i386.h"
 #include "hw/kvm/clock.h"
 #include "hw/pci-host/q35.h"
+#include "hw/qdev-properties.h"
 #include "exec/address-spaces.h"
 #include "hw/i386/pc.h"
 #include "hw/i386/ich9.h"

diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c
index defea37fe44e0307120cffe299ca0dd6c8db498f..235928452b72178cf5ec859beb45e66d356b3b3b 100644 (file)
--- a/hw/i386/pc_sysfw.c
+++ b/hw/i386/pc_sysfw.c
@@ -34,6 +34,7 @@
 #include "hw/i386/pc.h"
 #include "hw/boards.h"
 #include "hw/loader.h"
+#include "hw/qdev-properties.h"
 #include "sysemu/sysemu.h"
 #include "hw/block/flash.h"
 #include "sysemu/kvm.h"

diff --git a/hw/i386/vmmouse.c b/hw/i386/vmmouse.c
index 4f8150457765ae94f98cd1535b2171ba498dd0c3..012ab903968557969f97663dec56a8308c4df98c 100644 (file)
--- a/hw/i386/vmmouse.c
+++ b/hw/i386/vmmouse.c
@@ -26,7 +26,7 @@
 #include "ui/console.h"
 #include "hw/i386/pc.h"
 #include "hw/input/i8042.h"
-#include "hw/qdev.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 
 /* debug only vmmouse */

diff --git a/hw/i386/vmport.c b/hw/i386/vmport.c
index 26fcbe38272de9269c16af47ba5edf51074306d5..1f31e27c8aa4c3a1344089c4ee8592a6f4a8665c 100644 (file)
--- a/hw/i386/vmport.c
+++ b/hw/i386/vmport.c
@@ -26,7 +26,6 @@
 #include "hw/i386/pc.h"
 #include "hw/input/i8042.h"
 #include "sysemu/hw_accel.h"
-#include "hw/qdev.h"
 #include "qemu/log.h"
 #include "trace.h"
 

diff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c
index d1534c1ae0e9eb607f8467ee7b9051a0b26d797e..1eaf2dd1bcf0a9f337fe36fbe89f959c53bb4ff6 100644 (file)
--- a/hw/i386/x86-iommu.c
+++ b/hw/i386/x86-iommu.c
@@ -21,6 +21,7 @@
 #include "hw/sysbus.h"
 #include "hw/boards.h"
 #include "hw/i386/x86-iommu.h"
+#include "hw/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 10c89cda4113b2c387d6da1f816481be83518157..27f646da062a16e6316acac14df2cee28eefe948 100644 (file)
--- a/hw/i386/xen/xen_pvdevice.c
+++ b/hw/i386/xen/xen_pvdevice.c
@@ -33,6 +33,7 @@
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "hw/pci/pci.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "trace.h"
 

diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 378c1f360f6d6e3fbf01d3d08ab96ee968db0e23..d72da85605afc7aa772119d8e85c1887536f8cce 100644 (file)
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -24,6 +24,7 @@
 #include "qemu/osdep.h"
 #include "hw/pci/msi.h"
 #include "hw/pci/pci.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 
 #include "qemu/error-report.h"

diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c
index c2ee427f563ca7f68151779185e0d468f443b21c..3fbfc5ea4543cd009b58dbe4ca71349b67bc054e 100644 (file)
--- a/hw/ide/cmd646.c
+++ b/hw/ide/cmd646.c
@@ -25,6 +25,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/pci/pci.h"
+#include "hw/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 939b473dadcb2cb214c6bec3192e6b015d685f01..7b6e283679ae26b248596ae4338d935d4e21b7eb 100644 (file)
--- a/hw/ide/isa.c
+++ b/hw/ide/isa.c
@@ -25,6 +25,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/isa/isa.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"
 #include "sysemu/dma.h"

diff --git a/hw/ide/macio.c b/hw/ide/macio.c
index 44f2ff92bb618d9a07f331fc48a8f26b28713d24..79f787c53925b2f1588d7214663748f06413bbe7 100644 (file)
--- a/hw/ide/macio.c
+++ b/hw/ide/macio.c
@@ -26,6 +26,7 @@
 #include "qemu/osdep.h"
 #include "hw/ppc/mac.h"
 #include "hw/ppc/mac_dbdma.h"
+#include "hw/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 d2a377f32602082217686f2ed5b78e28d9c70266..7149a9cba6ac95611c242a22a255a007cd3df65f 100644 (file)
--- a/hw/ide/mmio.c
+++ b/hw/ide/mmio.c
@@ -30,6 +30,7 @@
 #include "sysemu/dma.h"
 
 #include "hw/ide/internal.h"
+#include "hw/qdev-properties.h"
 
 /***********************************************************/
 /* MMIO based ide port

diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c
index d30bdd70ee54cd392bc9e83d52e7a4c39cfa8990..39957dd39f0ca5877350d4c1b395b8340fc30076 100644 (file)
--- a/hw/ide/qdev.c
+++ b/hw/ide/qdev.c
@@ -25,6 +25,7 @@
 #include "qemu/main-loop.h"
 #include "qemu/module.h"
 #include "hw/ide/internal.h"
+#include "hw/qdev-properties.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/blockdev.h"
 #include "hw/block/block.h"

diff --git a/hw/input/adb.c b/hw/input/adb.c
index 80ba1259bfc47a33795afac80c812edf879342ad..478a90fae2eb9e0e0d289985be83e8dea6ae14ce 100644 (file)
--- a/hw/input/adb.c
+++ b/hw/input/adb.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/input/adb.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"
 #include "adb-internal.h"

diff --git a/hw/input/milkymist-softusb.c b/hw/input/milkymist-softusb.c
index 8f6fdf2d970e6cf02f83075ea1eabd45ab9da4eb..67fcb3595f683b9d5fc8e361c921d4ecfe7b1241 100644 (file)
--- a/hw/input/milkymist-softusb.c
+++ b/hw/input/milkymist-softusb.c
@@ -29,6 +29,7 @@
 #include "ui/console.h"
 #include "hw/input/hid.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"
 

diff --git a/hw/input/vhost-user-input.c b/hw/input/vhost-user-input.c
index 6da497b1a8a94ef4a531470943d1049e9cbe6927..544452a2348efa7f85b29b0b87fa3a51183efc9b 100644 (file)
--- a/hw/input/vhost-user-input.c
+++ b/hw/input/vhost-user-input.c
@@ -9,7 +9,6 @@
 #include "qapi/error.h"
 #include "qemu-common.h"
 
-#include "hw/qdev.h"
 #include "hw/virtio/virtio-input.h"
 
 static int vhost_input_config_change(struct vhost_dev *dev)

diff --git a/hw/input/virtio-input-hid.c b/hw/input/virtio-input-hid.c
index f15a063facdcd32f470bb5c15a36c58c0a88ff32..386a363a17f085a6f0f9653e311874405cef9259 100644 (file)
--- a/hw/input/virtio-input-hid.c
+++ b/hw/input/virtio-input-hid.c
@@ -8,8 +8,8 @@
 #include "qemu/iov.h"
 #include "qemu/module.h"
 
-#include "hw/qdev.h"
 #include "hw/virtio/virtio.h"
+#include "hw/qdev-properties.h"
 #include "hw/virtio/virtio-input.h"
 
 #undef CONFIG_CURSES

diff --git a/hw/input/virtio-input-host.c b/hw/input/virtio-input-host.c
index a54c31eb09f29d0b27554003ac723965d7a67c21..1c3b12ba3296cdd2bd4f7ede061f89d58512a763 100644 (file)
--- a/hw/input/virtio-input-host.c
+++ b/hw/input/virtio-input-host.c
@@ -9,8 +9,8 @@
 #include "qemu/module.h"
 #include "qemu/sockets.h"
 
-#include "hw/qdev.h"
 #include "hw/virtio/virtio.h"
+#include "hw/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 9946394cf4a161f9c8f733e6973dddd2e3b4d588..51617a5885f69fe816106df5d6c7d5a6043e32aa 100644 (file)
--- a/hw/input/virtio-input.c
+++ b/hw/input/virtio-input.c
@@ -10,8 +10,8 @@
 #include "qemu/module.h"
 #include "trace.h"
 
-#include "hw/qdev.h"
 #include "hw/virtio/virtio.h"
+#include "hw/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 fbb6e25cf433672a51aec52d9fbd2a6619268b3b..aafd8e0e33880afac383d7440ccbd8f5e5fd2b23 100644 (file)
--- a/hw/intc/apic_common.c
+++ b/hw/intc/apic_common.c
@@ -29,7 +29,7 @@
 #include "trace.h"
 #include "sysemu/hax.h"
 #include "sysemu/kvm.h"
-#include "hw/qdev.h"
+#include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "migration/qemu-file-types.h"
 #include "migration/vmstate.h"

diff --git a/hw/intc/arm_gic_common.c b/hw/intc/arm_gic_common.c
index 5d506bebb51fae495f45a4606fb2118525319a2d..f0d0d7c467c2c80c7b861eb2ca5c6edbfa602a37 100644 (file)
--- a/hw/intc/arm_gic_common.c
+++ b/hw/intc/arm_gic_common.c
@@ -23,6 +23,7 @@
 #include "qemu/module.h"
 #include "gic_internal.h"
 #include "hw/arm/linux-boot-if.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 
 static int gic_pre_save(void *opaque)

diff --git a/hw/intc/arm_gicv2m.c b/hw/intc/arm_gicv2m.c
index 2c96d4fba0743afda5fc704c1627a150d8e2c5ab..6e45f4ff3931db054d4eccf8553b6a19b00358f2 100644 (file)
--- a/hw/intc/arm_gicv2m.c
+++ b/hw/intc/arm_gicv2m.c
@@ -30,6 +30,7 @@
 #include "hw/sysbus.h"
 #include "hw/irq.h"
 #include "hw/pci/msi.h"
+#include "hw/qdev-properties.h"
 #include "sysemu/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 12479f94a891a635bfad096ca2d727275ba7f3ba..8f5f4c8e94a383315f9873f634fb87a38dcc70a6 100644 (file)
--- a/hw/intc/arm_gicv3_common.c
+++ b/hw/intc/arm_gicv3_common.c
@@ -26,6 +26,7 @@
 #include "qemu/module.h"
 #include "qom/cpu.h"
 #include "hw/intc/arm_gicv3_common.h"
+#include "hw/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_kvm.c b/hw/intc/arm_gicv3_its_kvm.c
index 52ac01aba3014610efaa1da90dda33afba90781a..d0bd4f1d8181d039504fcb8df2c5b04c9a5902dd 100644 (file)
--- a/hw/intc/arm_gicv3_its_kvm.c
+++ b/hw/intc/arm_gicv3_its_kvm.c
@@ -22,6 +22,7 @@
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "hw/intc/arm_gicv3_its_common.h"
+#include "hw/qdev-properties.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/kvm.h"
 #include "kvm_arm.h"

diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c
index 0c7fc7078b8b624cb3da8c8ff01e3ab171012324..62ab8b7273aea029657bd1ff6f8c95a85f5118ad 100644 (file)
--- a/hw/intc/armv7m_nvic.c
+++ b/hw/intc/armv7m_nvic.c
@@ -18,6 +18,7 @@
 #include "qemu/timer.h"
 #include "hw/intc/armv7m_nvic.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "target/arm/cpu.h"
 #include "exec/exec-all.h"
 #include "qemu/log.h"

diff --git a/hw/intc/etraxfs_pic.c b/hw/intc/etraxfs_pic.c
index 88d3b0c36fd9c991bb425cbe58e346df73c6c794..77f652acecdf7c8da741470adf9315605e562edd 100644 (file)
--- a/hw/intc/etraxfs_pic.c
+++ b/hw/intc/etraxfs_pic.c
@@ -26,6 +26,7 @@
 #include "hw/sysbus.h"
 #include "qemu/module.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 //#include "pc.h"
 //#include "etraxfs.h"
 

diff --git a/hw/intc/exynos4210_combiner.c b/hw/intc/exynos4210_combiner.c
index 833e164350f3a58d34c4e447b9418eea6095de60..5b33ca6628c10cf7260f44cfcf7d3edfa0d2af5d 100644 (file)
--- a/hw/intc/exynos4210_combiner.c
+++ b/hw/intc/exynos4210_combiner.c
@@ -35,6 +35,7 @@
 #include "hw/arm/exynos4210.h"
 #include "hw/hw.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 
 //#define DEBUG_COMBINER
 

diff --git a/hw/intc/exynos4210_gic.c b/hw/intc/exynos4210_gic.c
index 7fa4583b0f3e3a71abbe3e8650b91c881e10be14..a1b699b6babc3105bfd4ad9a8383cdd0229ce769 100644 (file)
--- a/hw/intc/exynos4210_gic.c
+++ b/hw/intc/exynos4210_gic.c
@@ -25,6 +25,7 @@
 #include "migration/vmstate.h"
 #include "qemu/module.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "hw/arm/exynos4210.h"
 
 enum ExtGicId {

diff --git a/hw/intc/grlib_irqmp.c b/hw/intc/grlib_irqmp.c
index 21c77a5ec1e535647cb72030b753040e76486378..bc78e1a14f049ee71482e6902c8c9b376a80a1e3 100644 (file)
--- a/hw/intc/grlib_irqmp.c
+++ b/hw/intc/grlib_irqmp.c
@@ -28,6 +28,7 @@
 #include "hw/sysbus.h"
 #include "cpu.h"
 
+#include "hw/qdev-properties.h"
 #include "hw/sparc/grlib.h"
 
 #include "trace.h"

diff --git a/hw/intc/i8259_common.c b/hw/intc/i8259_common.c
index c7ff2b32746b5322e4084a8f04fd888c0705b34b..bd37bb5e68086649d783ab19c22aab1d9a21e123 100644 (file)
--- a/hw/intc/i8259_common.c
+++ b/hw/intc/i8259_common.c
@@ -26,6 +26,7 @@
 #include "qemu/osdep.h"
 #include "hw/i386/pc.h"
 #include "hw/isa/i8259_internal.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "monitor/monitor.h"
 

diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c
index c346f50df993eec6f9b5a983a6e2a02c5d68cd83..dddd231337595f2404260692aa56fc6b894dcaa2 100644 (file)
--- a/hw/intc/ioapic.c
+++ b/hw/intc/ioapic.c
@@ -28,6 +28,7 @@
 #include "hw/i386/ioapic.h"
 #include "hw/i386/ioapic_internal.h"
 #include "hw/pci/msi.h"
+#include "hw/qdev-properties.h"
 #include "sysemu/kvm.h"
 #include "hw/i386/apic-msidef.h"
 #include "hw/i386/x86-iommu.h"

diff --git a/hw/intc/mips_gic.c b/hw/intc/mips_gic.c
index 6b4322bc5c13bf85c4cd8ca11141b45228bc5eed..524cc3ca45811ba98e2321792b2e85f86f71fc78 100644 (file)
--- a/hw/intc/mips_gic.c
+++ b/hw/intc/mips_gic.c
@@ -21,6 +21,7 @@
 #include "kvm_mips.h"
 #include "hw/intc/mips_gic.h"
 #include "hw/irq.h"
+#include "hw/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 f740578e7ea2efa6138abe74ac204bc51ee14305..854b709ca03a3538a34102257c9ce7a76f3fc0e4 100644 (file)
--- a/hw/intc/omap_intc.c
+++ b/hw/intc/omap_intc.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/irq.h"
+#include "hw/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 8a4a422142225176bf2018ca7faa22a84e629422..ca9614fda1a854034fbfe41266db61334db3ef27 100644 (file)
--- a/hw/intc/ompic.c
+++ b/hw/intc/ompic.c
@@ -11,6 +11,7 @@
 #include "qemu/module.h"
 #include "qapi/error.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "exec/memory.h"

diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c
index 312ac54c7cb2674ed78cf3328cf91dd706831689..c797ba78f370c06be812069f404545211ee98ded 100644 (file)
--- a/hw/intc/openpic.c
+++ b/hw/intc/openpic.c
@@ -40,6 +40,7 @@
 #include "hw/pci/pci.h"
 #include "hw/ppc/openpic.h"
 #include "hw/ppc/ppc_e500.h"
+#include "hw/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 e91910b331c4cfd0a25b12923ca24acaff897020..c09bebedd16846cdc83e7bd9fe41d7034285e4cc 100644 (file)
--- a/hw/intc/openpic_kvm.c
+++ b/hw/intc/openpic_kvm.c
@@ -30,6 +30,7 @@
 #include "hw/ppc/openpic.h"
 #include "hw/ppc/openpic_kvm.h"
 #include "hw/pci/msi.h"
+#include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "sysemu/kvm.h"
 #include "qemu/log.h"

diff --git a/hw/intc/pnv_xive.c b/hw/intc/pnv_xive.c
index 63b0f461ecb9c747161eb11582ffda99d70300a4..a8caf258fdf0b991019ffa8e1ea970467b4b0917 100644 (file)
--- a/hw/intc/pnv_xive.c
+++ b/hw/intc/pnv_xive.c
@@ -22,6 +22,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/ppc/ppc.h"
 
 #include <libfdt.h>

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

diff --git a/hw/intc/s390_flic.c b/hw/intc/s390_flic.c
index a1b28e755f5b68a76db135741ec82ddfcb379e82..a159c0c7cf56973d3c194ed5e75fe65e2c6d3d56 100644 (file)
--- a/hw/intc/s390_flic.c
+++ b/hw/intc/s390_flic.c
@@ -17,10 +17,10 @@
 #include "hw/sysbus.h"
 #include "hw/s390x/ioinst.h"
 #include "hw/s390x/s390_flic.h"
+#include "hw/qdev-properties.h"
 #include "hw/s390x/css.h"
 #include "trace.h"
 #include "cpu.h"
-#include "hw/qdev.h"
 #include "qapi/error.h"
 #include "hw/s390x/s390-virtio-ccw.h"
 

diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c
index 2fdd68035a8b4f6b9dc24f9081201f5e29ca411b..aad981cb782e7f4fabeff455b48322313eef0cc6 100644 (file)
--- a/hw/intc/spapr_xive.c
+++ b/hw/intc/spapr_xive.c
@@ -23,6 +23,7 @@
 #include "hw/ppc/spapr_xive.h"
 #include "hw/ppc/xive.h"
 #include "hw/ppc/xive_regs.h"
+#include "hw/qdev-properties.h"
 
 /*
  * XIVE Virtualization Controller BAR and Thread Managment BAR that we

diff --git a/hw/intc/xics.c b/hw/intc/xics.c
index 88709d4b908f7baac264c25cad05ba6e5222b899..b2fca2975cc4e1d4b0d36084d915e174bcd375bc 100644 (file)
--- a/hw/intc/xics.c
+++ b/hw/intc/xics.c
@@ -31,6 +31,7 @@
 #include "trace.h"
 #include "qemu/timer.h"
 #include "hw/ppc/xics.h"
+#include "hw/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 3a5c7f82f4057e2968cf39f62de3176fab6eae75..e15cb42b368dc7cc6f13a0301f44e845c8b2f24d 100644 (file)
--- a/hw/intc/xilinx_intc.c
+++ b/hw/intc/xilinx_intc.c
@@ -26,6 +26,7 @@
 #include "hw/sysbus.h"
 #include "qemu/module.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 
 #define D(x)
 

diff --git a/hw/intc/xlnx-pmu-iomod-intc.c b/hw/intc/xlnx-pmu-iomod-intc.c
index f2ba9b4ada23089ea93e86a91373640429c6b1ef..f9a1401a9497915fbd9fd9527a0010d571284614 100644 (file)
--- a/hw/intc/xlnx-pmu-iomod-intc.c
+++ b/hw/intc/xlnx-pmu-iomod-intc.c
@@ -33,6 +33,7 @@
 #include "qemu/module.h"
 #include "hw/intc/xlnx-pmu-iomod-intc.h"
 #include "hw/irq.h"
+#include "hw/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 9a520806d74088a88a12d865c6783a306a49d333..30e16696c0c9786cc819f28b379792fc682408ad 100644 (file)
--- a/hw/ipack/ipack.c
+++ b/hw/ipack/ipack.c
@@ -13,6 +13,7 @@
 #include "qemu/module.h"
 #include "hw/ipack/ipack.h"
 #include "hw/irq.h"
+#include "hw/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 2090c6f73a4dd530ff8010b011567a0445ab020f..ff05a889ecfaca534d1619c1fdb61d69fc81f5e2 100644 (file)
--- a/hw/ipmi/ipmi.c
+++ b/hw/ipmi/ipmi.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/ipmi/ipmi.h"
+#include "hw/qdev-properties.h"
 #include "sysemu/sysemu.h"
 #include "qom/object_interfaces.h"
 #include "qapi/error.h"

diff --git a/hw/ipmi/ipmi_bmc_extern.c b/hw/ipmi/ipmi_bmc_extern.c
index eb2eba891c987fe90b2444bba581c7800d1c0359..4405aa634eaf88adfb0bd277bad56d73559b864f 100644 (file)
--- a/hw/ipmi/ipmi_bmc_extern.c
+++ b/hw/ipmi/ipmi_bmc_extern.c
@@ -35,6 +35,7 @@
 #include "chardev/char-fe.h"
 #include "sysemu/sysemu.h"
 #include "hw/ipmi/ipmi.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 
 #define VM_MSG_CHAR        0xA0 /* Marks end of message */

diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c
index 91e1484103f857e0f39d30a238cffc1f96fa8261..246a6d390c17776ac8207ccfe629d67d382baed3 100644 (file)
--- a/hw/ipmi/ipmi_bmc_sim.c
+++ b/hw/ipmi/ipmi_bmc_sim.c
@@ -29,6 +29,7 @@
 #include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "hw/loader.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 
 #define IPMI_NETFN_CHASSIS            0x00

diff --git a/hw/ipmi/isa_ipmi_bt.c b/hw/ipmi/isa_ipmi_bt.c
index 33c800acb59ae452456ea2f593442a9d6f7cc034..a696096cbb02e285caffeb3071698eb4742833cc 100644 (file)
--- a/hw/ipmi/isa_ipmi_bt.c
+++ b/hw/ipmi/isa_ipmi_bt.c
@@ -29,6 +29,7 @@
 #include "hw/ipmi/ipmi.h"
 #include "hw/irq.h"
 #include "hw/isa/isa.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 
 /* Control register */

diff --git a/hw/ipmi/isa_ipmi_kcs.c b/hw/ipmi/isa_ipmi_kcs.c
index 9a1de662ba5ed314f438c88a2c52e2063fd8ae21..374b2a070993eb371199570e9a2b851812510c9a 100644 (file)
--- a/hw/ipmi/isa_ipmi_kcs.c
+++ b/hw/ipmi/isa_ipmi_kcs.c
@@ -29,6 +29,7 @@
 #include "hw/ipmi/ipmi.h"
 #include "hw/irq.h"
 #include "hw/isa/isa.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 
 #define IPMI_KCS_OBF_BIT        0

diff --git a/hw/isa/isa-superio.c b/hw/isa/isa-superio.c
index 4c73c2100f22b5062155d894e82ccfe4b1d50d4f..c4e391916c4265c5b877bf4ded73bccf75a80943 100644 (file)
--- a/hw/isa/isa-superio.c
+++ b/hw/isa/isa-superio.c
@@ -18,6 +18,7 @@
 #include "sysemu/blockdev.h"
 #include "chardev/char.h"
 #include "hw/isa/superio.h"
+#include "hw/qdev-properties.h"
 #include "hw/input/i8042.h"
 #include "hw/char/serial.h"
 #include "trace.h"

diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c
index a037c21104263270b242c1a136db0b924d830929..41452f36b8700f10fefd833ff91372a932c46979 100644 (file)
--- a/hw/isa/lpc_ich9.c
+++ b/hw/isa/lpc_ich9.c
@@ -45,6 +45,7 @@
 #include "hw/acpi/acpi.h"
 #include "hw/acpi/ich9.h"
 #include "hw/pci/pci_bus.h"
+#include "hw/qdev-properties.h"
 #include "exec/address-spaces.h"
 #include "sysemu/sysemu.h"
 #include "qom/cpu.h"

diff --git a/hw/isa/pc87312.c b/hw/isa/pc87312.c
index 60845f3ff0b717ca4ea0c85ee28dda23a6538581..b9bd57471e8aaceb8de69e8d51bbe36f3550e464 100644 (file)
--- a/hw/isa/pc87312.c
+++ b/hw/isa/pc87312.c
@@ -25,6 +25,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/isa/pc87312.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"

diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
index 7379d90cf4461ca610671d017edcab2f3ebeeb3f..1bc915405b2adfa69f1a4a5ef715a1310244d117 100644 (file)
--- a/hw/isa/vt82c686.c
+++ b/hw/isa/vt82c686.c
@@ -14,6 +14,7 @@
 #include "hw/isa/vt82c686.h"
 #include "hw/i2c/i2c.h"
 #include "hw/pci/pci.h"
+#include "hw/qdev-properties.h"
 #include "hw/isa/isa.h"
 #include "hw/isa/superio.h"
 #include "hw/sysbus.h"

diff --git a/hw/lm32/lm32.h b/hw/lm32/lm32.h
index d1514a61b349486d8e2d7425aef7ad96d169e214..98de07acf2cea4639331b901877c2ce709ce3ecd 100644 (file)
--- a/hw/lm32/lm32.h
+++ b/hw/lm32/lm32.h
@@ -2,6 +2,7 @@
 #define HW_LM32_H
 
 #include "hw/char/lm32_juart.h"
+#include "hw/qdev-properties.h"
 
 static inline DeviceState *lm32_pic_init(qemu_irq cpu_irq)
 {

diff --git a/hw/lm32/milkymist-hw.h b/hw/lm32/milkymist-hw.h
index 976cf9254d295941aaf0a85f0440dace424c9e1e..5f630243559bd3b4b9e4122def9464d3ec58ef09 100644 (file)
--- a/hw/lm32/milkymist-hw.h
+++ b/hw/lm32/milkymist-hw.h
@@ -1,7 +1,7 @@
 #ifndef QEMU_HW_MILKYMIST_HW_H
 #define QEMU_HW_MILKYMIST_HW_H
 
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 #include "net/net.h"
 
 static inline DeviceState *milkymist_uart_create(hwaddr base,

diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c
index 5ec3ae0300457f87f5f6c9ce11395c591d9fddf4..460d322de576ab02302e29e4be929aa805a5d5e2 100644 (file)
--- a/hw/lm32/milkymist.c
+++ b/hw/lm32/milkymist.c
@@ -30,6 +30,7 @@
 #include "sysemu/reset.h"
 #include "hw/boards.h"
 #include "hw/loader.h"
+#include "hw/qdev-properties.h"
 #include "elf.h"
 #include "milkymist-hw.h"
 #include "hw/display/milkymist_tmu2.h"

diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c
index 5f2c40803666e921d6fbf331474b60a759a4f581..53953fdc3aa89bcb56e273ef93daab5371b24b2c 100644 (file)
--- a/hw/mem/memory-device.c
+++ b/hw/mem/memory-device.c
@@ -11,7 +11,6 @@
 
 #include "qemu/osdep.h"
 #include "hw/mem/memory-device.h"
-#include "hw/qdev.h"
 #include "qapi/error.h"
 #include "hw/boards.h"
 #include "qemu/range.h"

diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c
index f438abb3870c50e4420813f5ddad4e74888c5af6..6fefd65092ac7ab0d9f442cb5e662051f068a1b8 100644 (file)
--- a/hw/mem/nvdimm.c
+++ b/hw/mem/nvdimm.c
@@ -28,6 +28,7 @@
 #include "qapi/error.h"
 #include "qapi/visitor.h"
 #include "hw/mem/nvdimm.h"
+#include "hw/qdev-properties.h"
 #include "hw/mem/memory-device.h"
 
 static void nvdimm_get_label_size(Object *obj, Visitor *v, const char *name,

diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
index ff43150e7d7097db5d4d8a2c84ea893383824242..1f3e676066b96dae6379eb6e67f7c951294fb98e 100644 (file)
--- a/hw/mem/pc-dimm.c
+++ b/hw/mem/pc-dimm.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/mem/pc-dimm.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/mem/nvdimm.h"
 #include "hw/mem/memory-device.h"

diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c
index 03f6c1cc7cca0180130f6d879f1d012bb18b6cc9..09486bc8bfcddb69757824704de9d100f19ce5f0 100644 (file)
--- a/hw/microblaze/petalogix_ml605_mmu.c
+++ b/hw/microblaze/petalogix_ml605_mmu.c
@@ -35,6 +35,7 @@
 #include "sysemu/sysemu.h"
 #include "hw/boards.h"
 #include "hw/char/serial.h"
+#include "hw/qdev-properties.h"
 #include "exec/address-spaces.h"
 #include "hw/ssi/ssi.h"
 

diff --git a/hw/microblaze/xlnx-zynqmp-pmu.c b/hw/microblaze/xlnx-zynqmp-pmu.c
index 67cedec4efbf262a64781b7958fa827b3f109d35..028f31894d9d9669f08ad74dc0d554dfd429df90 100644 (file)
--- a/hw/microblaze/xlnx-zynqmp-pmu.c
+++ b/hw/microblaze/xlnx-zynqmp-pmu.c
@@ -19,7 +19,6 @@
 #include "qapi/error.h"
 #include "exec/address-spaces.h"
 #include "hw/boards.h"
-#include "hw/qdev-properties.h"
 #include "cpu.h"
 #include "boot.h"
 

diff --git a/hw/mips/boston.c b/hw/mips/boston.c
index ce86b75664dd85c27a42e1dcc7dd57623bafc639..aa8016f98611e25ebd50e8fef9d20cd253a35d05 100644 (file)
--- a/hw/mips/boston.c
+++ b/hw/mips/boston.c
@@ -30,6 +30,7 @@
 #include "hw/mips/cps.h"
 #include "hw/mips/cpudevs.h"
 #include "hw/pci-host/xilinx-pcie.h"
+#include "hw/qdev-properties.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qemu/log.h"

diff --git a/hw/mips/cps.c b/hw/mips/cps.c
index aea6bcd7fea1ced29b8a84c2c82d1f4473cd8138..cd8b07ded2166cb4e6d2448ead1c6ddb837c72e7 100644 (file)
--- a/hw/mips/cps.c
+++ b/hw/mips/cps.c
@@ -22,6 +22,7 @@
 #include "qemu/module.h"
 #include "hw/mips/cps.h"
 #include "hw/mips/mips.h"
+#include "hw/qdev-properties.h"
 #include "hw/mips/cpudevs.h"
 #include "sysemu/kvm.h"
 #include "sysemu/reset.h"

diff --git a/hw/misc/a9scu.c b/hw/misc/a9scu.c
index 62bc60b2aed6d7ed1ab68f276f52ca77e789740b..45c91db30312380a62338071757a5b92fe7b4b3e 100644 (file)
--- a/hw/misc/a9scu.c
+++ b/hw/misc/a9scu.c
@@ -10,6 +10,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/misc/a9scu.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"
 

diff --git a/hw/misc/applesmc.c b/hw/misc/applesmc.c
index d9d369777c1618363ea8bc9e9405cd01ada7c2ac..24d57e86773a4c7601f7f7486a053dec5f96416d 100644 (file)
--- a/hw/misc/applesmc.c
+++ b/hw/misc/applesmc.c
@@ -32,6 +32,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/isa/isa.h"
+#include "hw/qdev-properties.h"
 #include "ui/console.h"
 #include "qemu/module.h"
 #include "qemu/timer.h"

diff --git a/hw/misc/arm11scu.c b/hw/misc/arm11scu.c
index 84275df8856332e540b967403349f18e121f82bc..3023284d6f824001d9499c203bced7aaed4ad140 100644 (file)
--- a/hw/misc/arm11scu.c
+++ b/hw/misc/arm11scu.c
@@ -10,6 +10,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/misc/arm11scu.h"
+#include "hw/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 454a942ce06899b8ca54358bb65cf709d104f414..af2c7af4a05e1883d5a7048afb42919dd0cd4682 100644 (file)
--- a/hw/misc/arm_l2x0.c
+++ b/hw/misc/arm_l2x0.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "hw/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 2a4e0458c742c082cf2e94c91b800fc440bb9df9..e0b299c235b7d28d7dda929eeeac74896b24ff53 100644 (file)
--- a/hw/misc/arm_sysctl.c
+++ b/hw/misc/arm_sysctl.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "qemu/timer.h"
 #include "qemu/bitops.h"
 #include "hw/sysbus.h"

diff --git a/hw/misc/armsse-cpuid.c b/hw/misc/armsse-cpuid.c
index 05c08f3db54f014d2a09651568cca87001a2350b..5f225096f603cda3aa852ebf2d1907a22405e012 100644 (file)
--- a/hw/misc/armsse-cpuid.c
+++ b/hw/misc/armsse-cpuid.c
@@ -27,6 +27,7 @@
 #include "hw/sysbus.h"
 #include "hw/registerfields.h"
 #include "hw/misc/armsse-cpuid.h"
+#include "hw/qdev-properties.h"
 
 REG32(CPUID, 0x0)
 REG32(PID4, 0xfd0)

diff --git a/hw/misc/bcm2835_property.c b/hw/misc/bcm2835_property.c
index 0d078f15f9cfa8e1e06c931ab5390a61cdcd379b..d86d510572a147523bf51076e4757becdeb8711c 100644 (file)
--- a/hw/misc/bcm2835_property.c
+++ b/hw/misc/bcm2835_property.c
@@ -6,6 +6,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/misc/bcm2835_property.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/irq.h"
 #include "hw/misc/bcm2835_mbox_defs.h"

diff --git a/hw/misc/debugexit.c b/hw/misc/debugexit.c
index 752cb53cf66e778ccb3e690f03a5f63ecf8b665d..ccf02bdbd481105ea6698fda9a1180149d4a929f 100644 (file)
--- a/hw/misc/debugexit.c
+++ b/hw/misc/debugexit.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/isa/isa.h"
+#include "hw/qdev-properties.h"
 #include "qemu/module.h"
 
 #define TYPE_ISA_DEBUG_EXIT_DEVICE "isa-debug-exit"

diff --git a/hw/misc/eccmemctl.c b/hw/misc/eccmemctl.c
index 3300a46bb3128f3d9d8f6294083e5f8a26482fe4..4b1f2b675acb8a7482fadcc8c1ac71663d9a6b7b 100644 (file)
--- a/hw/misc/eccmemctl.c
+++ b/hw/misc/eccmemctl.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"

diff --git a/hw/misc/iotkit-sysctl.c b/hw/misc/iotkit-sysctl.c
index 31fe9a5997abeb2faa857e4f958841205c7fb76f..dba91f94a7cfd1de69b379b19c17b92d2e08e3c0 100644 (file)
--- a/hw/misc/iotkit-sysctl.c
+++ b/hw/misc/iotkit-sysctl.c
@@ -27,6 +27,7 @@
 #include "migration/vmstate.h"
 #include "hw/registerfields.h"
 #include "hw/misc/iotkit-sysctl.h"
+#include "hw/qdev-properties.h"
 #include "target/arm/arm-powerctl.h"
 #include "target/arm/cpu.h"
 

diff --git a/hw/misc/iotkit-sysinfo.c b/hw/misc/iotkit-sysinfo.c
index 3e1cf0ec3455b253a6bb0a512d7a763e1b5dfa6b..0106fa48d35af3cfa8069202deebef0febadbf4b 100644 (file)
--- a/hw/misc/iotkit-sysinfo.c
+++ b/hw/misc/iotkit-sysinfo.c
@@ -26,6 +26,7 @@
 #include "hw/sysbus.h"
 #include "hw/registerfields.h"
 #include "hw/misc/iotkit-sysinfo.h"
+#include "hw/qdev-properties.h"
 
 REG32(SYS_VERSION, 0x0)
 REG32(SYS_CONFIG, 0x4)

diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
index 7a2334c98b6c605bbd9dc0cd244c48a590435c86..5e3b05eae0de44fe02e0cd293bbea04d96afb58e 100644 (file)
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -22,6 +22,7 @@
 #include "qapi/error.h"
 #include "qemu/cutils.h"
 #include "hw/pci/pci.h"
+#include "hw/qdev-properties.h"
 #include "hw/pci/msi.h"
 #include "hw/pci/msix.h"
 #include "sysemu/kvm.h"

diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c
index 5e8ee80c255905a09a6d07978b49495e5abe66d8..9011f930868694ef0275c03b21fcd3a580f4003b 100644 (file)
--- a/hw/misc/macio/cuda.c
+++ b/hw/misc/macio/cuda.c
@@ -26,6 +26,7 @@
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "hw/ppc/mac.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/input/adb.h"
 #include "hw/misc/mos6522.h"

diff --git a/hw/misc/macio/gpio.c b/hw/misc/macio/gpio.c
index e62b62211246d68cba08fcb40cb3f622ac1907e0..6cca6b27d6a9ce4b4cb2fa4077954f533c71bb60 100644 (file)
--- a/hw/misc/macio/gpio.c
+++ b/hw/misc/macio/gpio.c
@@ -25,6 +25,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/ppc/mac.h"
+#include "hw/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 222f163139ff37f984937d523b11d54caeb2dfdf..b59df4e3b8c9fc8cb2c403541fa5297731901200 100644 (file)
--- a/hw/misc/macio/macio.c
+++ b/hw/misc/macio/macio.c
@@ -30,6 +30,7 @@
 #include "hw/misc/macio/cuda.h"
 #include "hw/pci/pci.h"
 #include "hw/ppc/mac_dbdma.h"
+#include "hw/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 d824a068d9b1c762ec3267c180456b3004e50494..a2893400362b33ab4fd61f08f00e755b06265e0d 100644 (file)
--- a/hw/misc/macio/pmu.c
+++ b/hw/misc/macio/pmu.c
@@ -31,6 +31,7 @@
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "hw/ppc/mac.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/input/adb.h"
 #include "hw/irq.h"

diff --git a/hw/misc/mips_cmgcr.c b/hw/misc/mips_cmgcr.c
index 6bddb2312ac0fff13aa80975fac3f4a9a064a9af..0feab092f158fa6445bf54d54c73bc2042224bc3 100644 (file)
--- a/hw/misc/mips_cmgcr.c
+++ b/hw/misc/mips_cmgcr.c
@@ -17,6 +17,7 @@
 #include "sysemu/sysemu.h"
 #include "hw/misc/mips_cmgcr.h"
 #include "hw/misc/mips_cpc.h"
+#include "hw/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 caa618f5824a91df1ac840ba809bc9cb0e45feb6..19ea016b87418740cda558d5d2bb16c5e33e0a3b 100644 (file)
--- a/hw/misc/mips_cpc.c
+++ b/hw/misc/mips_cpc.c
@@ -26,6 +26,7 @@
 #include "migration/vmstate.h"
 
 #include "hw/misc/mips_cpc.h"
+#include "hw/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 e8ba4a3cd086439a2f720ee2165ad2821b43bc60..ea0cf9726b417d1412b8f015383025904c6efef5 100644 (file)
--- a/hw/misc/mips_itu.c
+++ b/hw/misc/mips_itu.c
@@ -25,6 +25,7 @@
 #include "cpu.h"
 #include "exec/exec-all.h"
 #include "hw/misc/mips_itu.h"
+#include "hw/qdev-properties.h"
 
 #define ITC_TAG_ADDRSPACE_SZ (ITC_ADDRESSMAP_NUM * 8)
 /* Initialize as 4kB area to fit all 32 cells with default 128B grain.

diff --git a/hw/misc/mos6522.c b/hw/misc/mos6522.c
index f06cf0b52a5df46b489e7504fb8d314fdff979ef..4d99350e227cad47b514249319f04632915f138b 100644 (file)
--- a/hw/misc/mos6522.c
+++ b/hw/misc/mos6522.c
@@ -28,6 +28,7 @@
 #include "hw/input/adb.h"
 #include "hw/irq.h"
 #include "hw/misc/mos6522.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/misc/mps2-fpgaio.c b/hw/misc/mps2-fpgaio.c
index 4824dc09b28b5538e8b409ba3d5f11f63748a319..5e8b10391412373a35723c6a01110de0bde0ae85 100644 (file)
--- a/hw/misc/mps2-fpgaio.c
+++ b/hw/misc/mps2-fpgaio.c
@@ -24,6 +24,7 @@
 #include "migration/vmstate.h"
 #include "hw/registerfields.h"
 #include "hw/misc/mps2-fpgaio.h"
+#include "hw/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 042ce130ba2183292bf14e076737acb6b82170a7..25779a1dca33a8fbebc59c8a88ae75209edb3c65 100644 (file)
--- a/hw/misc/mps2-scc.c
+++ b/hw/misc/mps2-scc.c
@@ -25,6 +25,7 @@
 #include "migration/vmstate.h"
 #include "hw/registerfields.h"
 #include "hw/misc/mps2-scc.h"
+#include "hw/qdev-properties.h"
 
 REG32(CFG0, 0)
 REG32(CFG1, 4)

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

diff --git a/hw/misc/nrf51_rng.c b/hw/misc/nrf51_rng.c
index 8528c8880cce70041604f3cb27e03eaea6940eef..5140981c96bb5317c49227500abef0426d5615bf 100644 (file)
--- a/hw/misc/nrf51_rng.c
+++ b/hw/misc/nrf51_rng.c
@@ -16,6 +16,7 @@
 #include "hw/arm/nrf51.h"
 #include "hw/irq.h"
 #include "hw/misc/nrf51_rng.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qemu/guest-random.h"
 

diff --git a/hw/misc/pc-testdev.c b/hw/misc/pc-testdev.c
index 94cf55440e55e0821e4e1784d3f4563565a814ff..0fb84ddc6bc3c709d126dae6ac041570fda045f4 100644 (file)
--- a/hw/misc/pc-testdev.c
+++ b/hw/misc/pc-testdev.c
@@ -36,7 +36,6 @@
 */
 
 #include "qemu/osdep.h"
-#include "hw/qdev.h"
 #include "qemu/module.h"
 #include "hw/irq.h"
 #include "hw/isa/isa.h"

diff --git a/hw/misc/pci-testdev.c b/hw/misc/pci-testdev.c
index 0eb9ed5469591399621478bae27d3cf684baa774..74d8571a7394fcfc84516ceb543381e823a7c2db 100644 (file)
--- a/hw/misc/pci-testdev.c
+++ b/hw/misc/pci-testdev.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/pci/pci.h"
+#include "hw/qdev-properties.h"
 #include "qemu/event_notifier.h"
 #include "qemu/module.h"
 #include "sysemu/kvm.h"

diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c
index 1da24c621eb2bed847b22ae9a99d0562725afd62..653393ef02411fa9094a808ff998757e02c98924 100644 (file)
--- a/hw/misc/pvpanic.c
+++ b/hw/misc/pvpanic.c
@@ -18,6 +18,7 @@
 #include "qemu/module.h"
 
 #include "hw/nvram/fw_cfg.h"
+#include "hw/qdev-properties.h"
 #include "hw/misc/pvpanic.h"
 
 /* The bit of supported pv event */

diff --git a/hw/misc/tz-mpc.c b/hw/misc/tz-mpc.c
index deb7796ec2cc84cfb07eaa71be56f3cb4a6b4fee..49dd6050bd357e401beb2406d73efe3510fb8b60 100644 (file)
--- a/hw/misc/tz-mpc.c
+++ b/hw/misc/tz-mpc.c
@@ -19,6 +19,7 @@
 #include "hw/registerfields.h"
 #include "hw/irq.h"
 #include "hw/misc/tz-mpc.h"
+#include "hw/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 5b664d760f56d5b198eef3a84f22ac23e783218a..7d522ac0ecf0053a60034b84c0d4e873f20bdac4 100644 (file)
--- a/hw/misc/tz-msc.c
+++ b/hw/misc/tz-msc.c
@@ -19,6 +19,7 @@
 #include "hw/registerfields.h"
 #include "hw/irq.h"
 #include "hw/misc/tz-msc.h"
+#include "hw/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 ccc4468c118a535b0e5f6e03bc1bc10220870b02..181a5f1e8126732e8682b7702eaa1fcb674aefc2 100644 (file)
--- a/hw/misc/tz-ppc.c
+++ b/hw/misc/tz-ppc.c
@@ -19,6 +19,7 @@
 #include "hw/registerfields.h"
 #include "hw/irq.h"
 #include "hw/misc/tz-ppc.h"
+#include "hw/qdev-properties.h"
 
 static void tz_ppc_update_irq(TZPPC *s)
 {

diff --git a/hw/net/allwinner_emac.c b/hw/net/allwinner_emac.c
index f4b8c4fa672d2c2b80051afd93d07f4072b15604..e055a661c420ef2ca4283b5aa4dbe69ffe383ba4 100644 (file)
--- a/hw/net/allwinner_emac.c
+++ b/hw/net/allwinner_emac.c
@@ -24,6 +24,7 @@
 #include "qemu/fifo8.h"
 #include "hw/irq.h"
 #include "hw/net/allwinner_emac.h"
+#include "hw/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 ab6f7e82625b4326e3982531b57165ce647e3538..7f9cb5ab955f9dfcc6daff5e05bf00756b5a303c 100644 (file)
--- a/hw/net/cadence_gem.c
+++ b/hw/net/cadence_gem.c
@@ -27,6 +27,7 @@
 
 #include "hw/irq.h"
 #include "hw/net/cadence_gem.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"
 #include "qemu/log.h"

diff --git a/hw/net/can/can_kvaser_pci.c b/hw/net/can/can_kvaser_pci.c
index 401da73cc8bd3216ec79a1bd92e22e879398b4bc..16861b8f9f853e4b576d66481b9b705285a5183a 100644 (file)
--- a/hw/net/can/can_kvaser_pci.c
+++ b/hw/net/can/can_kvaser_pci.c
@@ -38,6 +38,7 @@
 #include "chardev/char.h"
 #include "hw/irq.h"
 #include "hw/pci/pci.h"
+#include "hw/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 0f0ca912c9d33eb4f7972679053c06a7322c5a75..965e252d9de7b8bdf5d88c813c9a84b79da5547b 100644 (file)
--- a/hw/net/can/can_mioe3680_pci.c
+++ b/hw/net/can/can_mioe3680_pci.c
@@ -34,6 +34,7 @@
 #include "chardev/char.h"
 #include "hw/irq.h"
 #include "hw/pci/pci.h"
+#include "hw/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 632eb0b59bc27666be9cc6204ed71b43fee68bd2..51b6540072ae8a184a5874f0198818f8a0d84aee 100644 (file)
--- a/hw/net/can/can_pcm3680_pci.c
+++ b/hw/net/can/can_pcm3680_pci.c
@@ -34,6 +34,7 @@
 #include "chardev/char.h"
 #include "hw/irq.h"
 #include "hw/pci/pci.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "net/can_emu.h"
 

diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c
index 8d0cafc6ba6ee19c0161b7c6446028b08ff30df4..a5678e11faf9e20e972df205b2bff0e7c2ac89d4 100644 (file)
--- a/hw/net/dp8393x.c
+++ b/hw/net/dp8393x.c
@@ -19,6 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "net/net.h"

diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index da5f3646fd0edde422d8a89f3fc9b1b7af91c498..8ae4e08f1e90c89cc77cf168772686e3524ae9ea 100644 (file)
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -27,6 +27,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/pci/pci.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "net/net.h"
 #include "net/checksum.h"

diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c
index 270ff938415bd8dac5a20d0a0cd2a523e907dc7a..b69fd7d8ad6c66d421d12f2f6fb150b838210aa0 100644 (file)
--- a/hw/net/e1000e.c
+++ b/hw/net/e1000e.c
@@ -43,6 +43,7 @@
 #include "hw/hw.h"
 #include "hw/pci/msi.h"
 #include "hw/pci/msix.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 
 #include "e1000_regs.h"

diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c
index 2ad1b328e4bd51f0b37c53023dbc82fca764286e..cc2dd8b1c997e864d2ec6bf74051a2f76f2728e0 100644 (file)
--- a/hw/net/eepro100.c
+++ b/hw/net/eepro100.c
@@ -43,6 +43,7 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "hw/pci/pci.h"
+#include "hw/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 e5c902ada47958b55854d34de8cd60c64ff0d7e3..e1556236b000050a6bf300fa6f221c9ce7c615d4 100644 (file)
--- a/hw/net/fsl_etsec/etsec.c
+++ b/hw/net/fsl_etsec/etsec.c
@@ -31,6 +31,7 @@
 #include "hw/sysbus.h"
 #include "hw/irq.h"
 #include "hw/ptimer.h"
+#include "hw/qdev-properties.h"
 #include "etsec.h"
 #include "registers.h"
 #include "qemu/log.h"

diff --git a/hw/net/fsl_etsec/etsec.h b/hw/net/fsl_etsec/etsec.h
index 877988572ecb9a2c78781a1eb722d2ea978a1079..09d05c21338c09d6a0fb852716a269a2eb3a9f7f 100644 (file)
--- a/hw/net/fsl_etsec/etsec.h
+++ b/hw/net/fsl_etsec/etsec.h
@@ -25,7 +25,6 @@
 #ifndef ETSEC_H
 #define ETSEC_H
 
-#include "hw/qdev.h"
 #include "hw/sysbus.h"
 #include "net/net.h"
 #include "hw/ptimer.h"

diff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c
index 4d0f56c1236f29da53421a604dff56d287850dc6..04c78e85170b426ab81ea8d0eeb182dfc5533fab 100644 (file)
--- a/hw/net/ftgmac100.c
+++ b/hw/net/ftgmac100.c
@@ -20,6 +20,7 @@
 #include "net/checksum.h"
 #include "net/eth.h"
 #include "hw/net/mii.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 
 /* For crc32 */

diff --git a/hw/net/imx_fec.c b/hw/net/imx_fec.c
index 5a22542aafe36c485c5da0bcc57ba91ad31cdd8e..7ac4ed7c125d69af4335bb2ab608a01b5347bef7 100644 (file)
--- a/hw/net/imx_fec.c
+++ b/hw/net/imx_fec.c
@@ -24,6 +24,7 @@
 #include "qemu/osdep.h"
 #include "hw/irq.h"
 #include "hw/net/imx_fec.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "sysemu/dma.h"
 #include "qemu/log.h"

diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c
index ea20a92cda3228a362a8c66fba0bb18e599d831b..e7662f0575aac2d4e7a856687d673787d56eccc5 100644 (file)
--- a/hw/net/lan9118.c
+++ b/hw/net/lan9118.c
@@ -20,6 +20,7 @@
 #include "hw/net/lan9118.h"
 #include "sysemu/sysemu.h"
 #include "hw/ptimer.h"
+#include "hw/qdev-properties.h"
 #include "qemu/log.h"
 #include "qemu/main-loop.h"
 #include "qemu/module.h"

diff --git a/hw/net/lance.c b/hw/net/lance.c
index 0d094327cbbdc6fbfe37dd509593fc8da39da6b4..6631e2a4e0c171060c579b63977b60373b4620ba 100644 (file)
--- a/hw/net/lance.c
+++ b/hw/net/lance.c
@@ -41,6 +41,7 @@
 #include "hw/sparc/sparc32_dma.h"
 #include "migration/vmstate.h"
 #include "hw/net/lance.h"
+#include "hw/qdev-properties.h"
 #include "trace.h"
 #include "sysemu/sysemu.h"
 

diff --git a/hw/net/mcf_fec.c b/hw/net/mcf_fec.c
index e4a3b55eb66040116005c95a8be66b175174a4ac..8fcf354a4b1509def09a63637e216b8a0f7f92f0 100644 (file)
--- a/hw/net/mcf_fec.c
+++ b/hw/net/mcf_fec.c
@@ -14,6 +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/sysbus.h"
 /* For crc32 */
 #include <zlib.h>

diff --git a/hw/net/milkymist-minimac2.c b/hw/net/milkymist-minimac2.c
index 1e3fb9c220b00f8d825620afbaa875dfb4949fb4..86b6d28033476e3d204d2edc73bb4f596b218089 100644 (file)
--- a/hw/net/milkymist-minimac2.c
+++ b/hw/net/milkymist-minimac2.c
@@ -26,6 +26,7 @@
 #include "qapi/error.h"
 #include "cpu.h" /* FIXME: why does this use TARGET_PAGE_ALIGN? */
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "trace.h"

diff --git a/hw/net/mipsnet.c b/hw/net/mipsnet.c
index 013f762d72da91f8e758523f1c3ee69a88662d18..f7ae1ced4d59816310cec5c870250dc2a6b7badd 100644 (file)
--- a/hw/net/mipsnet.c
+++ b/hw/net/mipsnet.c
@@ -1,5 +1,6 @@
 #include "qemu/osdep.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "net/net.h"
 #include "qemu/module.h"
 #include "trace.h"

diff --git a/hw/net/ne2000-isa.c b/hw/net/ne2000-isa.c
index 5195c107d076f6340cc13713442df68c1f9d9c84..6fcf3d5cd9c510072e37444589835a123c146888 100644 (file)
--- a/hw/net/ne2000-isa.c
+++ b/hw/net/ne2000-isa.c
@@ -25,7 +25,6 @@
 #include "qemu/osdep.h"
 #include "hw/isa/isa.h"
 #include "hw/net/ne2000-isa.h"
-#include "hw/qdev.h"
 #include "migration/vmstate.h"
 #include "ne2000.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/net/ne2000-pci.c b/hw/net/ne2000-pci.c
index 084d92f955542b87e2c72f606cafa113664d57d3..9a20d427e3bd01aa5c10482f34dd8a8a9ade8f61 100644 (file)
--- a/hw/net/ne2000-pci.c
+++ b/hw/net/ne2000-pci.c
@@ -25,6 +25,7 @@
 #include "qemu/osdep.h"
 #include "hw/irq.h"
 #include "hw/pci/pci.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "ne2000.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/net/opencores_eth.c b/hw/net/opencores_eth.c
index a9e96cdd3a014dfb766888c38c1bd3986a432d8e..aa13159464db321370de7017d1d1a1e43269d740 100644 (file)
--- a/hw/net/opencores_eth.c
+++ b/hw/net/opencores_eth.c
@@ -34,6 +34,7 @@
 #include "qemu/osdep.h"
 #include "hw/irq.h"
 #include "hw/net/mii.h"
+#include "hw/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 a77d2c936895d17e0d0ff16e01899f36f162871c..4723c30c7929ee5d97e1241d22c99568fda425a1 100644 (file)
--- a/hw/net/pcnet-pci.c
+++ b/hw/net/pcnet-pci.c
@@ -30,6 +30,7 @@
 #include "qemu/osdep.h"
 #include "hw/irq.h"
 #include "hw/pci/pci.h"
+#include "hw/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 bfcfcf5be38095d0668f0f98bb5dbf86bcd243b5..107ac680b2530e92300b5cde970e20e8bda0318d 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/irq.h"
-#include "hw/qdev.h"
+#include "hw/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 789e5c48767e88ac1f556142eb6302ac5cec7b4f..50f9e33e2fb4b4aa2f3256faa41ef8724bcbf235 100644 (file)
--- a/hw/net/rocker/rocker.c
+++ b/hw/net/rocker/rocker.c
@@ -17,6 +17,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/pci/pci.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/pci/msix.h"
 #include "net/net.h"

diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c
index 89156ed802c039cfd026b763161b5187a7b2933e..88a97d756d6b6cb4bd22a8c1b616ae03d541b38c 100644 (file)
--- a/hw/net/rtl8139.c
+++ b/hw/net/rtl8139.c
@@ -54,6 +54,7 @@
 #include <zlib.h>
 
 #include "hw/pci/pci.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "sysemu/dma.h"
 #include "qemu/module.h"

diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c
index 67e3f2408e650c991108f47dd277bdbf68b87d87..e574635969bc2a532de1324c936fc20456edea51 100644 (file)
--- a/hw/net/smc91c111.c
+++ b/hw/net/smc91c111.c
@@ -13,6 +13,7 @@
 #include "net/net.h"
 #include "hw/irq.h"
 #include "hw/net/smc91c111.h"
+#include "hw/qdev-properties.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
 /* For crc32 */

diff --git a/hw/net/spapr_llan.c b/hw/net/spapr_llan.c
index 60085b1bf4776634f6c4d15fe6ef712abff9dd04..701e6e151453fd7949ddb09d742e8ffbe9c5d540 100644 (file)
--- a/hw/net/spapr_llan.c
+++ b/hw/net/spapr_llan.c
@@ -31,10 +31,10 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "net/net.h"
-#include "hw/qdev.h"
 #include "migration/vmstate.h"
 #include "hw/ppc/spapr.h"
 #include "hw/ppc/spapr_vio.h"
+#include "hw/qdev-properties.h"
 #include "sysemu/sysemu.h"
 #include "trace.h"
 

diff --git a/hw/net/stellaris_enet.c b/hw/net/stellaris_enet.c
index 154214ca1d3b6083bfc70abb51c2e85a6dbb12f1..3aca2a09f38397399465c9269343931b6941d4b0 100644 (file)
--- a/hw/net/stellaris_enet.c
+++ b/hw/net/stellaris_enet.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/irq.h"
+#include "hw/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 f5e30725be0c9387f18c26512eaca570e1db88b8..f31d41ac5b87ae9e1b5a45d6e084a8960cfee11f 100644 (file)
--- a/hw/net/sungem.c
+++ b/hw/net/sungem.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/pci/pci.h"
+#include "hw/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 359bd4f9f52ac6ed0da448f3b44aa29227531ac4..2243b7cf7b8f1b6916e754b96ab2f3023984dfcd 100644 (file)
--- a/hw/net/sunhme.c
+++ b/hw/net/sunhme.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/pci/pci.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/net/mii.h"
 #include "net/net.h"

diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index cdf4d774da19c16c90227ddd67aee42deecf7c04..4113729fcfaa73621c8c155f71398edc434c9746 100644 (file)
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -27,6 +27,7 @@
 #include "hw/virtio/virtio-bus.h"
 #include "qapi/error.h"
 #include "qapi/qapi-events-net.h"
+#include "hw/qdev-properties.h"
 #include "hw/virtio/virtio-access.h"
 #include "migration/misc.h"
 #include "standard-headers/linux/ethtool.h"

diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
index 88a7c13a96513279575a96c233d8a4d847cf9163..17b420b2a887b115e12e38414a671fccf36eb903 100644 (file)
--- a/hw/net/vmxnet3.c
+++ b/hw/net/vmxnet3.c
@@ -18,6 +18,7 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
+#include "hw/qdev-properties.h"
 #include "net/tap.h"
 #include "net/checksum.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/net/xgmac.c b/hw/net/xgmac.c
index ded8b9cf9dbaccdd4624f6d90a4eab508014927f..2ea8d2ec721632ecd13026eedf0337f1045cac71 100644 (file)
--- a/hw/net/xgmac.c
+++ b/hw/net/xgmac.c
@@ -26,6 +26,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"

diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c
index b22e344a4bddc33cce53908bd7273ffbe0b693f3..d8716a1f73792b200c7312692969181446cb12ba 100644 (file)
--- a/hw/net/xilinx_axienet.c
+++ b/hw/net/xilinx_axienet.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "qapi/error.h"
 #include "qemu/log.h"
@@ -32,6 +33,7 @@
 
 #include "hw/hw.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "hw/stream.h"
 
 #define DPHY(x)

diff --git a/hw/net/xilinx_ethlite.c b/hw/net/xilinx_ethlite.c
index a963087f16cce5dc2bc5e5c5a706755010500dda..384e72b157a290d50048bd3906ac1e8ec1c8eb22 100644 (file)
--- a/hw/net/xilinx_ethlite.c
+++ b/hw/net/xilinx_ethlite.c
@@ -27,6 +27,7 @@
 #include "cpu.h" /* FIXME should not use tswap* */
 #include "hw/sysbus.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "net/net.h"
 
 #define D(x)

diff --git a/hw/nios2/10m50_devboard.c b/hw/nios2/10m50_devboard.c
index 3c01e4f667299409dfa558b0128f5d88dac33a90..ad8b2fc670972fd4e14d3dd1ba4c3b4f6c58ea66 100644 (file)
--- a/hw/nios2/10m50_devboard.c
+++ b/hw/nios2/10m50_devboard.c
@@ -28,6 +28,7 @@
 
 #include "hw/sysbus.h"
 #include "hw/char/serial.h"
+#include "hw/qdev-properties.h"
 #include "sysemu/sysemu.h"
 #include "hw/boards.h"
 #include "exec/memory.h"

diff --git a/hw/nvram/ds1225y.c b/hw/nvram/ds1225y.c
index 9cddb379251de012379e8d696701dd5018868415..934e09bf7504b7c160620b0d344f89ba2b6b2f44 100644 (file)
--- a/hw/nvram/ds1225y.c
+++ b/hw/nvram/ds1225y.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "hw/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 00f942db516a62ddfcbc777d6329b554714b475a..341636752356935805a3fec97394efefd77ba64b 100644 (file)
--- a/hw/nvram/eeprom_at24c.c
+++ b/hw/nvram/eeprom_at24c.c
@@ -12,6 +12,7 @@
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "hw/i2c/i2c.h"
+#include "hw/qdev-properties.h"
 #include "sysemu/block-backend.h"
 
 /* #define DEBUG_AT24C */

diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index f192c3ea16377c5b8252154452c69be6b50b1af5..7dc3ac378ee0cc5422412155400ec2a0e648953b 100644 (file)
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -29,6 +29,7 @@
 #include "sysemu/reset.h"
 #include "hw/boards.h"
 #include "hw/nvram/fw_cfg.h"
+#include "hw/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 853b6931093e10c3075c935d47b133a4443507e5..9a47e35b8ea55bd7f07ac69792d6a27619c88e56 100644 (file)
--- a/hw/nvram/mac_nvram.c
+++ b/hw/nvram/mac_nvram.c
@@ -26,6 +26,7 @@
 #include "qemu/osdep.h"
 #include "hw/nvram/chrp_nvram.h"
 #include "hw/ppc/mac.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qemu/cutils.h"
 #include "qemu/module.h"

diff --git a/hw/nvram/nrf51_nvm.c b/hw/nvram/nrf51_nvm.c
index e13ff4b2feff4d227502664fa2be80d82d441266..4d678f994e7d7579d6328aeb5d9a63969eb76ab6 100644 (file)
--- a/hw/nvram/nrf51_nvm.c
+++ b/hw/nvram/nrf51_nvm.c
@@ -24,6 +24,7 @@
 #include "exec/address-spaces.h"
 #include "hw/arm/nrf51.h"
 #include "hw/nvram/nrf51_nvm.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 
 /*

diff --git a/hw/nvram/spapr_nvram.c b/hw/nvram/spapr_nvram.c
index ef22962767b3b5b909b7432ac4bd12fb87f18a6a..c7bcd29e156eab64c760b540cc85bd236b4fc1d2 100644 (file)
--- a/hw/nvram/spapr_nvram.c
+++ b/hw/nvram/spapr_nvram.c
@@ -36,6 +36,7 @@
 #include "hw/nvram/chrp_nvram.h"
 #include "hw/ppc/spapr.h"
 #include "hw/ppc/spapr_vio.h"
+#include "hw/qdev-properties.h"
 
 typedef struct SpaprNvram {
     SpaprVioDevice sdev;

diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c
index 13572b8efff70662667ecbb1fd1a295c5186235f..79e70493fc77e50556a4a92a4231e1e021d6611f 100644 (file)
--- a/hw/openrisc/openrisc_sim.c
+++ b/hw/openrisc/openrisc_sim.c
@@ -28,6 +28,7 @@
 #include "hw/char/serial.h"
 #include "net/net.h"
 #include "hw/loader.h"
+#include "hw/qdev-properties.h"
 #include "exec/address-spaces.h"
 #include "sysemu/sysemu.h"
 #include "hw/sysbus.h"

diff --git a/hw/pci-bridge/gen_pcie_root_port.c b/hw/pci-bridge/gen_pcie_root_port.c
index fb78cf1905cb0ccdff4a1f4188ba339f07eaba5d..9eaefebca83aeacf7fe0d1d264f973523c8bc94a 100644 (file)
--- a/hw/pci-bridge/gen_pcie_root_port.c
+++ b/hw/pci-bridge/gen_pcie_root_port.c
@@ -15,6 +15,7 @@
 #include "qemu/module.h"
 #include "hw/pci/msix.h"
 #include "hw/pci/pcie_port.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 
 #define TYPE_GEN_PCIE_ROOT_PORT                "pcie-root-port"

diff --git a/hw/pci-bridge/pci_bridge_dev.c b/hw/pci-bridge/pci_bridge_dev.c
index 5fe96d02b3e012082d51b92a12827d42d4ea61fe..cc80cb48989d94761454f0de7b879c1dfd1934ac 100644 (file)
--- a/hw/pci-bridge/pci_bridge_dev.c
+++ b/hw/pci-bridge/pci_bridge_dev.c
@@ -27,6 +27,7 @@
 #include "hw/pci/msi.h"
 #include "hw/pci/shpc.h"
 #include "hw/pci/slotid_cap.h"
+#include "hw/qdev-properties.h"
 #include "exec/memory.h"
 #include "hw/pci/pci_bus.h"
 #include "hw/hotplug.h"

diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expander_bridge.c
index aecf3d7ddf49ffca9e47d46270bd8271a497186e..06a7c018d760e24125d61d30665e5d94cbd36819 100644 (file)
--- a/hw/pci-bridge/pci_expander_bridge.c
+++ b/hw/pci-bridge/pci_expander_bridge.c
@@ -15,6 +15,7 @@
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_bus.h"
 #include "hw/pci/pci_host.h"
+#include "hw/qdev-properties.h"
 #include "hw/pci/pci_bridge.h"
 #include "qemu/range.h"
 #include "qemu/error-report.h"

diff --git a/hw/pci-bridge/pcie_pci_bridge.c b/hw/pci-bridge/pcie_pci_bridge.c
index d0bfa0189a625c8ef7f2d347cf7da55b580ec554..7679bef6c104f8518bcae3d71b6a2e9b8e66e99f 100644 (file)
--- a/hw/pci-bridge/pcie_pci_bridge.c
+++ b/hw/pci-bridge/pcie_pci_bridge.c
@@ -16,6 +16,7 @@
 #include "hw/pci/msi.h"
 #include "hw/pci/shpc.h"
 #include "hw/pci/slotid_cap.h"
+#include "hw/qdev-properties.h"
 
 typedef struct PCIEPCIBridge {
     /*< private >*/

diff --git a/hw/pci-bridge/pcie_root_port.c b/hw/pci-bridge/pcie_root_port.c
index 1d8a778709a28dd2cd71503f50f4e52a9a1db333..012c2cb12c102b6b2582defc1e23ffc6f8bf467c 100644 (file)
--- a/hw/pci-bridge/pcie_root_port.c
+++ b/hw/pci-bridge/pcie_root_port.c
@@ -16,6 +16,7 @@
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "hw/pci/pcie_port.h"
+#include "hw/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 1d62e312729a8c185a544762f794f9bcf6e418ac..a9f084b8634f8938751dbd8de665177309df1e11 100644 (file)
--- a/hw/pci-bridge/xio3130_downstream.c
+++ b/hw/pci-bridge/xio3130_downstream.c
@@ -24,6 +24,7 @@
 #include "hw/pci/msi.h"
 #include "hw/pci/pcie.h"
 #include "hw/pci/pcie_port.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"
 #include "qemu/module.h"

diff --git a/hw/pci-host/designware.c b/hw/pci-host/designware.c
index 083f5bb1a682f770563593d9c0e46de0c7187aef..71e9b0d9b548549d200cc6854cf62a8734e4f0fd 100644 (file)
--- a/hw/pci-host/designware.c
+++ b/hw/pci-host/designware.c
@@ -25,6 +25,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 "migration/vmstate.h"
 #include "hw/irq.h"
 #include "hw/pci-host/designware.h"

diff --git a/hw/pci-host/gpex.c b/hw/pci-host/gpex.c
index 93f28efb490525ca004c350653c49b3a6f1f52b8..0ca604dc628ebccc3f622625bb18d091529ac4c2 100644 (file)
--- a/hw/pci-host/gpex.c
+++ b/hw/pci-host/gpex.c
@@ -33,6 +33,7 @@
 #include "qapi/error.h"
 #include "hw/irq.h"
 #include "hw/pci-host/gpex.h"
+#include "hw/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 912f8bf13f81a5ab167002f9bbd98aeebcd7ead7..537273e578d385edd1c6ae8d403c417bfe20d08a 100644 (file)
--- a/hw/pci-host/grackle.c
+++ b/hw/pci-host/grackle.c
@@ -26,6 +26,7 @@
 #include "qemu/osdep.h"
 #include "hw/pci/pci_host.h"
 #include "hw/ppc/mac.h"
+#include "hw/qdev-properties.h"
 #include "hw/pci/pci.h"
 #include "hw/intc/heathrow_pic.h"
 #include "hw/irq.h"

diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c
index bc9726057add248ed118d8240ed563b275d6dd2a..2e97bc0bdb3667dc918fc96c07d223000bd34f21 100644 (file)
--- a/hw/pci-host/piix.c
+++ b/hw/pci-host/piix.c
@@ -27,6 +27,7 @@
 #include "hw/irq.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_host.h"
+#include "hw/qdev-properties.h"
 #include "hw/isa/isa.h"
 #include "hw/sysbus.h"
 #include "qapi/error.h"

diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c
index 241e7e788df81a3d7917abda7e858acf9b8a6eff..8bed8e8941880d6074dc19cc808a839f5dc28fe1 100644 (file)
--- a/hw/pci-host/ppce500.c
+++ b/hw/pci-host/ppce500.c
@@ -17,6 +17,7 @@
 #include "qemu/osdep.h"
 #include "hw/irq.h"
 #include "hw/ppc/e500-ccsr.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_host.h"

diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c
index 588c7dc6c09e3e2ee8eb4593539a040ab8235f73..85d7ba90374b6b5a558155e4445b5caa62a35f18 100644 (file)
--- a/hw/pci-host/prep.c
+++ b/hw/pci-host/prep.c
@@ -30,6 +30,7 @@
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_bus.h"
 #include "hw/pci/pci_host.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/i386/pc.h"
 #include "hw/irq.h"

diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c
index 1688a89b6a196d4e8312ceb087851d3e35368a08..158d270b9f0c94490acb57932985f394712ec05e 100644 (file)
--- a/hw/pci-host/q35.c
+++ b/hw/pci-host/q35.c
@@ -30,6 +30,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/pci-host/q35.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"

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

diff --git a/hw/pci-host/uninorth.c b/hw/pci-host/uninorth.c
index 76293ab22b747d430d84e4a702583d84be3b0726..75bc506965c0e4f10afa2c51c45d0c5983bed128 100644 (file)
--- a/hw/pci-host/uninorth.c
+++ b/hw/pci-host/uninorth.c
@@ -25,6 +25,7 @@
 #include "qemu/osdep.h"
 #include "hw/irq.h"
 #include "hw/ppc/mac.h"
+#include "hw/qdev-properties.h"
 #include "qemu/module.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_host.h"

diff --git a/hw/pci-host/versatile.c b/hw/pci-host/versatile.c
index 1cd832a3932cc0e64cf77b0555b11d00479bac66..b731d0544fa163100fe5f7d128a024fbba0c9070 100644 (file)
--- a/hw/pci-host/versatile.c
+++ b/hw/pci-host/versatile.c
@@ -14,6 +14,7 @@
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_bus.h"
 #include "hw/pci/pci_host.h"
+#include "hw/qdev-properties.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
 

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

diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index d84ecd8507a555db31b76009f2b256231fe1f1b7..9001b81daa6f4c7fe4cc0e960cddd6fbe2598d4c 100644 (file)
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -29,6 +29,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 "migration/qemu-file-types.h"
 #include "migration/vmstate.h"
 #include "monitor/monitor.h"

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

diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 3f0c3dea929cf51afc278657480447377fe979a2..3b04484654ad437d4eedae56eed0858947c8482a 100644 (file)
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -33,6 +33,7 @@
 #include "hw/ppc/openpic.h"
 #include "hw/ppc/openpic_kvm.h"
 #include "hw/ppc/ppc.h"
+#include "hw/qdev-properties.h"
 #include "hw/loader.h"
 #include "elf.h"
 #include "hw/sysbus.h"

diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 94a958e5e0af4de94dcfd34d1a092f0a06a60b1a..c5bbcc743352e4883605d8a46909d4f68a408741 100644 (file)
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -50,6 +50,7 @@
 #include "qemu-common.h"
 #include "qapi/error.h"
 #include "hw/ppc/ppc.h"
+#include "hw/qdev-properties.h"
 #include "hw/ppc/mac.h"
 #include "hw/input/adb.h"
 #include "hw/ppc/mac_dbdma.h"

diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index aeeddd1d3bfa09b6947416573e50015af5104a63..0fa680b7499c249e32a225dab960d6cb18886a05 100644 (file)
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -29,6 +29,7 @@
 #include "qemu/units.h"
 #include "qapi/error.h"
 #include "hw/ppc/ppc.h"
+#include "hw/qdev-properties.h"
 #include "mac.h"
 #include "hw/input/adb.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index 114d5826dfda43182ebc710fdac66a9d075b80eb..cf318306558fd0a5352dc168721c056e4534d265 100644 (file)
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -41,6 +41,7 @@
 #include "target/ppc/mmu-hash64.h"
 
 #include "hw/ppc/xics.h"
+#include "hw/qdev-properties.h"
 #include "hw/ppc/pnv_xscom.h"
 
 #include "hw/isa/isa.h"

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

diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c
index f10d519014478ada75794bc2ab9c7583799064a9..88ba8e7b9b0ae7a5afe897c1e910309220283452 100644 (file)
--- a/hw/ppc/pnv_psi.c
+++ b/hw/ppc/pnv_psi.c
@@ -31,6 +31,7 @@
 #include "hw/ppc/fdt.h"
 #include "hw/ppc/pnv.h"
 #include "hw/ppc/pnv_xscom.h"
+#include "hw/qdev-properties.h"
 #include "hw/ppc/pnv_psi.h"
 
 #include <libfdt.h>

diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c
index 761d5519678394cfbbce934619e718cf777cf3aa..95475c9c5f37246d65d6cb18cfb057b3e18dee6e 100644 (file)
--- a/hw/ppc/ppc440_uc.c
+++ b/hw/ppc/ppc440_uc.c
@@ -20,6 +20,7 @@
 #include "exec/address-spaces.h"
 #include "exec/memory.h"
 #include "hw/ppc/ppc.h"
+#include "hw/qdev-properties.h"
 #include "hw/pci/pci.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/reset.h"

diff --git a/hw/ppc/prep_systemio.c b/hw/ppc/prep_systemio.c
index d46792d366e09c715285de97dca3bed2f73b87a5..10f9725f414ea058014ceffe57342d03018a976f 100644 (file)
--- a/hw/ppc/prep_systemio.c
+++ b/hw/ppc/prep_systemio.c
@@ -25,6 +25,7 @@
 #include "qemu/osdep.h"
 #include "hw/irq.h"
 #include "hw/isa/isa.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "exec/address-spaces.h"
 #include "qemu/error-report.h" /* for error_report() */

diff --git a/hw/ppc/rs6000_mc.c b/hw/ppc/rs6000_mc.c
index daea13cdeaa118303903867f869c438c7f45f53c..df7c0006fc643e363f9b9320980bccd7e419f3f4 100644 (file)
--- a/hw/ppc/rs6000_mc.c
+++ b/hw/ppc/rs6000_mc.c
@@ -20,6 +20,7 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "hw/isa/isa.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "exec/address-spaces.h"
 #include "hw/boards.h"

diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c
index 7ed5518dbcf448befdac9623ebc28b2227641012..437e214210b08b1dcc1ddd237331150a8da29e97 100644 (file)
--- a/hw/ppc/sam460ex.c
+++ b/hw/ppc/sam460ex.c
@@ -37,6 +37,7 @@
 #include "hw/i2c/smbus_eeprom.h"
 #include "hw/usb/hcd-ehci.h"
 #include "hw/ppc/fdt.h"
+#include "hw/qdev-properties.h"
 
 #include <libfdt.h>
 

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 0258ca086f28131824669f69aec0caed2397a0f6..fb669c413bebf846eb18a9e2ec60edaa72c70477 100644 (file)
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -56,6 +56,7 @@
 #include "hw/ppc/fdt.h"
 #include "hw/ppc/spapr.h"
 #include "hw/ppc/spapr_vio.h"
+#include "hw/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 f86f773d42eb8a171da612b13f5e08ae56b0e1b7..920bc365ef029bdc8688c095f5e696b05b74dfe1 100644 (file)
--- a/hw/ppc/spapr_cpu_core.c
+++ b/hw/ppc/spapr_cpu_core.c
@@ -10,6 +10,7 @@
 #include "qemu/osdep.h"
 #include "hw/cpu/core.h"
 #include "hw/ppc/spapr_cpu_core.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "target/ppc/cpu.h"
 #include "hw/ppc/spapr.h"

diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c
index c09bbcc22da1af2abed0ce2fcc633d77a7add361..09255f49514f6aa840835336b8d192195bc53adf 100644 (file)
--- a/hw/ppc/spapr_drc.c
+++ b/hw/ppc/spapr_drc.c
@@ -17,7 +17,6 @@
 #include "qemu/cutils.h"
 #include "hw/ppc/spapr_drc.h"
 #include "qom/object.h"
-#include "hw/qdev.h"
 #include "migration/vmstate.h"
 #include "qapi/visitor.h"
 #include "qemu/error-report.h"

diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c
index d75359c5f3d60ee65b36c701fe934d2d5cd25a48..53c973bdd1db4aeea0d1d2cd8466e676c134c583 100644 (file)
--- a/hw/ppc/spapr_events.c
+++ b/hw/ppc/spapr_events.c
@@ -29,7 +29,6 @@
 #include "qapi/error.h"
 #include "cpu.h"
 #include "sysemu/sysemu.h"
-#include "hw/qdev.h"
 #include "sysemu/device_tree.h"
 
 #include "hw/ppc/fdt.h"

diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c
index 8223bdb39f32ea50daf44fd9c03226d5181b9d3c..ce85f8ac632f5d9b4e2e5276a5125cf01e4a3311 100644 (file)
--- a/hw/ppc/spapr_iommu.c
+++ b/hw/ppc/spapr_iommu.c
@@ -22,7 +22,6 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "sysemu/kvm.h"
-#include "hw/qdev.h"
 #include "kvm_ppc.h"
 #include "migration/vmstate.h"
 #include "sysemu/dma.h"

diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
index 66705962e733f44dabfd1f41f2f1c879162e7c61..2f87fe08f385db6b084da076fdc8f1d84af65041 100644 (file)
--- a/hw/ppc/spapr_irq.c
+++ b/hw/ppc/spapr_irq.c
@@ -17,6 +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 "cpu-models.h"
 #include "sysemu/kvm.h"
 

diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index 53b799fec723c92f924167b1f0f854f53204ca1d..bf31fd854c546e77ba48d985fc36cb6c42cba505 100644 (file)
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -47,6 +47,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 "sysemu/device_tree.h"
 #include "sysemu/kvm.h"
 #include "sysemu/hostmem.h"

diff --git a/hw/ppc/spapr_rng.c b/hw/ppc/spapr_rng.c
index cfe43eaae97f0bd9810ecb28df37308a837f7131..27198e0ced433ccddb5039c2ce7091e676af3ee0 100644 (file)
--- a/hw/ppc/spapr_rng.c
+++ b/hw/ppc/spapr_rng.c
@@ -27,6 +27,7 @@
 #include "sysemu/device_tree.h"
 #include "sysemu/rng.h"
 #include "hw/ppc/spapr.h"
+#include "hw/qdev-properties.h"
 #include "kvm_ppc.h"
 
 #define SPAPR_RNG(obj) \

diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c
index a618a2ac0f3f9462e0f8ea92c563a4eec96fc57e..558d70283398229874ff2c5f7e6ed9e7901e99ad 100644 (file)
--- a/hw/ppc/spapr_rtas.c
+++ b/hw/ppc/spapr_rtas.c
@@ -29,7 +29,6 @@
 #include "qemu/log.h"
 #include "qemu/error-report.h"
 #include "sysemu/sysemu.h"
-#include "hw/qdev.h"
 #include "sysemu/device_tree.h"
 #include "sysemu/cpus.h"
 #include "sysemu/hw_accel.h"

diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
index 099b94cc541b80a2d3cb1e620af88f861f821f1f..68625522d8ac7e9ce7a7fab2a2ab23cbf10e4c5b 100644 (file)
--- a/hw/ppc/virtex_ml507.c
+++ b/hw/ppc/virtex_ml507.c
@@ -43,6 +43,7 @@
 
 #include "hw/ppc/ppc.h"
 #include "hw/ppc/ppc4xx.h"
+#include "hw/qdev-properties.h"
 #include "ppc405.h"
 
 #define EPAPR_MAGIC    (0x45504150)

diff --git a/hw/rdma/vmw/pvrdma_main.c b/hw/rdma/vmw/pvrdma_main.c
index b924843367d7dba157aed1c076d7e17a7e061d77..e3a12173e3eacf8f2b82f8b224cde0c53824b3cf 100644 (file)
--- a/hw/rdma/vmw/pvrdma_main.c
+++ b/hw/rdma/vmw/pvrdma_main.c
@@ -20,7 +20,6 @@
 #include "hw/pci/pci_ids.h"
 #include "hw/pci/msi.h"
 #include "hw/pci/msix.h"
-#include "hw/qdev-core.h"
 #include "hw/qdev-properties.h"
 #include "cpu.h"
 #include "trace.h"

diff --git a/hw/riscv/riscv_hart.c b/hw/riscv/riscv_hart.c
index 61bd4d517056d64f8463166e8ae77e0f06d5e9e4..d0f3199968ccbb4d881ae94b758d022185244198 100644 (file)
--- a/hw/riscv/riscv_hart.c
+++ b/hw/riscv/riscv_hart.c
@@ -24,6 +24,7 @@
 #include "sysemu/reset.h"
 #include "hw/sysbus.h"
 #include "target/riscv/cpu.h"
+#include "hw/qdev-properties.h"
 #include "hw/riscv/riscv_hart.h"
 
 static Property riscv_harts_props[] = {

diff --git a/hw/riscv/sifive_clint.c b/hw/riscv/sifive_clint.c
index 591d70deb3d777a8f62735a2a04e6e893ba68e7f..e5a8f75ceeb1fdfe8bf7cf1756e12cc0c73f8f27 100644 (file)
--- a/hw/riscv/sifive_clint.c
+++ b/hw/riscv/sifive_clint.c
@@ -24,6 +24,7 @@
 #include "qemu/module.h"
 #include "hw/sysbus.h"
 #include "target/riscv/cpu.h"
+#include "hw/qdev-properties.h"
 #include "hw/riscv/sifive_clint.h"
 #include "qemu/timer.h"
 

diff --git a/hw/riscv/sifive_plic.c b/hw/riscv/sifive_plic.c
index 0950e89e1526538f9c7820c38c50024adf84bf28..64a1a1038080179d1177b09cfbc150c13b471134 100644 (file)
--- a/hw/riscv/sifive_plic.c
+++ b/hw/riscv/sifive_plic.c
@@ -25,6 +25,7 @@
 #include "hw/sysbus.h"
 #include "hw/pci/msi.h"
 #include "hw/boards.h"
+#include "hw/qdev-properties.h"
 #include "target/riscv/cpu.h"
 #include "sysemu/sysemu.h"
 #include "hw/riscv/sifive_plic.h"

diff --git a/hw/riscv/sifive_prci.c b/hw/riscv/sifive_prci.c
index 562bc3dc4ce7c8e8389e5e66504a073d25e2cc70..9837b6166f2c2ebb689361f1be3516ad096f68f1 100644 (file)
--- a/hw/riscv/sifive_prci.c
+++ b/hw/riscv/sifive_prci.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "qemu/module.h"
 #include "target/riscv/cpu.h"

diff --git a/hw/riscv/sifive_test.c b/hw/riscv/sifive_test.c
index 3a14f9f8b6b11b6dffb7a70be32999a5317d414d..afbb3aaf34dcb74b005c1278e06a7e1345e4735b 100644 (file)
--- a/hw/riscv/sifive_test.c
+++ b/hw/riscv/sifive_test.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "qemu/module.h"
 #include "target/riscv/cpu.h"

diff --git a/hw/s390x/3270-ccw.c b/hw/s390x/3270-ccw.c
index 14882242c3deece3453ba35e7c317b179b15b93c..c19a75b9b7254ec5f5f67f0731cf18914f120c52 100644 (file)
--- a/hw/s390x/3270-ccw.c
+++ b/hw/s390x/3270-ccw.c
@@ -9,12 +9,14 @@
  * your option) any later version. See the COPYING file in the top-level
  * directory.
  */
+
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "cpu.h"
 #include "hw/s390x/css.h"
 #include "hw/s390x/css-bridge.h"
+#include "hw/qdev-properties.h"
 #include "hw/s390x/3270-ccw.h"
 
 /* Handle READ ccw commands from guest */

diff --git a/hw/s390x/ap-device.c b/hw/s390x/ap-device.c
index f5ac8db9682662a249ed52ac0c7f8c82924ee236..fc0b41e9373bc18b9582ab530ddadb78a3119d56 100644 (file)
--- a/hw/s390x/ap-device.c
+++ b/hw/s390x/ap-device.c
@@ -10,7 +10,6 @@
 #include "qemu/osdep.h"
 #include "qemu/module.h"
 #include "qapi/error.h"
-#include "hw/qdev.h"
 #include "hw/s390x/ap-device.h"
 
 static void ap_class_init(ObjectClass *klass, void *data)

diff --git a/hw/s390x/ccw-device.c b/hw/s390x/ccw-device.c
index 24f17bb6ca63dfd441dd42034924f5935ed61e5a..4d222ad2024f4ef2c7583f4f3e8796d02bec22a6 100644 (file)
--- a/hw/s390x/ccw-device.c
+++ b/hw/s390x/ccw-device.c
@@ -11,6 +11,7 @@
 
 #include "qemu/osdep.h"
 #include "ccw-device.h"
+#include "hw/qdev-properties.h"
 #include "qemu/module.h"
 
 static void ccw_device_refill_ids(CcwDevice *dev)

diff --git a/hw/s390x/css-bridge.c b/hw/s390x/css-bridge.c
index 4e9ff481e81b8a4cf5d90114393c1c036b6af403..15a8ed96de160de45c69efa4dec236aedc7af596 100644 (file)
--- a/hw/s390x/css-bridge.c
+++ b/hw/s390x/css-bridge.c
@@ -13,6 +13,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/hotplug.h"
+#include "hw/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 b92395f165e6735ff24ba1b4ab27852620e267a0..844caab40825d5496f26c0091ddee20ce5a6da3a 100644 (file)
--- a/hw/s390x/css.c
+++ b/hw/s390x/css.c
@@ -12,12 +12,12 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"
-#include "hw/qdev.h"
 #include "qemu/bitops.h"
 #include "qemu/error-report.h"
 #include "exec/address-spaces.h"
 #include "cpu.h"
 #include "hw/s390x/ioinst.h"
+#include "hw/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 2e5ce11a6b50a42a7a774c40c849b117d69a6ac5..304063cbe005c812e7e660ce841f33078beafbee 100644 (file)
--- a/hw/s390x/ipl.c
+++ b/hw/s390x/ipl.c
@@ -20,6 +20,7 @@
 #include "cpu.h"
 #include "elf.h"
 #include "hw/loader.h"
+#include "hw/qdev-properties.h"
 #include "hw/boards.h"
 #include "hw/s390x/virtio-ccw.h"
 #include "hw/s390x/vfio-ccw.h"

diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h
index b3a07a12d8f6ce383dbf8aa54b5783283247b217..d4813105db33253fd1eba53cd7e364f9956c0bc3 100644 (file)
--- a/hw/s390x/ipl.h
+++ b/hw/s390x/ipl.h
@@ -12,8 +12,8 @@
 #ifndef HW_S390_IPL_H
 #define HW_S390_IPL_H
 
-#include "hw/qdev.h"
 #include "cpu.h"
+#include "hw/qdev-core.h"
 
 struct IplBlockCcw {
     uint8_t  reserved0[85];

diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
index 2c6e084e2c2636b55980799b583766a0eab0a8de..963a41c7f5327fcec085bd91d353588c3dc8be51 100644 (file)
--- a/hw/s390x/s390-pci-bus.c
+++ b/hw/s390x/s390-pci-bus.c
@@ -18,6 +18,7 @@
 #include "s390-pci-bus.h"
 #include "s390-pci-inst.h"
 #include "hw/pci/pci_bus.h"
+#include "hw/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-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 4ffdd53a8527b5c55ec136567703c33e82cc6e6d..a543b64e561fddba433c375cba3872ffeb215744 100644 (file)
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -38,6 +38,7 @@
 #include "migration/register.h"
 #include "cpu_models.h"
 #include "hw/nmi.h"
+#include "hw/qdev-properties.h"
 #include "hw/s390x/tod.h"
 
 S390CPU *s390_cpu_addr2state(uint16_t cpu_addr)

diff --git a/hw/s390x/sclpquiesce.c b/hw/s390x/sclpquiesce.c
index 6dfb087568e6b8e723b86dd860e1b5bfdebc7734..f56273ca4bc21368557b9897915aee12a688a1f3 100644 (file)
--- a/hw/s390x/sclpquiesce.c
+++ b/hw/s390x/sclpquiesce.c
@@ -13,7 +13,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev.h"
 #include "sysemu/sysemu.h"
 #include "hw/s390x/sclp.h"
 #include "migration/vmstate.h"

diff --git a/hw/s390x/vhost-vsock-ccw.c b/hw/s390x/vhost-vsock-ccw.c
index 076f733390edbeb94b01b09e08d6b20838032560..1835812bd11a7c4c275206f3905ce4b34718f214 100644 (file)
--- a/hw/s390x/vhost-vsock-ccw.c
+++ b/hw/s390x/vhost-vsock-ccw.c
@@ -7,6 +7,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "hw/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 67b2c537cce2bc731af9338b430f855e58153af4..5453a964d2dc3f5943f492c2c4e6bb1fe896cc39 100644 (file)
--- a/hw/s390x/virtio-ccw-9p.c
+++ b/hw/s390x/virtio-ccw-9p.c
@@ -10,6 +10,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "hw/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 35e43e89fb6db9c9cc5905fe3cc08c2d2ddac8c1..7088612f6bce233b18574ad6312103ec69337f45 100644 (file)
--- a/hw/s390x/virtio-ccw-balloon.c
+++ b/hw/s390x/virtio-ccw-balloon.c
@@ -10,6 +10,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "hw/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 83636cb6d7c98a44d548a6a4b0410dec4f1735a7..1512af8974dff0b303cda91e9ad82f206a1022d9 100644 (file)
--- a/hw/s390x/virtio-ccw-blk.c
+++ b/hw/s390x/virtio-ccw-blk.c
@@ -10,6 +10,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "hw/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 4569fe0649238542f0d8af948e67f8fe340cd955..086b397ad274e11a69465dc699292c03c58d534f 100644 (file)
--- a/hw/s390x/virtio-ccw-crypto.c
+++ b/hw/s390x/virtio-ccw-crypto.c
@@ -9,6 +9,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "hw/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 10ee4b86eb5124e9646d2f1ed205ac20a0389f0c..be46ca7a968c2b9baa44569be6897dfbb2c6be76 100644 (file)
--- a/hw/s390x/virtio-ccw-gpu.c
+++ b/hw/s390x/virtio-ccw-gpu.c
@@ -9,6 +9,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "hw/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 075bb094eec6be113a9244f0c3011385a64d651d..370b776790c8bca383e78ea4df34a978d5541858 100644 (file)
--- a/hw/s390x/virtio-ccw-input.c
+++ b/hw/s390x/virtio-ccw-input.c
@@ -9,6 +9,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "hw/qdev-properties.h"
 #include "hw/virtio/virtio.h"
 #include "qapi/error.h"
 #include "qemu/module.h"

diff --git a/hw/s390x/virtio-ccw-net.c b/hw/s390x/virtio-ccw-net.c
index 8ff184265e01c9aa8c18a20e1d520a4abb5101d9..12c03d73c4dcc081514cac3bc1aff7985c14c8d5 100644 (file)
--- a/hw/s390x/virtio-ccw-net.c
+++ b/hw/s390x/virtio-ccw-net.c
@@ -10,6 +10,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "hw/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 dc60f084a5d8bafa630ae3551a961ed742f0a818..854254dd50f5e9bc0e45f5d535715424c39b0f7e 100644 (file)
--- a/hw/s390x/virtio-ccw-rng.c
+++ b/hw/s390x/virtio-ccw-rng.c
@@ -10,6 +10,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "hw/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 26fa086ef08ef49509b8f4814980f1e93250e3a0..4662288b5b009da0b2ecf74eaff94d773c6a64bd 100644 (file)
--- a/hw/s390x/virtio-ccw-scsi.c
+++ b/hw/s390x/virtio-ccw-scsi.c
@@ -10,6 +10,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "hw/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 8cf5a529a5805d25de92c8d62b6d5fbfee4196f3..eafb7d5c1f4c799d33980a6db0211d731b603e85 100644 (file)
--- a/hw/s390x/virtio-ccw-serial.c
+++ b/hw/s390x/virtio-ccw-serial.c
@@ -12,6 +12,7 @@
 #include "qemu/osdep.h"
 #include "hw/virtio/virtio.h"
 #include "qemu/module.h"
+#include "hw/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 3706294a852c6610c0f395b6f9fc857ff8db6e0d..de9bd2088707ab89a5023e89e9aa55185da3fd10 100644 (file)
--- a/hw/scsi/megasas.c
+++ b/hw/scsi/megasas.c
@@ -21,6 +21,7 @@
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "hw/pci/pci.h"
+#include "hw/qdev-properties.h"
 #include "sysemu/dma.h"
 #include "sysemu/block-backend.h"
 #include "hw/pci/msi.h"

diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c
index efa54a30c5d4a375007ad612416df51749e4c6dd..b8a4b37cf35dda5539c7372edf85b342ce2f65ef 100644 (file)
--- a/hw/scsi/mptsas.c
+++ b/hw/scsi/mptsas.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/pci/pci.h"
+#include "hw/qdev-properties.h"
 #include "sysemu/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 1f9914739ae021b736c496fca08d51aa0db016b3..db785e600191b8c920f22dc107dbe0dd5e1d1ee0 100644 (file)
--- a/hw/scsi/scsi-bus.c
+++ b/hw/scsi/scsi-bus.c
@@ -3,11 +3,11 @@
 #include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "qemu/option.h"
+#include "hw/qdev-properties.h"
 #include "hw/scsi/scsi.h"
 #include "migration/qemu-file-types.h"
 #include "migration/vmstate.h"
 #include "scsi/constants.h"
-#include "hw/qdev.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/blockdev.h"
 #include "trace.h"

diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index aa34297a5d72ba4d365f4736ebbeca8965a5a44b..6370cfe190546808c83fa59b46cd47e86965ab52 100644 (file)
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -34,6 +34,7 @@
 #include "sysemu/block-backend.h"
 #include "sysemu/blockdev.h"
 #include "hw/block/block.h"
+#include "hw/qdev-properties.h"
 #include "sysemu/dma.h"
 #include "qemu/cutils.h"
 #include "trace.h"

diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c
index 44430b6ea60aadfe2967de185ced0cc97ded2b03..e7798ebcd0d41f13b4cf28f9a40f88fa715101e2 100644 (file)
--- a/hw/scsi/scsi-generic.c
+++ b/hw/scsi/scsi-generic.c
@@ -18,6 +18,7 @@
 #include "qemu/module.h"
 #include "hw/scsi/scsi.h"
 #include "migration/qemu-file-types.h"
+#include "hw/qdev-properties.h"
 #include "hw/scsi/emulation.h"
 #include "sysemu/block-backend.h"
 #include "trace.h"

diff --git a/hw/scsi/spapr_vscsi.c b/hw/scsi/spapr_vscsi.c
index fedeec676d1838d9a2b7c8bae5eaa2f2dade9555..2120ceb051b5a75bb9bb55e40c9b33f3635606d5 100644 (file)
--- a/hw/scsi/spapr_vscsi.c
+++ b/hw/scsi/spapr_vscsi.c
@@ -39,9 +39,9 @@
 #include "migration/vmstate.h"
 #include "scsi/constants.h"
 #include "srp.h"
-#include "hw/qdev.h"
 #include "hw/ppc/spapr.h"
 #include "hw/ppc/spapr_vio.h"
+#include "hw/qdev-properties.h"
 #include "viosrp.h"
 #include "trace.h"
 

diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c
index 83c9d83459251b55b8e791733405dc26b040bf71..cd5cf1679ddde4826502d7e0d11ecbadf1c7476c 100644 (file)
--- a/hw/scsi/vhost-scsi.c
+++ b/hw/scsi/vhost-scsi.c
@@ -28,6 +28,7 @@
 #include "hw/virtio/virtio-bus.h"
 #include "hw/virtio/virtio-access.h"
 #include "hw/fw-path-provider.h"
+#include "hw/qdev-properties.h"
 #include "qemu/cutils.h"
 
 /* Features supported by host kernel. */

diff --git a/hw/scsi/vhost-user-scsi.c b/hw/scsi/vhost-user-scsi.c
index fcee67d5a79e18814a0314fb63949bd060bc1743..a5be128b54c45f378b0e0d790250b36b5a9fe986 100644 (file)
--- a/hw/scsi/vhost-user-scsi.c
+++ b/hw/scsi/vhost-user-scsi.c
@@ -21,6 +21,7 @@
 #include "qom/object.h"
 #include "hw/fw-path-provider.h"
 #include "hw/qdev-core.h"
+#include "hw/qdev-properties.h"
 #include "hw/virtio/vhost.h"
 #include "hw/virtio/vhost-backend.h"
 #include "hw/virtio/vhost-user-scsi.h"

diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
index a6d61aacdb54726644667e658872a3271a36581b..ee52aa7d175047f86e7c440ab598ea85668d80ab 100644 (file)
--- a/hw/scsi/virtio-scsi.c
+++ b/hw/scsi/virtio-scsi.c
@@ -22,6 +22,7 @@
 #include "qemu/iov.h"
 #include "qemu/module.h"
 #include "sysemu/block-backend.h"
+#include "hw/qdev-properties.h"
 #include "hw/scsi/scsi.h"
 #include "scsi/constants.h"
 #include "hw/virtio/virtio-bus.h"

diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c
index 7e27bce43e039da0b67acfa37b86396c63eec62e..452a3b63b2b4db17f4be67288987310ea266426d 100644 (file)
--- a/hw/scsi/vmw_pvscsi.c
+++ b/hw/scsi/vmw_pvscsi.c
@@ -33,6 +33,7 @@
 #include "migration/vmstate.h"
 #include "scsi/constants.h"
 #include "hw/pci/msi.h"
+#include "hw/qdev-properties.h"
 #include "vmw_pvscsi.h"
 #include "trace.h"
 

diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c
index e3c7cf5b5f0f9c58c38f141011e86916167bf7e2..79a9a5c52c640b35595741f3548333f1c9c21466 100644 (file)
--- a/hw/sd/milkymist-memcard.c
+++ b/hw/sd/milkymist-memcard.c
@@ -31,6 +31,7 @@
 #include "qapi/error.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/blockdev.h"
+#include "hw/qdev-properties.h"
 #include "hw/sd/sd.h"
 
 enum {

diff --git a/hw/sd/pxa2xx_mmci.c b/hw/sd/pxa2xx_mmci.c
index db2f2adf584a4d79244f29d42eb91ea5dc61c218..8f9ab0ec1676ec65d7977ffd687e7bdad6fc8b25 100644 (file)
--- a/hw/sd/pxa2xx_mmci.c
+++ b/hw/sd/pxa2xx_mmci.c
@@ -17,7 +17,6 @@
 #include "migration/vmstate.h"
 #include "hw/arm/pxa.h"
 #include "hw/sd/sd.h"
-#include "hw/qdev.h"
 #include "hw/qdev-properties.h"
 #include "qemu/error-report.h"
 #include "qemu/log.h"

diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 3f26b3878647eb54652d83b6606cf5c8a95903fa..49b83576e786869d432f94386624eb44625b3dbf 100644 (file)
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -32,7 +32,6 @@
 
 #include "qemu/osdep.h"
 #include "qemu/units.h"
-#include "hw/qdev.h"
 #include "hw/irq.h"
 #include "hw/registerfields.h"
 #include "sysemu/block-backend.h"

diff --git a/hw/sd/sdhci-pci.c b/hw/sd/sdhci-pci.c
index 438cb30af58256760cb363fb9e5b7e3dcdd28735..2c8d8f59b584c6b2cf3650c4456996c4d5452cc2 100644 (file)
--- a/hw/sd/sdhci-pci.c
+++ b/hw/sd/sdhci-pci.c
@@ -18,6 +18,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/module.h"
+#include "hw/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 1adc16e3e90541ca2ad186a1ff8798def95706b2..e08ec3e39858a06f481ca87a8d388f5a93aeb359 100644 (file)
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -27,6 +27,7 @@
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "sysemu/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 571aabea5cf249fff28f86cc5dafe52d20272520..91db069212fa1ca6c3849c083e3d1997128fff40 100644 (file)
--- a/hw/sd/ssi-sd.c
+++ b/hw/sd/ssi-sd.c
@@ -14,6 +14,7 @@
 #include "sysemu/blockdev.h"
 #include "hw/ssi/ssi.h"
 #include "migration/vmstate.h"
+#include "hw/qdev-properties.h"
 #include "hw/sd/sd.h"
 #include "qapi/error.h"
 #include "qemu/module.h"

diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index 571e59430440e653b5d24e03760ab7df0def9dc9..b421b3bc83e2b054549d4bee67803e144bda5b0e 100644 (file)
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -33,6 +33,7 @@
 #include "sysemu/sysemu.h"
 #include "hw/boards.h"
 #include "hw/pci/pci.h"
+#include "hw/qdev-properties.h"
 #include "net/net.h"
 #include "sh7750_regs.h"
 #include "hw/ide.h"

diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
index 655939a3f1d2c84b183af0abec73a64d5368af10..c5f1b1ee72e730a4ce12945b3e5504a9fa682877 100644 (file)
--- a/hw/sparc/leon3.c
+++ b/hw/sparc/leon3.c
@@ -31,6 +31,7 @@
 #include "hw/irq.h"
 #include "qemu/timer.h"
 #include "hw/ptimer.h"
+#include "hw/qdev-properties.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/qtest.h"
 #include "sysemu/reset.h"

diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index 99b8693a0c1345af1edecc138fd5b8b7f93fca76..267895b93eeacc99bda48773c9869c8c25563d80 100644 (file)
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -41,6 +41,7 @@
 #include "hw/boards.h"
 #include "hw/scsi/esp.h"
 #include "hw/nvram/sun_nvram.h"
+#include "hw/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 a5681ded6afbd4fc20364af743c3c4dd6f191808..ccf46a5147608a616c343234cf0d720e2e288e3a 100644 (file)
--- a/hw/sparc/sun4m_iommu.c
+++ b/hw/sparc/sun4m_iommu.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/irq.h"
+#include "hw/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 54a385970cca6ce8181522964c8902c8483c821b..08e12aa88b997634cb7bc4c654a90da1798a506d 100644 (file)
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -32,6 +32,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/pci-host/sabre.h"
 #include "hw/char/serial.h"
 #include "hw/char/parallel.h"

diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c
index 7ace5780a35ca79082a3c09cf2952f4502bfa8b5..b8332150f163934ac4d590f1d3af67a5e596dcac 100644 (file)
--- a/hw/ssi/aspeed_smc.c
+++ b/hw/ssi/aspeed_smc.c
@@ -31,6 +31,7 @@
 #include "qemu/error-report.h"
 
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "hw/ssi/aspeed_smc.h"
 
 /* CE Type Setting Register */

diff --git a/hw/ssi/xilinx_spi.c b/hw/ssi/xilinx_spi.c
index 081433c2f00de271e03c02d50b9a35946e2800c8..24280dfeab5e91b46c7f7e6e55044faa394e1fd7 100644 (file)
--- a/hw/ssi/xilinx_spi.c
+++ b/hw/ssi/xilinx_spi.c
@@ -33,6 +33,7 @@
 #include "qemu/fifo8.h"
 
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "hw/ssi/ssi.h"
 
 #ifdef XILINX_SPI_ERR_DEBUG

diff --git a/hw/ssi/xilinx_spips.c b/hw/ssi/xilinx_spips.c
index a28cd8f8f0c8b99b7436287f36f983b3b608fdb2..1605fa102b37fabd5c633b45461fcea0a889cf39 100644 (file)
--- a/hw/ssi/xilinx_spips.c
+++ b/hw/ssi/xilinx_spips.c
@@ -27,6 +27,7 @@
 #include "sysemu/sysemu.h"
 #include "hw/irq.h"
 #include "hw/ptimer.h"
+#include "hw/qdev-properties.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "qemu/bitops.h"

diff --git a/hw/timer/a9gtimer.c b/hw/timer/a9gtimer.c
index 0339b92cf8d40f07cb14071785f6d46eb56e06a1..75f18671749c062b91fa2cdf864461dadae4f9ff 100644 (file)
--- a/hw/timer/a9gtimer.c
+++ b/hw/timer/a9gtimer.c
@@ -23,6 +23,7 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/irq.h"
+#include "hw/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 904da4fc8884c5f839f333f6d5ca7d484c89e863..1e1f74f1a113fb2578fa3f9b4890e9dadcfa9ea0 100644 (file)
--- a/hw/timer/allwinner-a10-pit.c
+++ b/hw/timer/allwinner-a10-pit.c
@@ -17,6 +17,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "sysemu/sysemu.h"
 #include "hw/timer/allwinner-a10-pit.h"

diff --git a/hw/timer/altera_timer.c b/hw/timer/altera_timer.c
index 51971e44ca2c65757137e18cbbce4b1b501ed3bd..c9988f67ac31c5f67869efc2f58f59ee216fcdc4 100644 (file)
--- a/hw/timer/altera_timer.c
+++ b/hw/timer/altera_timer.c
@@ -27,6 +27,7 @@
 #include "sysemu/sysemu.h"
 #include "hw/irq.h"
 #include "hw/ptimer.h"
+#include "hw/qdev-properties.h"
 
 #define R_STATUS      0
 #define R_CONTROL     1

diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c
index abfc5baa7715ea36bcebaa6e323fc88b92f238e9..983e61847e56b8ef871707653c197b3e3725b8d3 100644 (file)
--- a/hw/timer/arm_mptimer.c
+++ b/hw/timer/arm_mptimer.c
@@ -23,6 +23,7 @@
 #include "hw/hw.h"
 #include "hw/irq.h"
 #include "hw/ptimer.h"
+#include "hw/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 0b121252fd3076cd2a18ca0342a56bdcf164dab6..c2e6211188b1c4dd38089c859bd4742c91d28e88 100644 (file)
--- a/hw/timer/arm_timer.c
+++ b/hw/timer/arm_timer.c
@@ -11,9 +11,9 @@
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/timer.h"
-#include "hw/qdev.h"
 #include "hw/irq.h"
 #include "hw/ptimer.h"
+#include "hw/qdev-properties.h"
 #include "qemu/main-loop.h"
 #include "qemu/module.h"
 #include "qemu/log.h"

diff --git a/hw/timer/cmsdk-apb-dualtimer.c b/hw/timer/cmsdk-apb-dualtimer.c
index 6a084a91dd43f6da4062af3bdd95f09fc2094af2..5e2352dd3268026e75e85f50e0473a02dfc14b0e 100644 (file)
--- a/hw/timer/cmsdk-apb-dualtimer.c
+++ b/hw/timer/cmsdk-apb-dualtimer.c
@@ -24,6 +24,7 @@
 #include "qemu/module.h"
 #include "hw/sysbus.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "hw/registerfields.h"
 #include "hw/timer/cmsdk-apb-dualtimer.h"
 #include "migration/vmstate.h"

diff --git a/hw/timer/exynos4210_mct.c b/hw/timer/exynos4210_mct.c
index 79b291863c7840bc5ae62fee2019f7efd7fceade..77b9af05f41b358ac661ed72d71e3938b2daccee 100644 (file)
--- a/hw/timer/exynos4210_mct.c
+++ b/hw/timer/exynos4210_mct.c
@@ -54,6 +54,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/timer.h"

diff --git a/hw/timer/grlib_gptimer.c b/hw/timer/grlib_gptimer.c
index 28ba1259d08f42e77eda259cfe360faa0059b230..32dbf870d4b61ef9554d9cf9787575d67e13f9c5 100644 (file)
--- a/hw/timer/grlib_gptimer.c
+++ b/hw/timer/grlib_gptimer.c
@@ -28,6 +28,7 @@
 #include "qemu/timer.h"
 #include "hw/irq.h"
 #include "hw/ptimer.h"
+#include "hw/qdev-properties.h"
 #include "qemu/main-loop.h"
 #include "qemu/module.h"
 

diff --git a/hw/timer/lm32_timer.c b/hw/timer/lm32_timer.c
index a381e39f0a6f6ea50afeb74843da4e1e63be6ae3..ac3edaff4f89d3d0b6894320551460ea81c446f2 100644 (file)
--- a/hw/timer/lm32_timer.c
+++ b/hw/timer/lm32_timer.c
@@ -28,6 +28,7 @@
 #include "trace.h"
 #include "qemu/timer.h"
 #include "hw/ptimer.h"
+#include "hw/qdev-properties.h"
 #include "qemu/error-report.h"
 #include "qemu/main-loop.h"
 #include "qemu/module.h"

diff --git a/hw/timer/m48t59-isa.c b/hw/timer/m48t59-isa.c
index cbc5e61dddce6ea20c4c2b30fd4c76afb89219a8..5e5432abfdfa0fe16f067f356e65c16e5c9891b9 100644 (file)
--- a/hw/timer/m48t59-isa.c
+++ b/hw/timer/m48t59-isa.c
@@ -25,6 +25,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/isa/isa.h"
+#include "hw/qdev-properties.h"
 #include "hw/timer/m48t59.h"
 #include "m48t59-internal.h"
 #include "qemu/module.h"

diff --git a/hw/timer/m48t59.c b/hw/timer/m48t59.c
index 199003030a6fb8ce756bbde556d953278f28f6aa..56f9dfa8dd4458bc64ae2bd84f1ca983828dd15e 100644 (file)
--- a/hw/timer/m48t59.c
+++ b/hw/timer/m48t59.c
@@ -26,6 +26,7 @@
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "hw/timer/m48t59.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c
index 473935339d28dfd02dbf1a46a40f795e6a980e3d..5aa584c080bb402836350e824bc20c27d2bfe2d2 100644 (file)
--- a/hw/timer/mc146818rtc.c
+++ b/hw/timer/mc146818rtc.c
@@ -28,6 +28,7 @@
 #include "qemu/module.h"
 #include "qemu/bcd.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/replay.h"

diff --git a/hw/timer/milkymist-sysctl.c b/hw/timer/milkymist-sysctl.c
index 4d75d73a934f01b0c6e3e80f8dad22e446d5eeca..a65c174c0454d8f5598af1f7e322c5a70ca93fc6 100644 (file)
--- a/hw/timer/milkymist-sysctl.c
+++ b/hw/timer/milkymist-sysctl.c
@@ -29,6 +29,7 @@
 #include "trace.h"
 #include "qemu/timer.h"
 #include "hw/ptimer.h"
+#include "hw/qdev-properties.h"
 #include "qemu/error-report.h"
 #include "qemu/main-loop.h"
 #include "qemu/module.h"

diff --git a/hw/timer/mss-timer.c b/hw/timer/mss-timer.c
index 084e02199df056c16254867d27406c3ed8227c07..45f1cf42f9e141c4d1b161d3c7e135caebe82bbd 100644 (file)
--- a/hw/timer/mss-timer.c
+++ b/hw/timer/mss-timer.c
@@ -28,6 +28,7 @@
 #include "qemu/module.h"
 #include "qemu/log.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "hw/timer/mss-timer.h"
 #include "migration/vmstate.h"
 

diff --git a/hw/timer/pl031.c b/hw/timer/pl031.c
index 39abd08643402ea46b6fdbec954e2cc464b7566f..2b3e2610069934f0b5db2ec123180d896225d2eb 100644 (file)
--- a/hw/timer/pl031.c
+++ b/hw/timer/pl031.c
@@ -16,6 +16,7 @@
 #include "hw/timer/pl031.h"
 #include "migration/vmstate.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/timer/pxa2xx_timer.c b/hw/timer/pxa2xx_timer.c
index 99e6c1e250ba05e92d329e2326c3ba3a0aac9cf5..af7e4dbcbd8c75cad6923b29a52c374f52ddeea3 100644 (file)
--- a/hw/timer/pxa2xx_timer.c
+++ b/hw/timer/pxa2xx_timer.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
 #include "hw/arm/pxa.h"

diff --git a/hw/timer/slavio_timer.c b/hw/timer/slavio_timer.c
index 931ffd483f43707c7280e2a632fa69fc81dd1db8..38fd32b62a0e754ef92eafbbee2a05051956e8aa 100644 (file)
--- a/hw/timer/slavio_timer.c
+++ b/hw/timer/slavio_timer.c
@@ -26,6 +26,7 @@
 #include "qemu/timer.h"
 #include "hw/irq.h"
 #include "hw/ptimer.h"
+#include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "trace.h"

diff --git a/hw/timer/stm32f2xx_timer.c b/hw/timer/stm32f2xx_timer.c
index b41822f047a411ea1e128eeca840bb4d09c4bed5..edc557a4b920c2c195d4ff358a303124403b13a8 100644 (file)
--- a/hw/timer/stm32f2xx_timer.c
+++ b/hw/timer/stm32f2xx_timer.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/irq.h"
+#include "hw/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 c4a83af8b9606d858117deef27ade2455c280847..355518232cdee08cc354950f7c76b10d6dbf76d2 100644 (file)
--- a/hw/timer/xilinx_timer.c
+++ b/hw/timer/xilinx_timer.c
@@ -26,6 +26,7 @@
 #include "hw/sysbus.h"
 #include "hw/irq.h"
 #include "hw/ptimer.h"
+#include "hw/qdev-properties.h"
 #include "qemu/log.h"
 #include "qemu/main-loop.h"
 #include "qemu/module.h"

diff --git a/hw/tpm/tpm_crb.c b/hw/tpm/tpm_crb.c
index db0e3e7c674ae0a3c7dffc1e1f116e70c110cc01..faae733120fcbc1bf239349ae01a389e402c6ac7 100644 (file)
--- a/hw/tpm/tpm_crb.c
+++ b/hw/tpm/tpm_crb.c
@@ -19,8 +19,6 @@
 #include "qemu/module.h"
 #include "qapi/error.h"
 #include "exec/address-spaces.h"
-
-#include "hw/qdev-core.h"
 #include "hw/qdev-properties.h"
 #include "hw/pci/pci_ids.h"
 #include "hw/acpi/tpm.h"

diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c
index 774d12a5e114bb98e5680db160448b68c228f151..7aaf9b946d464ba05a74a87576d7c621735fc731 100644 (file)
--- a/hw/tpm/tpm_tis.c
+++ b/hw/tpm/tpm_tis.c
@@ -30,6 +30,7 @@
 
 #include "hw/acpi/tpm.h"
 #include "hw/pci/pci_ids.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "sysemu/tpm_backend.h"
 #include "tpm_int.h"

diff --git a/hw/tpm/tpm_util.c b/hw/tpm/tpm_util.c
index ee41757ea2c195c55c661c5d803bef77ba61921d..62b091f0c0b6107f605f96e3438ed56cffea2939 100644 (file)
--- a/hw/tpm/tpm_util.c
+++ b/hw/tpm/tpm_util.c
@@ -26,8 +26,8 @@
 #include "tpm_util.h"
 #include "tpm_int.h"
 #include "exec/memory.h"
+#include "hw/qdev-properties.h"
 #include "sysemu/tpm_backend.h"
-#include "hw/qdev.h"
 #include "trace.h"
 
 /* tpm backend property */

diff --git a/hw/usb/bus.c b/hw/usb/bus.c
index be18221ac6426ecd820ca6ccbe8f7b318a7ba48f..a6522f54293147a6d156830a41932800f21245ab 100644 (file)
--- a/hw/usb/bus.c
+++ b/hw/usb/bus.c
@@ -1,6 +1,6 @@
 #include "qemu/osdep.h"
+#include "hw/qdev-properties.h"
 #include "hw/usb.h"
-#include "hw/qdev.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"

diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c
index e20f8ed293336362881b9432a296457991466f79..291e41db8a1eccc8947a7fe4e16ab2b245bc7bf8 100644 (file)
--- a/hw/usb/ccid-card-emulated.c
+++ b/hw/usb/ccid-card-emulated.c
@@ -33,6 +33,7 @@
 #include "qemu/main-loop.h"
 #include "qemu/module.h"
 #include "ccid.h"
+#include "hw/qdev-properties.h"
 #include "qapi/error.h"
 
 #define DPRINTF(card, lvl, fmt, ...) \

diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c
index 9e42547fc8b7fab92b1e30ace2f3001ad020f9fa..267ed9a8a01fae23db98fdd81bdfa4ddb074f3f2 100644 (file)
--- a/hw/usb/ccid-card-passthru.c
+++ b/hw/usb/ccid-card-passthru.c
@@ -13,6 +13,7 @@
 #include "qemu/units.h"
 #include <libcacard.h>
 #include "chardev/char-fe.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"

diff --git a/hw/usb/ccid.h b/hw/usb/ccid.h
index 3920733f1331b3ea0a430aefd44bc49a144e0152..bb2fdbfff3c6b6b336b4c2afaa152c8276a71aed 100644 (file)
--- a/hw/usb/ccid.h
+++ b/hw/usb/ccid.h
@@ -10,7 +10,7 @@
 #ifndef CCID_H
 #define CCID_H
 
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 
 typedef struct CCIDCardState CCIDCardState;
 typedef struct CCIDCardInfo CCIDCardInfo;

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

diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c
index 79b3be3c3fea9b7d5fa85ab61bf15ac2e11340d7..88492f26e64682f73978fa0358b7cf557b1b0e89 100644 (file)
--- a/hw/usb/dev-hid.c
+++ b/hw/usb/dev-hid.c
@@ -32,6 +32,7 @@
 #include "qemu/module.h"
 #include "qemu/timer.h"
 #include "hw/input/hid.h"
+#include "hw/qdev-properties.h"
 
 /* HID interface requests */
 #define GET_REPORT   0xa101

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

diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c
index 2e2a47ff7c7fdb7a356262d2de4e627a6c423131..9846e4b5130be5068273353b7473666c3d1d1a88 100644 (file)
--- a/hw/usb/dev-mtp.c
+++ b/hw/usb/dev-mtp.c
@@ -23,6 +23,7 @@
 #include "qemu/module.h"
 #include "qemu/filemonitor.h"
 #include "trace.h"
+#include "hw/qdev-properties.h"
 #include "hw/usb.h"
 #include "migration/vmstate.h"
 #include "desc.h"

diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c
index db928d7cdfea2a52dfb9548728a33e9d052d81f5..5de6213cc4e4a0690dc12fef908b832d54fb2543 100644 (file)
--- a/hw/usb/dev-network.c
+++ b/hw/usb/dev-network.c
@@ -25,6 +25,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "hw/qdev-properties.h"
 #include "hw/usb.h"
 #include "migration/vmstate.h"
 #include "desc.h"

diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c
index 039dc4889f7cfc6a5af6dd49c8aec328027dbd41..45cc74128ac923ab842c362132eb42c77b6cee0d 100644 (file)
--- a/hw/usb/dev-serial.c
+++ b/hw/usb/dev-serial.c
@@ -13,6 +13,7 @@
 #include "qemu/cutils.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"
+#include "hw/qdev-properties.h"
 #include "hw/usb.h"
 #include "migration/vmstate.h"
 #include "desc.h"

diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c
index 57a0cbcae76d72eefa55c3c62152bb731c2c7d50..4568db2568ceb24afb0349a9cc9b5ee75ecd5f5d 100644 (file)
--- a/hw/usb/dev-smartcard-reader.c
+++ b/hw/usb/dev-smartcard-reader.c
@@ -40,6 +40,7 @@
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"
+#include "hw/qdev-properties.h"
 #include "hw/usb.h"
 #include "migration/vmstate.h"
 #include "desc.h"

diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c
index 8bc5d8728a4d0a643ade7ca6f6d763a1e028780d..854519348882a0bd823bfe73dfbe9d489ce5a529 100644 (file)
--- a/hw/usb/dev-storage.c
+++ b/hw/usb/dev-storage.c
@@ -15,6 +15,7 @@
 #include "qemu/config-file.h"
 #include "hw/usb.h"
 #include "desc.h"
+#include "hw/qdev-properties.h"
 #include "hw/scsi/scsi.h"
 #include "ui/console.h"
 #include "migration/vmstate.h"

diff --git a/hw/usb/dev-uas.c b/hw/usb/dev-uas.c
index c7d215d4efe0364b93af2ebd0e2edde4cd444d2b..6d6d1073b90776d075b6ec7de8ecb2dd8c9435b0 100644 (file)
--- a/hw/usb/dev-uas.c
+++ b/hw/usb/dev-uas.c
@@ -20,6 +20,7 @@
 #include "hw/usb.h"
 #include "migration/vmstate.h"
 #include "desc.h"
+#include "hw/qdev-properties.h"
 #include "hw/scsi/scsi.h"
 #include "scsi/constants.h"
 

diff --git a/hw/usb/hcd-ehci-pci.c b/hw/usb/hcd-ehci-pci.c
index 7232dee882af895ff055cfc5178e978644c624fe..5b9a8d3dc1da5890144cec4b126d61b24cfa14a4 100644 (file)
--- a/hw/usb/hcd-ehci-pci.c
+++ b/hw/usb/hcd-ehci-pci.c
@@ -16,6 +16,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "hw/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 9a509f3b089a5f5702c37911dcaf0ad899d10993..020211fd10746ca86a1785e0fa3e58924c132ca3 100644 (file)
--- a/hw/usb/hcd-ehci-sysbus.c
+++ b/hw/usb/hcd-ehci-sysbus.c
@@ -16,6 +16,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "hw/qdev-properties.h"
 #include "hw/usb/hcd-ehci.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"

diff --git a/hw/usb/hcd-ohci-pci.c b/hw/usb/hcd-ohci-pci.c
index 25b0ced8045d467be7cda161b54b3c8d33160347..c052f10521c452dd67fb2d213f789cab12d2b936 100644 (file)
--- a/hw/usb/hcd-ohci-pci.c
+++ b/hw/usb/hcd-ohci-pci.c
@@ -26,6 +26,7 @@
 #include "hw/pci/pci.h"
 #include "hw/sysbus.h"
 #include "hw/qdev-dma.h"
+#include "hw/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 94b3410d3c55a78e4554ba4aa29f6a90f424e52c..145ee21fd6aeffdaa6351332f00566fbf7f75f39 100644 (file)
--- a/hw/usb/hcd-ohci.c
+++ b/hw/usb/hcd-ohci.c
@@ -34,6 +34,7 @@
 #include "migration/vmstate.h"
 #include "hw/sysbus.h"
 #include "hw/qdev-dma.h"
+#include "hw/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 7c6edd17b4e5ba0775baa8f8e05587769051e7aa..23507ad3b5204a919fe9f8411b6e5cef113e552d 100644 (file)
--- a/hw/usb/hcd-uhci.c
+++ b/hw/usb/hcd-uhci.c
@@ -31,6 +31,7 @@
 #include "hw/usb/uhci-regs.h"
 #include "migration/vmstate.h"
 #include "hw/pci/pci.h"
+#include "hw/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 aba3716875d32cbcb60447896786dd41621b005f..05fb3f54b3d9e1658f1de967c9f67f74b084f654 100644 (file)
--- a/hw/usb/hcd-xhci-nec.c
+++ b/hw/usb/hcd-xhci-nec.c
@@ -23,6 +23,7 @@
 #include "hw/usb.h"
 #include "qemu/module.h"
 #include "hw/pci/pci.h"
+#include "hw/qdev-properties.h"
 
 #include "hcd-xhci.h"
 

diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index d60ad895a39f62056483e6bda1bc35fbf4b87edb..f698224c8a06adf941405b2cfaafe97406faf8ed 100644 (file)
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -26,6 +26,7 @@
 #include "hw/usb.h"
 #include "migration/vmstate.h"
 #include "hw/pci/pci.h"
+#include "hw/qdev-properties.h"
 #include "hw/pci/msi.h"
 #include "hw/pci/msix.h"
 #include "trace.h"

diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c
index c0434872984bf7a31718bc6fa2e89ed038e4cffd..80fd1e9a80db7c9a0d1485949aa7341851073e6d 100644 (file)
--- a/hw/usb/host-libusb.c
+++ b/hw/usb/host-libusb.c
@@ -48,6 +48,7 @@
 #include "sysemu/sysemu.h"
 #include "trace.h"
 
+#include "hw/qdev-properties.h"
 #include "hw/usb.h"
 
 /* ------------------------------------------------------------------------ */

diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index 84ec3d52197339c381995556d60b25d28555d5af..8db2c68a1e98fc5fc942bbbacbbf9c8fe3910102 100644 (file)
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -40,6 +40,7 @@
 #include <usbredirparser.h>
 #include <usbredirfilter.h>
 
+#include "hw/qdev-properties.h"
 #include "hw/usb.h"
 #include "migration/qemu-file-types.h"
 #include "migration/vmstate.h"

diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c
index 2bfc4020377be59389bdb7ac1b1e505fde682056..d53453aad623b9a9b55f8b26d776a03634f0c884 100644 (file)
--- a/hw/vfio/ap.c
+++ b/hw/vfio/ap.c
@@ -26,6 +26,7 @@
 #include "kvm_s390x.h"
 #include "migration/vmstate.h"
 #include "sysemu/sysemu.h"
+#include "hw/qdev-properties.h"
 #include "hw/s390x/ap-bridge.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c
index c78a85a864b3bd1b00dcf0a1b9e2a4ad1cbe4cca..6863f6c69fd922d021ff04327875e6d45e68e224 100644 (file)
--- a/hw/vfio/ccw.c
+++ b/hw/vfio/ccw.c
@@ -25,6 +25,7 @@
 #include "hw/vfio/vfio-common.h"
 #include "hw/s390x/s390-ccw.h"
 #include "hw/s390x/vfio-ccw.h"
+#include "hw/qdev-properties.h"
 #include "hw/s390x/ccw-device.h"
 #include "exec/address-spaces.h"
 #include "qemu/error-report.h"

diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c
index 62d765a4eaed0491d9416e6148aec5e8f50d1a1d..f71aace156dc2281e6b193599a0f9429799f95bb 100644 (file)
--- a/hw/vfio/pci-quirks.c
+++ b/hw/vfio/pci-quirks.c
@@ -21,6 +21,7 @@
 #include <sys/ioctl.h>
 #include "hw/hw.h"
 #include "hw/nvram/fw_cfg.h"
+#include "hw/qdev-properties.h"
 #include "pci.h"
 #include "trace.h"
 

diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index ab3ee2ca7ac9d5fc0cd55137379cf6d946dd77e5..8337af84340efc29485d8512c6563fc24b8de66f 100644 (file)
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -26,6 +26,7 @@
 #include "hw/pci/msi.h"
 #include "hw/pci/msix.h"
 #include "hw/pci/pci_bridge.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qemu/error-report.h"
 #include "qemu/main-loop.h"

diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c
index ff5f805d68a9cea15c5278379b5c16cb68db1969..d14f6b4a7a0285f9a64ea0f18cbcbcc74a0b386a 100644 (file)
--- a/hw/vfio/platform.c
+++ b/hw/vfio/platform.c
@@ -33,6 +33,7 @@
 #include "trace.h"
 #include "hw/irq.h"
 #include "hw/platform-bus.h"
+#include "hw/qdev-properties.h"
 #include "sysemu/kvm.h"
 
 /*

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

diff --git a/hw/virtio/vhost-user-blk-pci.c b/hw/virtio/vhost-user-blk-pci.c
index ed81614d43bacebbaf33ca0e240aab1a928db601..1dc834a3ff153719100cd0fca89193cd606d76c8 100644 (file)
--- a/hw/virtio/vhost-user-blk-pci.c
+++ b/hw/virtio/vhost-user-blk-pci.c
@@ -22,6 +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 "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"

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

diff --git a/hw/virtio/vhost-vsock-pci.c b/hw/virtio/vhost-vsock-pci.c
index c06c9a83b9637697f216b9136ccb6b897ea54912..4ca097ffff5a8569245332800ba8df9892ad56ea 100644 (file)
--- a/hw/virtio/vhost-vsock-pci.c
+++ b/hw/virtio/vhost-vsock-pci.c
@@ -14,6 +14,7 @@
 #include "qemu/osdep.h"
 
 #include "virtio-pci.h"
+#include "hw/qdev-properties.h"
 #include "hw/virtio/vhost-vsock.h"
 #include "qemu/module.h"
 

diff --git a/hw/virtio/vhost-vsock.c b/hw/virtio/vhost-vsock.c
index 0371493197fd529a086b9ceaf2e182c95dd463df..f5744363a8a9847d81f6d5f72671e5a67355a787 100644 (file)
--- a/hw/virtio/vhost-vsock.c
+++ b/hw/virtio/vhost-vsock.c
@@ -18,6 +18,7 @@
 #include "hw/virtio/virtio-bus.h"
 #include "hw/virtio/virtio-access.h"
 #include "qemu/error-report.h"
+#include "hw/qdev-properties.h"
 #include "hw/virtio/vhost-vsock.h"
 #include "qemu/iov.h"
 #include "qemu/module.h"

diff --git a/hw/virtio/virtio-9p-pci.c b/hw/virtio/virtio-9p-pci.c
index 29c3712febea4223fb54e41fec60595a79406778..22a183cca7e5292f2c90e7938e4d9326c6993105 100644 (file)
--- a/hw/virtio/virtio-9p-pci.c
+++ b/hw/virtio/virtio-9p-pci.c
@@ -17,6 +17,7 @@
 
 #include "virtio-pci.h"
 #include "hw/9pfs/virtio-9p.h"
+#include "hw/qdev-properties.h"
 #include "qemu/module.h"
 
 /*

diff --git a/hw/virtio/virtio-balloon-pci.c b/hw/virtio/virtio-balloon-pci.c
index 7393435a984f4de0e0b853cd2497065e8e2c8d32..69ca0579110f66bc70464caadbac67eab4844a3e 100644 (file)
--- a/hw/virtio/virtio-balloon-pci.c
+++ b/hw/virtio/virtio-balloon-pci.c
@@ -15,6 +15,7 @@
 #include "qemu/osdep.h"
 
 #include "virtio-pci.h"
+#include "hw/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 25de15430710065d7a8da3c2b6b2531f1b64b235..40b04f518028e10e69611e5989e1606e5d004afb 100644 (file)
--- a/hw/virtio/virtio-balloon.c
+++ b/hw/virtio/virtio-balloon.c
@@ -19,6 +19,7 @@
 #include "qemu/timer.h"
 #include "hw/virtio/virtio.h"
 #include "hw/mem/pc-dimm.h"
+#include "hw/qdev-properties.h"
 #include "sysemu/balloon.h"
 #include "hw/virtio/virtio-balloon.h"
 #include "exec/address-spaces.h"

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

diff --git a/hw/virtio/virtio-bus.c b/hw/virtio/virtio-bus.c
index 207e9559965f992ffa538aa67a889832821be8a4..b2c804292ea711ae42598be6a563f8891c21def2 100644 (file)
--- a/hw/virtio/virtio-bus.c
+++ b/hw/virtio/virtio-bus.c
@@ -26,7 +26,6 @@
 #include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "qapi/error.h"
-#include "hw/qdev.h"
 #include "hw/virtio/virtio-bus.h"
 #include "hw/virtio/virtio.h"
 #include "exec/address-spaces.h"

diff --git a/hw/virtio/virtio-crypto-pci.c b/hw/virtio/virtio-crypto-pci.c
index 91d4446080bbad36079a4b2a6befc4ec8a984b77..d853dc460cc5144a8735b3d332b635b9c2b36135 100644 (file)
--- a/hw/virtio/virtio-crypto-pci.c
+++ b/hw/virtio/virtio-crypto-pci.c
@@ -14,6 +14,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/pci/pci.h"
+#include "hw/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 dbfaee6d7c61894aacef4467670ecef23f9953e6..6d42f95a890b7a58f8ba0bc75eae4e4c6bc2c2f7 100644 (file)
--- a/hw/virtio/virtio-crypto.c
+++ b/hw/virtio/virtio-crypto.c
@@ -15,12 +15,12 @@
 #include "qemu/iov.h"
 #include "qemu/main-loop.h"
 #include "qemu/module.h"
-#include "hw/qdev.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 
 #include "hw/virtio/virtio.h"
 #include "hw/virtio/virtio-crypto.h"
+#include "hw/qdev-properties.h"
 #include "hw/virtio/virtio-access.h"
 #include "standard-headers/linux/virtio_ids.h"
 #include "sysemu/cryptodev-vhost.h"

diff --git a/hw/virtio/virtio-input-pci.c b/hw/virtio/virtio-input-pci.c
index ad7774e93eab2e46375c3eb65dc648f9e49e4a70..80b1172c90b0d37cb8f23b650069fd39544e576f 100644 (file)
--- a/hw/virtio/virtio-input-pci.c
+++ b/hw/virtio/virtio-input-pci.c
@@ -9,6 +9,7 @@
 #include "qemu/osdep.h"
 
 #include "virtio-pci.h"
+#include "hw/qdev-properties.h"
 #include "hw/virtio/virtio-input.h"
 #include "qemu/module.h"
 

diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c
index 3dc525dea4f2d0fb51bc2ca23231972fe7f289df..eccc795f288f69c91a1186e17ef35aa091cbb28e 100644 (file)
--- a/hw/virtio/virtio-mmio.c
+++ b/hw/virtio/virtio-mmio.c
@@ -22,6 +22,7 @@
 #include "qemu/osdep.h"
 #include "standard-headers/linux/virtio_mmio.h"
 #include "hw/irq.h"
+#include "hw/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 5df36f26bf0848e6f4290b7691f81f2d34e0b2ee..f670aed0a77b47da99fdf02440dd9ddb47add384 100644 (file)
--- a/hw/virtio/virtio-net-pci.c
+++ b/hw/virtio/virtio-net-pci.c
@@ -17,6 +17,7 @@
 
 #include "qemu/osdep.h"
 
+#include "hw/qdev-properties.h"
 #include "hw/virtio/virtio-net.h"
 #include "virtio-pci.h"
 #include "qapi/error.h"

diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 1117f2347b6596787cc93280e7350e72653385e9..8babd92e59db9a467061500fd20fe17b25d2822c 100644 (file)
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -22,6 +22,7 @@
 #include "migration/qemu-file-types.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_bus.h"
+#include "hw/qdev-properties.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"

diff --git a/hw/virtio/virtio-pmem.c b/hw/virtio/virtio-pmem.c
index ca487f63d2124559dc7abbfa8d26c51bad64c280..ff1a2ddb36d470ce76f60d79b078e761800a5474 100644 (file)
--- a/hw/virtio/virtio-pmem.c
+++ b/hw/virtio/virtio-pmem.c
@@ -17,6 +17,7 @@
 #include "qemu/error-report.h"
 #include "qemu/main-loop.h"
 #include "hw/virtio/virtio-pmem.h"
+#include "hw/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.c b/hw/virtio/virtio-rng.c
index db6d1d945497705526e1867fa56ed991a3fdc8d5..34b4619fd3610f5d27103caf4a11829b41a21cf3 100644 (file)
--- a/hw/virtio/virtio-rng.c
+++ b/hw/virtio/virtio-rng.c
@@ -13,8 +13,8 @@
 #include "qapi/error.h"
 #include "qemu/iov.h"
 #include "qemu/module.h"
-#include "hw/qdev.h"
 #include "hw/virtio/virtio.h"
+#include "hw/qdev-properties.h"
 #include "hw/virtio/virtio-rng.h"
 #include "sysemu/rng.h"
 #include "qom/object_interfaces.h"

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

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

diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index f4c83379303e1a66878ddd00b67c237b0d24a488..721dcccc9682fbff8fc05a6e70dbb441567a6564 100644 (file)
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -23,6 +23,7 @@
 #include "migration/qemu-file-types.h"
 #include "qemu/atomic.h"
 #include "hw/virtio/virtio-bus.h"
+#include "hw/qdev-properties.h"
 #include "hw/virtio/virtio-access.h"
 #include "sysemu/dma.h"
 

diff --git a/hw/watchdog/cmsdk-apb-watchdog.c b/hw/watchdog/cmsdk-apb-watchdog.c
index 3140e919591d84b05fa4a41eda00087430013c1a..6bf43f943fb14fa5c896f4ebb7b0ac1db655b9d6 100644 (file)
--- a/hw/watchdog/cmsdk-apb-watchdog.c
+++ b/hw/watchdog/cmsdk-apb-watchdog.c
@@ -29,6 +29,7 @@
 #include "sysemu/watchdog.h"
 #include "hw/sysbus.h"
 #include "hw/irq.h"
+#include "hw/qdev-properties.h"
 #include "hw/registerfields.h"
 #include "hw/watchdog/cmsdk-apb-watchdog.h"
 #include "migration/vmstate.h"

diff --git a/hw/watchdog/wdt_aspeed.c b/hw/watchdog/wdt_aspeed.c
index 49415f132d462422a5c0a5750407a01cccf9505f..9b932134172ca54e08d5bee845f047b8e6e7d201 100644 (file)
--- a/hw/watchdog/wdt_aspeed.c
+++ b/hw/watchdog/wdt_aspeed.c
@@ -15,6 +15,7 @@
 #include "qemu/timer.h"
 #include "sysemu/watchdog.h"
 #include "hw/misc/aspeed_scu.h"
+#include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "hw/watchdog/wdt_aspeed.h"
 #include "migration/vmstate.h"

diff --git a/hw/xen/xen-bus.c b/hw/xen/xen-bus.c
index 3f39a894dac64d0952e90d63e289f46fad79a3fe..e40500242d7995e1c58b77d009551ded4e7e52a1 100644 (file)
--- a/hw/xen/xen-bus.c
+++ b/hw/xen/xen-bus.c
@@ -9,6 +9,7 @@
 #include "qemu/main-loop.h"
 #include "qemu/module.h"
 #include "qemu/uuid.h"
+#include "hw/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 47a7c9760a2cc747f35b7c432b5f41fc0feef5c9..4412d7aa7639c00b6f54bdd5f5324d6246f73998 100644 (file)
--- a/hw/xen/xen-legacy-backend.c
+++ b/hw/xen/xen-legacy-backend.c
@@ -27,6 +27,7 @@
 
 #include "hw/sysbus.h"
 #include "hw/boards.h"
+#include "hw/qdev-properties.h"
 #include "qemu/log.h"
 #include "qemu/main-loop.h"
 #include "qapi/error.h"

diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c
index 5539d56c3a22379eed66780e3f9624806cbeebe7..8fbaf2eae9fe9758bf113891f098fe73c76d978f 100644 (file)
--- a/hw/xen/xen_pt.c
+++ b/hw/xen/xen_pt.c
@@ -57,6 +57,7 @@
 #include <sys/ioctl.h>
 
 #include "hw/pci/pci.h"
+#include "hw/qdev-properties.h"
 #include "hw/xen/xen.h"
 #include "hw/i386/pc.h"
 #include "hw/xen/xen-legacy-backend.h"

diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c
index 83103974abc3467c2de584dd2c22bae541d98675..62119d255531a78ab8d779dbd6cf255857c40d74 100644 (file)
--- a/hw/xtensa/xtfpga.c
+++ b/hw/xtensa/xtfpga.c
@@ -32,6 +32,7 @@
 #include "sysemu/sysemu.h"
 #include "hw/boards.h"
 #include "hw/loader.h"
+#include "hw/qdev-properties.h"
 #include "elf.h"
 #include "exec/memory.h"
 #include "exec/address-spaces.h"

diff --git a/include/hw/acpi/acpi_dev_interface.h b/include/hw/acpi/acpi_dev_interface.h
index 6465072b7d82b8d3b0bac34708f853a3ccca2eaf..0ba90effd22db2c01550c5e1755efd358f903f70 100644 (file)
--- a/include/hw/acpi/acpi_dev_interface.h
+++ b/include/hw/acpi/acpi_dev_interface.h
@@ -4,6 +4,7 @@
 #include "qapi/qapi-types-misc.h"
 #include "qom/object.h"
 #include "hw/boards.h"
+#include "hw/qdev-core.h"
 
 /* These values are part of guest ABI, and can not be changed */
 typedef enum {

diff --git a/include/hw/acpi/vmgenid.h b/include/hw/acpi/vmgenid.h
index 38586ecbdfd07bfad5615c5a49e8cf4137ab6a9d..c49d913f3e0e2395bc6044fa330f4dcd7307e301 100644 (file)
--- a/include/hw/acpi/vmgenid.h
+++ b/include/hw/acpi/vmgenid.h
@@ -2,7 +2,7 @@
 #define ACPI_VMGENID_H
 
 #include "hw/acpi/bios-linker-loader.h"
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 #include "qemu/uuid.h"
 
 #define VMGENID_DEVICE           "vmgenid"

diff --git a/include/hw/audio/pcspk.h b/include/hw/audio/pcspk.h
index 0f5d4f99193d06c21111502a549e715b97d50bd3..632cce9f68f4f023c5eefade78bf182c2dfcb294 100644 (file)
--- a/include/hw/audio/pcspk.h
+++ b/include/hw/audio/pcspk.h
@@ -26,6 +26,7 @@
 #define HW_PCSPK_H
 
 #include "hw/isa/isa.h"
+#include "hw/qdev-properties.h"
 
 #define TYPE_PC_SPEAKER "isa-pcspk"
 

diff --git a/include/hw/boards.h b/include/hw/boards.h
index 3a0be3131ac5fa1928715b4067c6d9130c833b25..67e551636a194cac7087040c78f67b5e00b1b17b 100644 (file)
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -6,7 +6,6 @@
 #include "exec/memory.h"
 #include "sysemu/blockdev.h"
 #include "sysemu/accel.h"
-#include "hw/qdev.h"
 #include "qapi/qapi-types-machine.h"
 #include "qemu/module.h"
 #include "qom/object.h"

diff --git a/include/hw/char/cadence_uart.h b/include/hw/char/cadence_uart.h
index e1cf33e94cccd0cd63f98fc524fbdb3c24147170..47cec956c4b9238fe2435f9e9a4676598bbbc17c 100644 (file)
--- a/include/hw/char/cadence_uart.h
+++ b/include/hw/char/cadence_uart.h
@@ -19,6 +19,7 @@
 #ifndef CADENCE_UART_H
 #define CADENCE_UART_H
 
+#include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "chardev/char-fe.h"
 #include "qemu/timer.h"

diff --git a/include/hw/char/cmsdk-apb-uart.h b/include/hw/char/cmsdk-apb-uart.h
index c41fba9a272b8c785ddc91748b9c2372a6645f1c..3c1b53db4ec931949d71243ce12618405df7a509 100644 (file)
--- a/include/hw/char/cmsdk-apb-uart.h
+++ b/include/hw/char/cmsdk-apb-uart.h
@@ -12,6 +12,7 @@
 #ifndef CMSDK_APB_UART_H
 #define CMSDK_APB_UART_H
 
+#include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "chardev/char-fe.h"
 

diff --git a/include/hw/char/lm32_juart.h b/include/hw/char/lm32_juart.h
index e7c6fb5a3bd70eb657ed3943ba43bcab2a402494..6fce2783266f55d3c967db13d8a5572becd4237a 100644 (file)
--- a/include/hw/char/lm32_juart.h
+++ b/include/hw/char/lm32_juart.h
@@ -1,7 +1,7 @@
 #ifndef QEMU_HW_CHAR_LM32_JUART_H
 #define QEMU_HW_CHAR_LM32_JUART_H
 
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 
 #define TYPE_LM32_JUART "lm32-juart"
 

diff --git a/include/hw/char/pl011.h b/include/hw/char/pl011.h
index dad3cf2912116e29795cce5cef5781204cd07415..14187165c613ff5743c6416099429ab3021ce23e 100644 (file)
--- a/include/hw/char/pl011.h
+++ b/include/hw/char/pl011.h
@@ -15,6 +15,7 @@
 #ifndef HW_PL011_H
 #define HW_PL011_H
 
+#include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "chardev/char-fe.h"
 

diff --git a/include/hw/char/xilinx_uartlite.h b/include/hw/char/xilinx_uartlite.h
index 99d8bbf40533f9a45f57f70ec971159018a1983b..194e2feafec9da5e6edc6d8e83ec1f3b27f85d49 100644 (file)
--- a/include/hw/char/xilinx_uartlite.h
+++ b/include/hw/char/xilinx_uartlite.h
@@ -15,6 +15,7 @@
 #ifndef XILINX_UARTLITE_H
 #define XILINX_UARTLITE_H
 
+#include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 
 static inline DeviceState *xilinx_uartlite_create(hwaddr addr,

diff --git a/include/hw/cpu/cluster.h b/include/hw/cpu/cluster.h
index 01c1e50cd2215417146814e2a3f9859ba154043f..a616501a55d2aef22c41ee512541ca8dfb550fe3 100644 (file)
--- a/include/hw/cpu/cluster.h
+++ b/include/hw/cpu/cluster.h
@@ -20,7 +20,7 @@
 #ifndef HW_CPU_CLUSTER_H
 #define HW_CPU_CLUSTER_H
 
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 
 /*
  * CPU Cluster type

diff --git a/include/hw/cpu/core.h b/include/hw/cpu/core.h
index b7470644d83758c70e08bc45eb8738f202d8fd79..555ad831bb3d5170213237a36eba08cf0d561639 100644 (file)
--- a/include/hw/cpu/core.h
+++ b/include/hw/cpu/core.h
@@ -9,7 +9,7 @@
 #ifndef HW_CPU_CORE_H
 #define HW_CPU_CORE_H
 
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 
 #define TYPE_CPU_CORE "cpu-core"
 

diff --git a/include/hw/cris/etraxfs.h b/include/hw/cris/etraxfs.h
index 494222d315fe30d91bbe3eb1825b12638ab0e824..aa146a2cd819f5cb3c8ce91d68c175fefba03d58 100644 (file)
--- a/include/hw/cris/etraxfs.h
+++ b/include/hw/cris/etraxfs.h
@@ -27,6 +27,7 @@
 
 #include "net/net.h"
 #include "hw/cris/etraxfs_dma.h"
+#include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 
 /* Instantiate an ETRAXFS Ethernet MAC.  */

diff --git a/include/hw/display/milkymist_tmu2.h b/include/hw/display/milkymist_tmu2.h
index 1fd978dcc55c98ef8bf371e3f92348ac88099e83..e3394ff158a6f39a8810acaaaa732cd1ec943e4c 100644 (file)
--- a/include/hw/display/milkymist_tmu2.h
+++ b/include/hw/display/milkymist_tmu2.h
@@ -28,7 +28,7 @@
 #define HW_DISPLAY_MILKYMIST_TMU2_H
 
 #include "exec/hwaddr.h"
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 
 #if defined(CONFIG_X11) && defined(CONFIG_OPENGL)
 DeviceState *milkymist_tmu2_create(hwaddr base, qemu_irq irq);

diff --git a/include/hw/i2c/i2c.h b/include/hw/i2c/i2c.h
index 75c5bd638bb986528c65e237ec2661c0091d799d..41172115652b8219811eb6fe4835f8a3a32e8a22 100644 (file)
--- a/include/hw/i2c/i2c.h
+++ b/include/hw/i2c/i2c.h
@@ -1,7 +1,7 @@
 #ifndef QEMU_I2C_H
 #define QEMU_I2C_H
 
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 
 /* The QEMU I2C implementation only supports simple transfers that complete
    immediately.  It does not support slave devices that need to be able to

diff --git a/include/hw/i386/intel_iommu.h b/include/hw/i386/intel_iommu.h
index 12f3d266e2229b914cce2bbdb3c449624c42151f..66b931e52628aaaec8bb0b3921d142b081fabff4 100644 (file)
--- a/include/hw/i386/intel_iommu.h
+++ b/include/hw/i386/intel_iommu.h
@@ -21,7 +21,7 @@
 
 #ifndef INTEL_IOMMU_H
 #define INTEL_IOMMU_H
-#include "hw/qdev.h"
+
 #include "sysemu/dma.h"
 #include "hw/i386/x86-iommu.h"
 #include "hw/i386/ioapic.h"

diff --git a/include/hw/input/adb.h b/include/hw/input/adb.h
index f99d478252257fce50eeef607b02ab5cc9e04a4f..b7b32e2b167170e4108cf50ce66a6ad0c296e572 100644 (file)
--- a/include/hw/input/adb.h
+++ b/include/hw/input/adb.h
@@ -26,7 +26,7 @@
 #ifndef ADB_H
 #define ADB_H
 
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 
 #define MAX_ADB_DEVICES 16
 

diff --git a/include/hw/ipack/ipack.h b/include/hw/ipack/ipack.h
index e33e032ced9ffe32f422a1101d1993ff6665f2a4..1c07969bc98a9e1efef444c3fff4edb8782ccb5b 100644 (file)
--- a/include/hw/ipack/ipack.h
+++ b/include/hw/ipack/ipack.h
@@ -11,7 +11,7 @@
 #ifndef QEMU_IPACK_H
 #define QEMU_IPACK_H
 
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 
 typedef struct IPackBus IPackBus;
 

diff --git a/include/hw/ipmi/ipmi.h b/include/hw/ipmi/ipmi.h
index 011faf22e9bac64d17de2f7928b33fcd8999c76e..70871da0a7e0f6ff67ba6656f2273869ee2a802a 100644 (file)
--- a/include/hw/ipmi/ipmi.h
+++ b/include/hw/ipmi/ipmi.h
@@ -26,7 +26,7 @@
 #define HW_IPMI_H
 
 #include "exec/memory.h"
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 
 #define MAX_IPMI_MSG_SIZE 300
 

diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h
index e62ac91c198700e960ccdaaf5c6f55025a47c0ac..018ada4f6f6a266555fa50659195f418602bed51 100644 (file)
--- a/include/hw/isa/isa.h
+++ b/include/hw/isa/isa.h
@@ -5,7 +5,7 @@
 
 #include "exec/memory.h"
 #include "exec/ioport.h"
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 
 #define ISA_NUM_IRQS 16
 

diff --git a/include/hw/mem/memory-device.h b/include/hw/mem/memory-device.h
index 2ada6e7bde02827ed71f2fc19175f4ed14f2a70b..04476acb8fa60b218e8f0016319fabfd6cc82a0f 100644 (file)
--- a/include/hw/mem/memory-device.h
+++ b/include/hw/mem/memory-device.h
@@ -13,9 +13,9 @@
 #ifndef MEMORY_DEVICE_H
 #define MEMORY_DEVICE_H
 
+#include "hw/qdev-core.h"
 #include "qapi/qapi-types-misc.h"
 #include "qom/object.h"
-#include "hw/qdev.h"
 
 #define TYPE_MEMORY_DEVICE "memory-device"
 

diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h
index 01436b9f5010c56c872446279487c866fa0e0872..66dee284ace770789413ed7a50bfab39e0f8e977 100644 (file)
--- a/include/hw/mem/pc-dimm.h
+++ b/include/hw/mem/pc-dimm.h
@@ -18,7 +18,7 @@
 
 #include "exec/memory.h"
 #include "sysemu/hostmem.h"
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 #include "hw/boards.h"
 
 #define TYPE_PC_DIMM "pc-dimm"

diff --git a/include/hw/misc/auxbus.h b/include/hw/misc/auxbus.h
index ee0ca3dd515d8c83e8f9dcc8535bbb9dff30d695..a539a98c4b67f7f849bd68807b396dd67793d7bf 100644 (file)
--- a/include/hw/misc/auxbus.h
+++ b/include/hw/misc/auxbus.h
@@ -26,7 +26,7 @@
 #define HW_MISC_AUXBUS_H
 
 #include "exec/memory.h"
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 
 typedef struct AUXBus AUXBus;
 typedef struct AUXSlave AUXSlave;

diff --git a/include/hw/misc/unimp.h b/include/hw/misc/unimp.h
index 2a291ca42dd02a94c5bacde15d02468868a7bf6b..44d87be9032e3b744a20077c6368713b870bf1c3 100644 (file)
--- a/include/hw/misc/unimp.h
+++ b/include/hw/misc/unimp.h
@@ -8,6 +8,7 @@
 #ifndef HW_MISC_UNIMP_H
 #define HW_MISC_UNIMP_H
 
+#include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 
 #define TYPE_UNIMPLEMENTED_DEVICE "unimplemented-device"

diff --git a/include/hw/misc/vmcoreinfo.h b/include/hw/misc/vmcoreinfo.h
index 0d1157805958ebd1b23ea8a9b4172863c29cf557..d4f3d3a91cb06fbb26af21cb8e342747f0eddd98 100644 (file)
--- a/include/hw/misc/vmcoreinfo.h
+++ b/include/hw/misc/vmcoreinfo.h
@@ -12,7 +12,7 @@
 #ifndef VMCOREINFO_H
 #define VMCOREINFO_H
 
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 #include "standard-headers/linux/qemu_fw_cfg.h"
 
 #define VMCOREINFO_DEVICE "vmcoreinfo"

diff --git a/include/hw/net/ne2000-isa.h b/include/hw/net/ne2000-isa.h
index 1233928a347ce22eadc6dc619775ddbcb61daafc..eef17a680d0e131c4487f756e19a5ad5ad30ef9c 100644 (file)
--- a/include/hw/net/ne2000-isa.h
+++ b/include/hw/net/ne2000-isa.h
@@ -10,8 +10,8 @@
 #ifndef HW_NET_NE2000_ISA_H
 #define HW_NET_NE2000_ISA_H
 
-#include "hw/qdev.h"
 #include "hw/isa/isa.h"
+#include "hw/qdev-properties.h"
 #include "net/net.h"
 
 #define TYPE_ISA_NE2000 "ne2k_isa"

diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index aaf1b9f70d78251d3c16ea44343c114b3a314a82..1b840e61a24d87ad1c39ef0a474949106a0f4462 100644 (file)
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -1,7 +1,6 @@
 #ifndef QEMU_PCI_H
 #define QEMU_PCI_H
 
-#include "hw/qdev.h"
 #include "exec/memory.h"
 #include "sysemu/dma.h"
 

diff --git a/include/hw/pcmcia.h b/include/hw/pcmcia.h
index 1b4080764f49f34d6afee5ae34eac626f13bd557..ebad7bc5040d01df51f26ef5d08b0c7cae0279f3 100644 (file)
--- a/include/hw/pcmcia.h
+++ b/include/hw/pcmcia.h
@@ -3,7 +3,7 @@
 
 /* PCMCIA/Cardbus */
 
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 
 typedef struct PCMCIASocket {
     qemu_irq irq;

diff --git a/include/hw/ppc/openpic.h b/include/hw/ppc/openpic.h
index 7642a8ea1d7f65060ee512078634be8f028ccd38..ec16897bfb90419a175ae1320f74ef5d1db07465 100644 (file)
--- a/include/hw/ppc/openpic.h
+++ b/include/hw/ppc/openpic.h
@@ -2,7 +2,6 @@
 #define OPENPIC_H
 
 #include "hw/sysbus.h"
-#include "hw/qdev-core.h"
 #include "qom/cpu.h"
 
 #define MAX_CPU     32

diff --git a/include/hw/ppc/spapr_cpu_core.h b/include/hw/ppc/spapr_cpu_core.h
index f9645a72904370381c69d9695565d263bb71d419..35e0a7eead0cc721a3bd4e49d796d229635a05f7 100644 (file)
--- a/include/hw/ppc/spapr_cpu_core.h
+++ b/include/hw/ppc/spapr_cpu_core.h
@@ -9,8 +9,8 @@
 #ifndef HW_SPAPR_CPU_CORE_H
 #define HW_SPAPR_CPU_CORE_H
 
-#include "hw/qdev.h"
 #include "hw/cpu/core.h"
+#include "hw/qdev-core.h"
 #include "target/ppc/cpu-qom.h"
 #include "target/ppc/cpu.h"
 

diff --git a/include/hw/ppc/spapr_drc.h b/include/hw/ppc/spapr_drc.h
index 576c711b86fef498b9aa6a6791c53aaf64d2a4a2..721213d5b0add66991d209ece8a8d690302bdea8 100644 (file)
--- a/include/hw/ppc/spapr_drc.h
+++ b/include/hw/ppc/spapr_drc.h
@@ -16,7 +16,7 @@
 #include <libfdt.h>
 #include "qom/object.h"
 #include "sysemu/sysemu.h"
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 #include "qapi/error.h"
 
 #define TYPE_SPAPR_DR_CONNECTOR "spapr-dr-connector"

diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h
index 457aa98f81540623a7a985900cd7087433a9d84d..f2a8d6a4b4f99b975eb4c051797cbb0cada29a49 100644 (file)
--- a/include/hw/ppc/xics.h
+++ b/include/hw/ppc/xics.h
@@ -29,7 +29,7 @@
 #define XICS_H
 
 #include "exec/memory.h"
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 
 #define XICS_IPI        0x2
 #define XICS_BUID       0x1

diff --git a/include/hw/ppc/xive.h b/include/hw/ppc/xive.h
index 736335174a4cafb07fdc95df83b3bd5e62018f25..9399c77d2d8ad70bb85ab368efdf62d802d713f3 100644 (file)
--- a/include/hw/ppc/xive.h
+++ b/include/hw/ppc/xive.h
@@ -141,7 +141,6 @@
 #define PPC_XIVE_H
 
 #include "sysemu/kvm.h"
-#include "hw/qdev-core.h"
 #include "hw/sysbus.h"
 #include "hw/ppc/xive_regs.h"
 

diff --git a/include/hw/qdev.h b/include/hw/qdev.h
deleted file mode 100644 (file)
index d68991a..0000000
--- a/include/hw/qdev.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef QDEV_H
-#define QDEV_H
-
-#include "hw/qdev-core.h"
-#include "hw/qdev-properties.h"
-
-#endif

diff --git a/include/hw/s390x/event-facility.h b/include/hw/s390x/event-facility.h
index 6cf71cec3803fe19e389423196ec27fcd6433cff..bdc32a3c0917f8379e72fa74ed765be61f9cbaf0 100644 (file)
--- a/include/hw/s390x/event-facility.h
+++ b/include/hw/s390x/event-facility.h
@@ -15,8 +15,8 @@
 #ifndef HW_S390_SCLP_EVENT_FACILITY_H
 #define HW_S390_SCLP_EVENT_FACILITY_H
 
-#include "hw/qdev.h"
 #include "qemu/thread.h"
+#include "hw/qdev-core.h"
 #include "hw/s390x/sclp.h"
 
 /* SCLP event types */

diff --git a/include/hw/s390x/sclp.h b/include/hw/s390x/sclp.h
index f9db243484866f65f8e6f129e06b8f7b6b473e75..c54413b78cf01b274cc249b1409bb36892446a9a 100644 (file)
--- a/include/hw/s390x/sclp.h
+++ b/include/hw/s390x/sclp.h
@@ -15,7 +15,6 @@
 #define HW_S390_SCLP_H
 
 #include "hw/sysbus.h"
-#include "hw/qdev.h"
 #include "target/s390x/cpu-qom.h"
 
 #define SCLP_CMD_CODE_MASK                      0xffff00ff

diff --git a/include/hw/s390x/storage-attributes.h b/include/hw/s390x/storage-attributes.h
index d6403a0a7eda212faac5f0613421487a4ff37f64..4f7c6c0877c3a117387325f44ae4659e3ad2bb3a 100644 (file)
--- a/include/hw/s390x/storage-attributes.h
+++ b/include/hw/s390x/storage-attributes.h
@@ -12,7 +12,7 @@
 #ifndef S390_STORAGE_ATTRIBUTES_H
 #define S390_STORAGE_ATTRIBUTES_H
 
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 #include "monitor/monitor.h"
 
 #define TYPE_S390_STATTRIB "s390-storage_attributes"

diff --git a/include/hw/s390x/storage-keys.h b/include/hw/s390x/storage-keys.h
index 62df48ec06d2d3b18ae3679d5f88ebf7d371b401..3f1ae7e7789bc5b4c33aef14adf3de2d6c4aa1e8 100644 (file)
--- a/include/hw/s390x/storage-keys.h
+++ b/include/hw/s390x/storage-keys.h
@@ -12,7 +12,7 @@
 #ifndef S390_STORAGE_KEYS_H
 #define S390_STORAGE_KEYS_H
 
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 #include "monitor/monitor.h"
 
 #define TYPE_S390_SKEYS "s390-skeys"

diff --git a/include/hw/s390x/tod.h b/include/hw/s390x/tod.h
index d71f4ea8a7995390ff988faa1662483a416e5a6c..4251623f7f1fe0cd2d299e50ba4928072c446ecd 100644 (file)
--- a/include/hw/s390x/tod.h
+++ b/include/hw/s390x/tod.h
@@ -11,7 +11,7 @@
 #ifndef HW_S390_TOD_H
 #define HW_S390_TOD_H
 
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 #include "target/s390x/s390-tod.h"
 
 typedef struct S390TOD {

diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h
index 15a763dc182d5837fe9c7127692eac94f4973274..2bfaad0fe9d0ecbe6365bcdb00fd42b83829ffec 100644 (file)
--- a/include/hw/scsi/scsi.h
+++ b/include/hw/scsi/scsi.h
@@ -1,9 +1,9 @@
 #ifndef QEMU_HW_SCSI_H
 #define QEMU_HW_SCSI_H
 
-#include "hw/qdev.h"
 #include "block/aio.h"
 #include "hw/block/block.h"
+#include "hw/qdev-core.h"
 #include "sysemu/sysemu.h"
 #include "scsi/utils.h"
 #include "qemu/notify.h"

diff --git a/include/hw/sd/sd.h b/include/hw/sd/sd.h
index b865aafc33673f86f3d978d61b642be221de0b86..a84b8e274a32c09dcf7ee951989593e79ebc3a30 100644 (file)
--- a/include/hw/sd/sd.h
+++ b/include/hw/sd/sd.h
@@ -30,7 +30,7 @@
 #ifndef HW_SD_H
 #define HW_SD_H
 
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 
 #define OUT_OF_RANGE           (1 << 31)
 #define ADDRESS_ERROR          (1 << 30)

diff --git a/include/hw/sparc/grlib.h b/include/hw/sparc/grlib.h
index 5606ff0a97b961f4be02215d629177f2848accc6..78b6178fcd827d90ee47c0a10338d18a487eac62 100644 (file)
--- a/include/hw/sparc/grlib.h
+++ b/include/hw/sparc/grlib.h
@@ -25,7 +25,6 @@
 #ifndef GRLIB_H
 #define GRLIB_H
 
-#include "hw/qdev.h"
 #include "hw/sysbus.h"
 
 /* Emulation of GrLib device is base on the GRLIB IP Core User's Manual:

diff --git a/include/hw/ssi/ssi.h b/include/hw/ssi/ssi.h
index 6a0c3c3cdb280d9ca3b971152e217d8a4bbcb430..1107cb89ee14d2989acc77e444885bfb9d060403 100644 (file)
--- a/include/hw/ssi/ssi.h
+++ b/include/hw/ssi/ssi.h
@@ -11,7 +11,7 @@
 #ifndef QEMU_SSI_H
 #define QEMU_SSI_H
 
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 
 typedef struct SSISlave SSISlave;
 typedef struct SSISlaveClass SSISlaveClass;

diff --git a/include/hw/sysbus.h b/include/hw/sysbus.h
index 4c668fbbdc60750129540521d61cc41e5c226bc5..27e80881da03a79417bdeef20c5f11ec5b84512e 100644 (file)
--- a/include/hw/sysbus.h
+++ b/include/hw/sysbus.h
@@ -3,7 +3,7 @@
 
 /* Devices attached directly to the main system bus.  */
 
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 #include "exec/memory.h"
 
 #define QDEV_MAX_MMIO 32

diff --git a/include/hw/timer/cmsdk-apb-timer.h b/include/hw/timer/cmsdk-apb-timer.h
index f21686d26b911cfaadc0d800fd27006f134e344a..e93caccc3c7339baffc3fac11338b6844bba8d14 100644 (file)
--- a/include/hw/timer/cmsdk-apb-timer.h
+++ b/include/hw/timer/cmsdk-apb-timer.h
@@ -12,6 +12,7 @@
 #ifndef CMSDK_APB_TIMER_H
 #define CMSDK_APB_TIMER_H
 
+#include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "hw/ptimer.h"
 

diff --git a/include/hw/timer/i8254.h b/include/hw/timer/i8254.h
index 608b116fcf99542a7275d67f08c1eceef9efe9f7..45cb42571f61a415027dec0a5c78cac381daf983 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.h"
+#include "hw/qdev-properties.h"
 #include "hw/isa/isa.h"
 
 #define PIT_FREQ 1193182

diff --git a/include/hw/usb.h b/include/hw/usb.h
index 96971a4c26ba6c0cc1be9f0afd219adb3774ab64..c24d968a1969cdfb0329aad7b391f9e9f4a5c931 100644 (file)
--- a/include/hw/usb.h
+++ b/include/hw/usb.h
@@ -26,7 +26,7 @@
  */
 
 #include "exec/memory.h"
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 #include "qemu/iov.h"
 #include "qemu/queue.h"
 

diff --git a/include/hw/virtio/vhost-scsi-common.h b/include/hw/virtio/vhost-scsi-common.h
index 54357164f0004673bc3e1f18f62793228dfbdb90..16bf1a73c1675113023af7decaf8ac29e9f76c1d 100644 (file)
--- a/include/hw/virtio/vhost-scsi-common.h
+++ b/include/hw/virtio/vhost-scsi-common.h
@@ -14,7 +14,6 @@
 #ifndef VHOST_SCSI_COMMON_H
 #define VHOST_SCSI_COMMON_H
 
-#include "hw/qdev.h"
 #include "hw/virtio/virtio-scsi.h"
 #include "hw/virtio/vhost.h"
 #include "hw/fw-path-provider.h"

diff --git a/include/hw/virtio/vhost-scsi.h b/include/hw/virtio/vhost-scsi.h
index df5bfdb188e1d4040e177936726a15d91dff3d4a..23252153ff6f4c93c9927fdee01ee5cd3155b2ab 100644 (file)
--- a/include/hw/virtio/vhost-scsi.h
+++ b/include/hw/virtio/vhost-scsi.h
@@ -14,7 +14,6 @@
 #ifndef VHOST_SCSI_H
 #define VHOST_SCSI_H
 
-#include "hw/qdev.h"
 #include "hw/virtio/virtio-scsi.h"
 #include "hw/virtio/vhost.h"
 #include "hw/virtio/vhost-scsi-common.h"

diff --git a/include/hw/virtio/vhost-user-blk.h b/include/hw/virtio/vhost-user-blk.h
index 8dbf11c6f0710885b13f2415d74461cbf74325a8..108bfadeeb550388c864795d62f7edb64af3c3fe 100644 (file)
--- a/include/hw/virtio/vhost-user-blk.h
+++ b/include/hw/virtio/vhost-user-blk.h
@@ -16,7 +16,6 @@
 #define VHOST_USER_BLK_H
 
 #include "standard-headers/linux/virtio_blk.h"
-#include "hw/qdev.h"
 #include "hw/block/block.h"
 #include "chardev/char-fe.h"
 #include "hw/virtio/vhost.h"

diff --git a/include/hw/virtio/vhost-user-scsi.h b/include/hw/virtio/vhost-user-scsi.h
index 1b332ea910e182a1f17fdd8e74c1aa4fc4473718..99ab2f2cc437cb776340fe5baa13f13e85682a68 100644 (file)
--- a/include/hw/virtio/vhost-user-scsi.h
+++ b/include/hw/virtio/vhost-user-scsi.h
@@ -17,7 +17,6 @@
 #ifndef VHOST_USER_SCSI_H
 #define VHOST_USER_SCSI_H
 
-#include "hw/qdev.h"
 #include "hw/virtio/virtio-scsi.h"
 #include "hw/virtio/vhost.h"
 #include "hw/virtio/vhost-user.h"

diff --git a/include/hw/virtio/virtio-bus.h b/include/hw/virtio/virtio-bus.h
index 7fec9dc929f9b801094e2b368ffc734260ba926a..8c9cc25b1655d79aadac719385a9805c3449f12e 100644 (file)
--- a/include/hw/virtio/virtio-bus.h
+++ b/include/hw/virtio/virtio-bus.h
@@ -25,8 +25,8 @@
 #ifndef VIRTIO_BUS_H
 #define VIRTIO_BUS_H
 
-#include "hw/qdev.h"
 #include "sysemu/sysemu.h"
+#include "hw/qdev-core.h"
 #include "hw/virtio/virtio.h"
 
 #define TYPE_VIRTIO_BUS "virtio-bus"

diff --git a/include/hw/virtio/virtio-serial.h b/include/hw/virtio/virtio-serial.h
index 12657a9f39a9576cf98e19a2a1bb457cdcea27eb..ed3e916b68aafea569a7650ef01175710f780b1f 100644 (file)
--- a/include/hw/virtio/virtio-serial.h
+++ b/include/hw/virtio/virtio-serial.h
@@ -17,7 +17,6 @@
 #define QEMU_VIRTIO_SERIAL_H
 
 #include "standard-headers/linux/virtio_console.h"
-#include "hw/qdev.h"
 #include "hw/virtio/virtio.h"
 
 struct virtio_serial_conf {

diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index 7bae09e3ae314da81cfb8f992bdc17d21f425cb1..df40a46d606c02ed92b5243c2aaf0c15e0b80f09 100644 (file)
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -15,8 +15,8 @@
 #define QEMU_VIRTIO_H
 
 #include "exec/memory.h"
+#include "hw/qdev-core.h"
 #include "net/net.h"
-#include "hw/qdev.h"
 #include "sysemu/sysemu.h"
 #include "migration/vmstate.h"
 #include "qemu/event_notifier.h"

diff --git a/include/hw/watchdog/wdt_diag288.h b/include/hw/watchdog/wdt_diag288.h
index 706d96b753c71a9b148205aa62e1388498a9a27e..19d83a0937967d6614a6f57143b612e7ab5cb55c 100644 (file)
--- a/include/hw/watchdog/wdt_diag288.h
+++ b/include/hw/watchdog/wdt_diag288.h
@@ -1,7 +1,7 @@
 #ifndef WDT_DIAG288_H
 #define WDT_DIAG288_H
 
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 
 #define TYPE_WDT_DIAG288 "diag288"
 #define DIAG288(obj) \

diff --git a/include/monitor/qdev.h b/include/monitor/qdev.h
index 084799e4d942607328533826c315cbab992e67bc..eaa947d73a3ca9f301d124ae7585a81d2e2659d4 100644 (file)
--- a/include/monitor/qdev.h
+++ b/include/monitor/qdev.h
@@ -1,8 +1,6 @@
 #ifndef MONITOR_QDEV_H
 #define MONITOR_QDEV_H
 
-#include "hw/qdev-core.h"
-
 /*** monitor commands ***/
 
 void hmp_info_qtree(Monitor *mon, const QDict *qdict);

diff --git a/include/sysemu/accel.h b/include/sysemu/accel.h
index 89ce57e404cae6880737a8dcfea32055703e1dc4..8eb60b870b0299e771ecfaf4907e0c88d6e32829 100644 (file)
--- a/include/sysemu/accel.h
+++ b/include/sysemu/accel.h
@@ -24,7 +24,6 @@
 #define HW_ACCEL_H
 
 #include "qom/object.h"
-#include "hw/qdev-properties.h"
 #include "exec/hwaddr.h"
 
 typedef struct AccelState {

diff --git a/memory.c b/memory.c
index cbf0e5a6ccdf08e0de4288a434208ba86114f5c1..c3486b0f28735a8542e78bbd0ef5fe44c2e88980 100644 (file)
--- a/memory.c
+++ b/memory.c
@@ -32,7 +32,6 @@
 #include "sysemu/sysemu.h"
 #include "sysemu/tcg.h"
 #include "sysemu/accel.h"
-#include "hw/qdev-properties.h"
 #include "hw/boards.h"
 #include "migration/vmstate.h"
 

diff --git a/migration/migration.c b/migration/migration.c
index 85e5d22e32ff40ec39e99777cced7aa48ba31b11..3a6340f602118c792fb4ef3b9f6689f6f2f34e69 100644 (file)
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -47,6 +47,7 @@
 #include "io/channel-buffer.h"
 #include "migration/colo.h"
 #include "hw/boards.h"
+#include "hw/qdev-properties.h"
 #include "monitor/monitor.h"
 #include "net/announce.h"
 

diff --git a/migration/migration.h b/migration/migration.h
index a7882af67aa5bd5595fef0e19f3bdd171d85ada8..b150937180155772bb1eb60245e75bf1fe5ceff8 100644 (file)
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -15,10 +15,10 @@
 #define QEMU_MIGRATION_H
 
 #include "exec/cpu-common.h"
+#include "hw/qdev-core.h"
 #include "qapi/qapi-types-migration.h"
 #include "qemu/thread.h"
 #include "qemu/coroutine_int.h"
-#include "hw/qdev.h"
 #include "io/channel.h"
 #include "net/announce.h"
 

diff --git a/net/net.c b/net/net.c
index 7d4098254fea4b9e8de90bd8b8285a513150c6ce..11b505a6fd43f9f1d35df1e15dab69fe1f8f10ed 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -27,6 +27,7 @@
 #include "net/net.h"
 #include "clients.h"
 #include "hub.h"
+#include "hw/qdev-properties.h"
 #include "net/slirp.h"
 #include "net/eth.h"
 #include "util.h"
@@ -42,7 +43,6 @@
 #include "qemu/cutils.h"
 #include "qemu/config-file.h"
 #include "qemu/ctype.h"
-#include "hw/qdev.h"
 #include "qemu/iov.h"
 #include "qemu/main-loop.h"
 #include "qemu/option.h"

diff --git a/qdev-monitor.c b/qdev-monitor.c
index 58222c2211d2116fda1dd65a4fca3740e6144981..21c1c301d0445d7861679d5dbbf18fda004abe36 100644 (file)
--- a/qdev-monitor.c
+++ b/qdev-monitor.c
@@ -18,7 +18,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev.h"
 #include "hw/sysbus.h"
 #include "monitor/monitor.h"
 #include "monitor/qdev.h"

diff --git a/qom/qom-qmp-cmds.c b/qom/qom-qmp-cmds.c
index e046a0f19035a669f7a7b43159a6be6289a5c7b6..236e8e41dda4ab68b54ece9775037627e9c9a1e2 100644 (file)
--- a/qom/qom-qmp-cmds.c
+++ b/qom/qom-qmp-cmds.c
@@ -14,7 +14,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 #include "qapi/error.h"
 #include "qapi/qapi-commands-qdev.h"
 #include "qapi/qapi-commands-qom.h"

diff --git a/qtest.c b/qtest.c
index 15e27e911fafafeea111b63ce6a3a442170988c5..313821faed02fd34144359fe80e3b693df3024c9 100644 (file)
--- a/qtest.c
+++ b/qtest.c
@@ -15,7 +15,6 @@
 #include "qapi/error.h"
 #include "cpu.h"
 #include "sysemu/qtest.h"
-#include "hw/qdev.h"
 #include "chardev/char-fe.h"
 #include "exec/ioport.h"
 #include "exec/memory.h"

diff --git a/target/tilegx/cpu.c b/target/tilegx/cpu.c
index 69971247f214ddc0fb2444c330833f54be3e2eaa..2b2a7ccc313f15e2bc988a174f534aaa72c3940b 100644 (file)
--- a/target/tilegx/cpu.c
+++ b/target/tilegx/cpu.c
@@ -22,7 +22,6 @@
 #include "qapi/error.h"
 #include "cpu.h"
 #include "qemu/module.h"
-#include "hw/qdev-properties.h"
 #include "linux-user/syscall_defs.h"
 #include "qemu/qemu-print.h"
 #include "exec/exec-all.h"

diff --git a/tests/test-qdev-global-props.c b/tests/test-qdev-global-props.c
index 60231b1372220b267cf3bb0162f873319595e53c..4ed3d06f4e76b02f701c68998620087b3f713193 100644 (file)
--- a/tests/test-qdev-global-props.c
+++ b/tests/test-qdev-global-props.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 
-#include "hw/qdev.h"
+#include "hw/qdev-properties.h"
 #include "qom/object.h"
 #include "qapi/visitor.h"
 

diff --git a/vl.c b/vl.c
index 20328e682c193f8fc67e7cf92bec63317a905e8e..08ef28f100a099ef103d9565ae5639a7e6bf9892 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -25,6 +25,7 @@
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/units.h"
+#include "hw/qdev-properties.h"
 #include "qapi/error.h"
 #include "qemu-version.h"
 #include "qemu/cutils.h"
@@ -65,7 +66,6 @@ int main(int argc, char **argv)
 #include "hw/firmware/smbios.h"
 #include "hw/acpi/acpi.h"
 #include "hw/xen/xen.h"
-#include "hw/qdev.h"
 #include "hw/loader.h"
 #include "monitor/qdev.h"
 #include "sysemu/bt.h"