From: Paolo Bonzini Date: Thu, 27 Nov 2025 07:38:05 +0000 (+0100) Subject: include: move hw/qdev-properties.h to hw/core/ X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78d45220b4e6385c6a90302fbc84fdacb415580c;p=thirdparty%2Fqemu.git include: move hw/qdev-properties.h to hw/core/ Signed-off-by: Paolo Bonzini --- diff --git a/backends/spdm-socket.c b/backends/spdm-socket.c index 6d8f02d3b9..07aea37516 100644 --- a/backends/spdm-socket.c +++ b/backends/spdm-socket.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" #include "system/spdm-socket.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/core/qdev-prop-internal.h" diff --git a/backends/tpm/tpm_util.c b/backends/tpm/tpm_util.c index f2d1739e33..a64e156f45 100644 --- a/backends/tpm/tpm_util.c +++ b/backends/tpm/tpm_util.c @@ -26,7 +26,7 @@ #include "qapi/visitor.h" #include "tpm_int.h" #include "system/memory.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/tpm_backend.h" #include "system/tpm_util.h" #include "trace.h" diff --git a/docs/devel/migration/compatibility.rst b/docs/devel/migration/compatibility.rst index ecb887e318..ce3a1100de 100644 --- a/docs/devel/migration/compatibility.rst +++ b/docs/devel/migration/compatibility.rst @@ -111,7 +111,7 @@ that array to see what value it needs to get for that feature. And what are we going to put in that array, the value of a property. To create a property for a device, we need to use one of the -DEFINE_PROP_*() macros. See include/hw/qdev-properties.h to find the +DEFINE_PROP_*() macros. See include/hw/core/qdev-properties.h to find the macros that exist. With it, we set the default value for that property, and that is what it is going to get in the latest released version. But if we want a different value for a previous version, we diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c index 81b91e47c6..9f70e2338c 100644 --- a/hw/9pfs/virtio-9p-device.c +++ b/hw/9pfs/virtio-9p-device.c @@ -22,7 +22,7 @@ #include "virtio-9p.h" #include "fsdev/qemu-fsdev.h" #include "coth.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-access.h" #include "qemu/iov.h" #include "qemu/module.h" diff --git a/hw/acpi/erst.c b/hw/acpi/erst.c index 10bbe37c17..b6c1942e30 100644 --- a/hw/acpi/erst.c +++ b/hw/acpi/erst.c @@ -18,7 +18,7 @@ #include "qom/object_interfaces.h" #include "qemu/error-report.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/acpi/acpi.h" #include "hw/acpi/acpi-defs.h" #include "hw/acpi/aml-build.h" diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c index 675ec43d09..6741f46723 100644 --- a/hw/acpi/generic_event_device.c +++ b/hw/acpi/generic_event_device.c @@ -19,7 +19,7 @@ #include "hw/mem/pc-dimm.h" #include "hw/mem/nvdimm.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/error-report.h" #include "system/runstate.h" diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 1e3c634541..19d4d4be93 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -24,7 +24,7 @@ #include "hw/isa/apm.h" #include "hw/i2c/pm_smbus.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/acpi/acpi.h" #include "hw/acpi/pcihp.h" #include "hw/acpi/piix4.h" diff --git a/hw/acpi/vmclock.c b/hw/acpi/vmclock.c index c582c0c1f8..55c9f95066 100644 --- a/hw/acpi/vmclock.c +++ b/hw/acpi/vmclock.c @@ -17,7 +17,7 @@ #include "hw/acpi/aml-build.h" #include "hw/acpi/vmclock.h" #include "hw/nvram/fw_cfg.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" #include "system/reset.h" diff --git a/hw/acpi/vmgenid.c b/hw/acpi/vmgenid.c index 33c35c85dd..fcf9a94daf 100644 --- a/hw/acpi/vmgenid.c +++ b/hw/acpi/vmgenid.c @@ -17,7 +17,7 @@ #include "hw/acpi/aml-build.h" #include "hw/acpi/vmgenid.h" #include "hw/nvram/fw_cfg.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" #include "system/reset.h" diff --git a/hw/adc/aspeed_adc.c b/hw/adc/aspeed_adc.c index 564979f24d..fd3af30829 100644 --- a/hw/adc/aspeed_adc.c +++ b/hw/adc/aspeed_adc.c @@ -12,7 +12,7 @@ #include "qapi/error.h" #include "qemu/log.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/adc/aspeed_adc.h" #include "trace.h" diff --git a/hw/adc/npcm7xx_adc.c b/hw/adc/npcm7xx_adc.c index 4494d5558f..44079791cb 100644 --- a/hw/adc/npcm7xx_adc.c +++ b/hw/adc/npcm7xx_adc.c @@ -17,7 +17,7 @@ #include "qemu/osdep.h" #include "hw/adc/npcm7xx_adc.h" #include "hw/core/qdev-clock.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/registerfields.h" #include "migration/vmstate.h" #include "qemu/log.h" diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c index d9c7bcbcd7..844d620286 100644 --- a/hw/arm/armv7m.c +++ b/hw/arm/armv7m.c @@ -13,7 +13,7 @@ #include "hw/sysbus.h" #include "hw/arm/boot.h" #include "hw/core/loader.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/qdev-clock.h" #include "elf.h" #include "system/reset.h" diff --git a/hw/arm/aspeed_coprocessor_common.c b/hw/arm/aspeed_coprocessor_common.c index f037d5b573..a0a4c73d08 100644 --- a/hw/arm/aspeed_coprocessor_common.c +++ b/hw/arm/aspeed_coprocessor_common.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "system/memory.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/arm/aspeed_coprocessor.h" static void aspeed_coprocessor_realize(DeviceState *dev, Error **errp) diff --git a/hw/arm/aspeed_soc_common.c b/hw/arm/aspeed_soc_common.c index 84e6458e80..fd08793575 100644 --- a/hw/arm/aspeed_soc_common.c +++ b/hw/arm/aspeed_soc_common.c @@ -12,7 +12,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/misc/unimp.h" #include "hw/arm/aspeed_soc.h" #include "hw/char/serial-mm.h" diff --git a/hw/arm/b-l475e-iot01a.c b/hw/arm/b-l475e-iot01a.c index a724b5fdb2..ee789c8df9 100644 --- a/hw/arm/b-l475e-iot01a.c +++ b/hw/arm/b-l475e-iot01a.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/error-report.h" #include "hw/arm/boot.h" #include "hw/core/split-irq.h" diff --git a/hw/arm/bananapi_m2u.c b/hw/arm/bananapi_m2u.c index fd347e18d2..9b468cd8ac 100644 --- a/hw/arm/bananapi_m2u.c +++ b/hw/arm/bananapi_m2u.c @@ -24,7 +24,7 @@ #include "qemu/error-report.h" #include "hw/core/boards.h" #include "hw/i2c/i2c.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/arm/allwinner-r40.h" #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c index 9fe282342a..a643ae4e27 100644 --- a/hw/arm/cubieboard.c +++ b/hw/arm/cubieboard.c @@ -19,7 +19,7 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/arm/allwinner-a10.h" #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" diff --git a/hw/arm/digic.c b/hw/arm/digic.c index d831bc974d..5dfa5839a6 100644 --- a/hw/arm/digic.c +++ b/hw/arm/digic.c @@ -24,7 +24,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/arm/digic.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/system.h" #define DIGIC4_TIMER_BASE(n) (0xc0210000 + (n) * 0x100) diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c index 992edd3ba8..5d68579cd6 100644 --- a/hw/arm/exynos4210.c +++ b/hw/arm/exynos4210.c @@ -32,7 +32,7 @@ #include "hw/sysbus.h" #include "hw/arm/boot.h" #include "hw/core/loader.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/arm/exynos4210.h" #include "hw/sd/sdhci.h" #include "hw/usb/hcd-ehci.h" diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c index f07dd452fc..e8c171f40a 100644 --- a/hw/arm/exynos4_boards.c +++ b/hw/arm/exynos4_boards.c @@ -32,7 +32,7 @@ #include "system/address-spaces.h" #include "hw/arm/exynos4210.h" #include "hw/net/lan9118.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/boards.h" #include "hw/core/irq.h" #include "target/arm/cpu-qom.h" diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c index 7aad6359ea..dd670827ff 100644 --- a/hw/arm/fsl-imx25.c +++ b/hw/arm/fsl-imx25.c @@ -26,7 +26,7 @@ #include "qapi/error.h" #include "hw/arm/fsl-imx25.h" #include "system/system.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "chardev/char.h" #include "target/arm/cpu-qom.h" diff --git a/hw/arm/fsl-imx31.c b/hw/arm/fsl-imx31.c index e9f70ad94b..190f863355 100644 --- a/hw/arm/fsl-imx31.c +++ b/hw/arm/fsl-imx31.c @@ -24,7 +24,7 @@ #include "hw/arm/fsl-imx31.h" #include "system/system.h" #include "system/address-spaces.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "chardev/char.h" #include "target/arm/cpu-qom.h" diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c index 50b34139fa..f3aa1d8150 100644 --- a/hw/arm/fsl-imx6.c +++ b/hw/arm/fsl-imx6.c @@ -25,7 +25,7 @@ #include "hw/misc/unimp.h" #include "hw/usb/imx-usb-phy.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/system.h" #include "chardev/char.h" #include "qemu/error-report.h" diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c index 21860ed14d..7ebd6c8eb9 100644 --- a/hw/arm/imx25_pdk.c +++ b/hw/arm/imx25_pdk.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/arm/fsl-imx25.h" #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" diff --git a/hw/arm/imx8mp-evk.c b/hw/arm/imx8mp-evk.c index ed8c52e1bd..0af5aad583 100644 --- a/hw/arm/imx8mp-evk.c +++ b/hw/arm/imx8mp-evk.c @@ -12,7 +12,7 @@ #include "hw/arm/fsl-imx8mp.h" #include "hw/arm/machines-qom.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/kvm.h" #include "system/qtest.h" #include "qemu/error-report.h" diff --git a/hw/arm/max78000fthr.c b/hw/arm/max78000fthr.c index 4b6e76e46b..ed50bb9197 100644 --- a/hw/arm/max78000fthr.c +++ b/hw/arm/max78000fthr.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/qdev-clock.h" #include "qemu/error-report.h" #include "hw/arm/max78000_soc.h" diff --git a/hw/arm/mcimx6ul-evk.c b/hw/arm/mcimx6ul-evk.c index 5fe6526ba0..6e9d92b1f1 100644 --- a/hw/arm/mcimx6ul-evk.c +++ b/hw/arm/mcimx6ul-evk.c @@ -16,7 +16,7 @@ #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/error-report.h" #include "system/qtest.h" diff --git a/hw/arm/mcimx7d-sabre.c b/hw/arm/mcimx7d-sabre.c index b1b56b920d..a0ac647c3d 100644 --- a/hw/arm/mcimx7d-sabre.c +++ b/hw/arm/mcimx7d-sabre.c @@ -18,7 +18,7 @@ #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/error-report.h" #include "system/qtest.h" diff --git a/hw/arm/microbit.c b/hw/arm/microbit.c index cd035fffc7..9d5c489846 100644 --- a/hw/arm/microbit.c +++ b/hw/arm/microbit.c @@ -18,7 +18,7 @@ #include "hw/arm/nrf51_soc.h" #include "hw/i2c/microbit_i2c.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qom/object.h" struct MicrobitMachineState { diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c index 7d2efc703b..ac9366d844 100644 --- a/hw/arm/mps2.c +++ b/hw/arm/mps2.c @@ -36,7 +36,7 @@ #include "hw/core/boards.h" #include "system/address-spaces.h" #include "system/system.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/misc/unimp.h" #include "hw/char/cmsdk-apb-uart.h" #include "hw/timer/cmsdk-apb-timer.h" diff --git a/hw/arm/mps3r.c b/hw/arm/mps3r.c index 77a0c0b7af..2d64a198c4 100644 --- a/hw/arm/mps3r.c +++ b/hw/arm/mps3r.c @@ -34,7 +34,7 @@ #include "hw/core/boards.h" #include "hw/core/or-irq.h" #include "hw/core/qdev-clock.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/arm/boot.h" #include "hw/arm/bsa.h" #include "hw/arm/machines-qom.h" diff --git a/hw/arm/msf2-som.c b/hw/arm/msf2-som.c index 10382f0d3b..caf6e7e1ad 100644 --- a/hw/arm/msf2-som.c +++ b/hw/arm/msf2-som.c @@ -30,7 +30,7 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" #include "hw/core/qdev-clock.h" diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index a4ddc0d08f..39e8f69cae 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -22,7 +22,7 @@ #include "hw/char/serial-mm.h" #include "qemu/timer.h" #include "hw/core/ptimer.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/block/flash.h" #include "ui/console.h" #include "hw/i2c/i2c.h" diff --git a/hw/arm/netduino2.c b/hw/arm/netduino2.c index c928105936..c32deaf43b 100644 --- a/hw/arm/netduino2.c +++ b/hw/arm/netduino2.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/qdev-clock.h" #include "qemu/error-report.h" #include "hw/arm/stm32f205_soc.h" diff --git a/hw/arm/netduinoplus2.c b/hw/arm/netduinoplus2.c index d64d2aefe4..a90dcbe8c2 100644 --- a/hw/arm/netduinoplus2.c +++ b/hw/arm/netduinoplus2.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/qdev-clock.h" #include "qemu/error-report.h" #include "hw/arm/stm32f405_soc.h" diff --git a/hw/arm/npcm7xx.c b/hw/arm/npcm7xx.c index 6905e1d8a7..c2bbcd89db 100644 --- a/hw/arm/npcm7xx.c +++ b/hw/arm/npcm7xx.c @@ -22,7 +22,7 @@ #include "hw/core/loader.h" #include "hw/misc/unimp.h" #include "hw/core/qdev-clock.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "exec/tswap.h" #include "qemu/units.h" diff --git a/hw/arm/npcm7xx_boards.c b/hw/arm/npcm7xx_boards.c index 729306b33c..57a8d3186e 100644 --- a/hw/arm/npcm7xx_boards.c +++ b/hw/arm/npcm7xx_boards.c @@ -24,7 +24,7 @@ #include "hw/core/loader.h" #include "hw/nvram/eeprom_at24c.h" #include "hw/core/qdev.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/datadir.h" #include "qemu/units.h" diff --git a/hw/arm/npcm8xx.c b/hw/arm/npcm8xx.c index 71e47dac2e..9ce6ea52d9 100644 --- a/hw/arm/npcm8xx.c +++ b/hw/arm/npcm8xx.c @@ -25,7 +25,7 @@ #include "hw/core/loader.h" #include "hw/misc/unimp.h" #include "hw/core/qdev-clock.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/units.h" #include "system/system.h" diff --git a/hw/arm/npcm8xx_boards.c b/hw/arm/npcm8xx_boards.c index 7252edf3dc..042a928857 100644 --- a/hw/arm/npcm8xx_boards.c +++ b/hw/arm/npcm8xx_boards.c @@ -23,7 +23,7 @@ #include "hw/core/cpu.h" #include "hw/core/loader.h" #include "hw/core/qdev.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/datadir.h" diff --git a/hw/arm/olimex-stm32-h405.c b/hw/arm/olimex-stm32-h405.c index 1a08d74215..e801e4308e 100644 --- a/hw/arm/olimex-stm32-h405.c +++ b/hw/arm/olimex-stm32-h405.c @@ -26,7 +26,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/qdev-clock.h" #include "qemu/error-report.h" #include "hw/arm/stm32f405_soc.h" diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index 994e5a919e..fcba6eb52d 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -26,7 +26,7 @@ #include "system/address-spaces.h" #include "hw/hw.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/arm/boot.h" #include "hw/arm/omap.h" #include "hw/sd/sd.h" diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c index c0dd32f13c..d84443bb7b 100644 --- a/hw/arm/orangepi.c +++ b/hw/arm/orangepi.c @@ -23,7 +23,7 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/arm/allwinner-h3.h" #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" diff --git a/hw/arm/sabrelite.c b/hw/arm/sabrelite.c index 99cbd5e2fe..db5669c5c2 100644 --- a/hw/arm/sabrelite.c +++ b/hw/arm/sabrelite.c @@ -16,7 +16,7 @@ #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/error-report.h" #include "system/qtest.h" diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index 5f0fb16a54..d86b470686 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -44,7 +44,7 @@ #include "hw/intc/arm_gicv3_its_common.h" #include "hw/core/loader.h" #include "hw/pci-host/gpex.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/usb/usb.h" #include "hw/usb/xhci.h" #include "hw/char/pl011.h" diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c index 62a7612184..e1b77cc55f 100644 --- a/hw/arm/smmu-common.c +++ b/hw/arm/smmu-common.c @@ -21,7 +21,7 @@ #include "exec/target_page.h" #include "hw/core/cpu.h" #include "hw/pci/pci_bridge.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/jhash.h" #include "qemu/module.h" diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c index e391842dc3..e12a64a20f 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -21,7 +21,7 @@ #include "hw/core/irq.h" #include "hw/sysbus.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/qdev.h" #include "hw/pci/pci.h" #include "cpu.h" diff --git a/hw/arm/stm32f100_soc.c b/hw/arm/stm32f100_soc.c index 8d61be72c4..2358368dba 100644 --- a/hw/arm/stm32f100_soc.c +++ b/hw/arm/stm32f100_soc.c @@ -29,7 +29,7 @@ #include "hw/arm/boot.h" #include "system/address-spaces.h" #include "hw/arm/stm32f100_soc.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/qdev-clock.h" #include "hw/misc/unimp.h" #include "system/system.h" diff --git a/hw/arm/stm32f205_soc.c b/hw/arm/stm32f205_soc.c index 406f614f1d..a03c6b4002 100644 --- a/hw/arm/stm32f205_soc.c +++ b/hw/arm/stm32f205_soc.c @@ -28,7 +28,7 @@ #include "hw/arm/boot.h" #include "system/address-spaces.h" #include "hw/arm/stm32f205_soc.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/qdev-clock.h" #include "system/system.h" diff --git a/hw/arm/stm32vldiscovery.c b/hw/arm/stm32vldiscovery.c index e7e1b8200e..8f93c0036a 100644 --- a/hw/arm/stm32vldiscovery.c +++ b/hw/arm/stm32vldiscovery.c @@ -26,7 +26,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/qdev-clock.h" #include "qemu/error-report.h" #include "hw/arm/stm32f100_soc.h" diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c index 95dda07852..3ee73ee459 100644 --- a/hw/arm/strongarm.c +++ b/hw/arm/strongarm.c @@ -29,7 +29,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 0d2652e6db..d8773cb541 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -63,7 +63,7 @@ #include "hw/virtio/virtio-pci.h" #include "hw/core/sysbus-fdt.h" #include "hw/core/platform-bus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/arm/fdt.h" #include "hw/intc/arm_gic.h" #include "hw/intc/arm_gicv3_common.h" diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c index 60daa62ea3..0694f0adf9 100644 --- a/hw/audio/ac97.c +++ b/hw/audio/ac97.c @@ -21,7 +21,7 @@ #include "hw/audio/model.h" #include "qemu/audio.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "system/dma.h" diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c index 19d3a5f128..8b9fe53e17 100644 --- a/hw/audio/adlib.c +++ b/hw/audio/adlib.c @@ -28,7 +28,7 @@ #include "hw/audio/model.h" #include "qemu/audio.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/error-report.h" #include "qom/object.h" diff --git a/hw/audio/asc.c b/hw/audio/asc.c index b6f4204500..77a5cc1092 100644 --- a/hw/audio/asc.c +++ b/hw/audio/asc.c @@ -17,7 +17,7 @@ #include "hw/core/irq.h" #include "qemu/audio.h" #include "hw/audio/asc.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/audio/cs4231a.c b/hw/audio/cs4231a.c index 8368172f40..7489cf42b7 100644 --- a/hw/audio/cs4231a.c +++ b/hw/audio/cs4231a.c @@ -27,7 +27,7 @@ #include "qemu/audio.h" #include "hw/core/irq.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "qemu/error-report.h" diff --git a/hw/audio/gus.c b/hw/audio/gus.c index 6c41b25486..69ddc41919 100644 --- a/hw/audio/gus.c +++ b/hw/audio/gus.c @@ -29,7 +29,7 @@ #include "qemu/audio.h" #include "hw/core/irq.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "gusemu.h" #include "qemu/error-report.h" diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c index e90c9de046..6445d22759 100644 --- a/hw/audio/hda-codec.c +++ b/hw/audio/hda-codec.c @@ -19,7 +19,7 @@ #include "qemu/osdep.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "intel-hda.h" #include "migration/vmstate.h" #include "qemu/host-utils.h" diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c index 758e130c93..d7c2c3c2fd 100644 --- a/hw/audio/intel-hda.c +++ b/hw/audio/intel-hda.c @@ -19,7 +19,7 @@ #include "qemu/osdep.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/pci/msi.h" #include "monitor/qdev.h" #include "qemu/timer.h" diff --git a/hw/audio/marvell_88w8618.c b/hw/audio/marvell_88w8618.c index ba9bd6befd..39f4b4514d 100644 --- a/hw/audio/marvell_88w8618.c +++ b/hw/audio/marvell_88w8618.c @@ -14,7 +14,7 @@ #include "hw/sysbus.h" #include "migration/vmstate.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/audio/wm8750.h" #include "qemu/audio.h" #include "qapi/error.h" diff --git a/hw/audio/model.c b/hw/audio/model.c index ff4e4b2452..86a5419b09 100644 --- a/hw/audio/model.c +++ b/hw/audio/model.c @@ -26,7 +26,7 @@ #include "monitor/qdev.h" #include "qemu/error-report.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/audio/model.h" struct audio_model { diff --git a/hw/audio/pl041.c b/hw/audio/pl041.c index 7bb2c81afc..117b6b0ae6 100644 --- a/hw/audio/pl041.c +++ b/hw/audio/pl041.c @@ -22,7 +22,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c index 6ca31a0e64..3c5beb9dfa 100644 --- a/hw/audio/sb16.c +++ b/hw/audio/sb16.c @@ -27,7 +27,7 @@ #include "qemu/audio.h" #include "hw/core/irq.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/timer.h" #include "qemu/error-report.h" diff --git a/hw/avr/atmega.c b/hw/avr/atmega.c index 95b6da5e34..b185295d55 100644 --- a/hw/avr/atmega.c +++ b/hw/avr/atmega.c @@ -16,7 +16,7 @@ #include "system/memory.h" #include "system/address-spaces.h" #include "system/system.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "qom/object.h" #include "hw/misc/unimp.h" diff --git a/hw/block/fdc-isa.c b/hw/block/fdc-isa.c index 0034c3594a..ebb3d2f7cd 100644 --- a/hw/block/fdc-isa.c +++ b/hw/block/fdc-isa.c @@ -35,7 +35,7 @@ #include "hw/acpi/acpi_aml_interface.h" #include "hw/core/irq.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" #include "hw/block/block.h" diff --git a/hw/block/fdc.c b/hw/block/fdc.c index e0e53ba038..1747f6506f 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -35,7 +35,7 @@ #include "qemu/memalign.h" #include "hw/core/irq.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" #include "hw/block/block.h" diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index a5336d92ff..648e6bdc00 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -26,7 +26,7 @@ #include "system/block-backend.h" #include "hw/block/block.h" #include "hw/block/flash.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/ssi/ssi.h" #include "migration/vmstate.h" diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index 168101d8df..f93b812c02 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -39,7 +39,7 @@ #include "qemu/osdep.h" #include "hw/block/block.h" #include "hw/block/flash.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "system/block-backend.h" #include "qapi/error.h" diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index 3244b699b9..6a74bcb7a1 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -35,7 +35,7 @@ #include "qemu/osdep.h" #include "hw/block/block.h" #include "hw/block/flash.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/hw/block/swim.c b/hw/block/swim.c index ad047362f8..53ba7fa59c 100644 --- a/hw/block/swim.c +++ b/hw/block/swim.c @@ -18,7 +18,7 @@ #include "migration/vmstate.h" #include "hw/block/block.h" #include "hw/block/swim.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "trace.h" diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c index b399eab51a..62295f187c 100644 --- a/hw/block/vhost-user-blk.c +++ b/hw/block/vhost-user-blk.c @@ -21,7 +21,7 @@ #include "qemu/error-report.h" #include "qemu/cutils.h" #include "hw/core/qdev.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/virtio/virtio-blk-common.h" #include "hw/virtio/vhost.h" diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 64efce4846..ddf0e9ee53 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -21,7 +21,7 @@ #include "block/block_int.h" #include "trace.h" #include "hw/block/block.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/blockdev.h" #include "system/block-ram-registrar.h" #include "system/system.h" diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c index 74de897c79..5dc4ba9d07 100644 --- a/hw/block/xen-block.c +++ b/hw/block/xen-block.c @@ -20,7 +20,7 @@ #include "qobject/qstring.h" #include "qom/object_interfaces.h" #include "hw/block/xen_blkif.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/xen/xen-block.h" #include "hw/xen/xen-backend.h" #include "system/blockdev.h" diff --git a/hw/char/avr_usart.c b/hw/char/avr_usart.c index e98ad53e44..c3515b6f7d 100644 --- a/hw/char/avr_usart.c +++ b/hw/char/avr_usart.c @@ -23,7 +23,7 @@ #include "hw/char/avr_usart.h" #include "qemu/log.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" static int avr_usart_can_receive(void *opaque) diff --git a/hw/char/bcm2835_aux.c b/hw/char/bcm2835_aux.c index 03428efeea..47e24c5bba 100644 --- a/hw/char/bcm2835_aux.c +++ b/hw/char/bcm2835_aux.c @@ -23,7 +23,7 @@ #include "qemu/osdep.h" #include "hw/char/bcm2835_aux.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" #include "qemu/log.h" diff --git a/hw/char/debugcon.c b/hw/char/debugcon.c index bb323adda5..36607d0c1c 100644 --- a/hw/char/debugcon.c +++ b/hw/char/debugcon.c @@ -29,7 +29,7 @@ #include "qemu/module.h" #include "chardev/char-fe.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "qom/object.h" diff --git a/hw/char/digic-uart.c b/hw/char/digic-uart.c index 0f6af51bb7..04dec0df8a 100644 --- a/hw/char/digic-uart.c +++ b/hw/char/digic-uart.c @@ -34,7 +34,7 @@ #include "qemu/module.h" #include "hw/char/digic-uart.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" enum { diff --git a/hw/char/diva-gsp.c b/hw/char/diva-gsp.c index 835594e5cb..1dafc1e80c 100644 --- a/hw/char/diva-gsp.c +++ b/hw/char/diva-gsp.c @@ -20,7 +20,7 @@ #include "hw/char/serial.h" #include "hw/core/irq.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" diff --git a/hw/char/escc.c b/hw/char/escc.c index 27269dca64..496bbc56de 100644 --- a/hw/char/escc.c +++ b/hw/char/escc.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/char/exynos4210_uart.c b/hw/char/exynos4210_uart.c index 8ba310fd7a..387156d5e3 100644 --- a/hw/char/exynos4210_uart.c +++ b/hw/char/exynos4210_uart.c @@ -31,7 +31,7 @@ #include "hw/arm/exynos4210.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "trace.h" diff --git a/hw/char/grlib_apbuart.c b/hw/char/grlib_apbuart.c index 15925eb2e6..9731e664c1 100644 --- a/hw/char/grlib_apbuart.c +++ b/hw/char/grlib_apbuart.c @@ -26,7 +26,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/char/grlib_uart.h" #include "hw/sysbus.h" diff --git a/hw/char/ibex_uart.c b/hw/char/ibex_uart.c index 23abeacb1b..ac4a43af84 100644 --- a/hw/char/ibex_uart.c +++ b/hw/char/ibex_uart.c @@ -29,7 +29,7 @@ #include "hw/char/ibex_uart.h" #include "hw/core/irq.h" #include "hw/core/qdev-clock.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/registerfields.h" #include "migration/vmstate.h" diff --git a/hw/char/imx_serial.c b/hw/char/imx_serial.c index 9f13236f29..78d2c25f86 100644 --- a/hw/char/imx_serial.c +++ b/hw/char/imx_serial.c @@ -21,7 +21,7 @@ #include "qemu/osdep.h" #include "hw/char/imx_serial.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" #include "qemu/log.h" diff --git a/hw/char/ipoctal232.c b/hw/char/ipoctal232.c index 6e38916150..19f312b9d3 100644 --- a/hw/char/ipoctal232.c +++ b/hw/char/ipoctal232.c @@ -11,7 +11,7 @@ #include "qemu/osdep.h" #include "hw/ipack/ipack.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" #include "qemu/bitops.h" diff --git a/hw/char/max78000_uart.c b/hw/char/max78000_uart.c index 5fc933123e..59ec24a15e 100644 --- a/hw/char/max78000_uart.c +++ b/hw/char/max78000_uart.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "hw/char/max78000_uart.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c index d9d551924b..391674dbcc 100644 --- a/hw/char/mcf_uart.c +++ b/hw/char/mcf_uart.c @@ -12,7 +12,7 @@ #include "qemu/module.h" #include "qapi/error.h" #include "hw/m68k/mcf.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "chardev/char-fe.h" #include "qom/object.h" diff --git a/hw/char/mchp_pfsoc_mmuart.c b/hw/char/mchp_pfsoc_mmuart.c index 6149f9d204..6673721454 100644 --- a/hw/char/mchp_pfsoc_mmuart.c +++ b/hw/char/mchp_pfsoc_mmuart.c @@ -25,7 +25,7 @@ #include "qapi/error.h" #include "migration/vmstate.h" #include "hw/char/mchp_pfsoc_mmuart.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #define REGS_OFFSET 0x20 diff --git a/hw/char/nrf51_uart.c b/hw/char/nrf51_uart.c index 39d144538d..6087cabeb3 100644 --- a/hw/char/nrf51_uart.c +++ b/hw/char/nrf51_uart.c @@ -17,7 +17,7 @@ #include "qemu/module.h" #include "hw/char/nrf51_uart.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/char/parallel-isa.c b/hw/char/parallel-isa.c index b6dfb6cc31..92e94138f4 100644 --- a/hw/char/parallel-isa.c +++ b/hw/char/parallel-isa.c @@ -12,7 +12,7 @@ #include "qemu/osdep.h" #include "system/system.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/char/parallel-isa.h" #include "hw/char/parallel.h" #include "qapi/error.h" diff --git a/hw/char/parallel.c b/hw/char/parallel.c index 8732e4e9f9..6708d7658b 100644 --- a/hw/char/parallel.c +++ b/hw/char/parallel.c @@ -28,7 +28,7 @@ #include "qemu/module.h" #include "chardev/char-parallel.h" #include "hw/acpi/acpi_aml_interface.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" #include "hw/char/parallel-isa.h" diff --git a/hw/char/pl011.c b/hw/char/pl011.c index 030d6a2e8b..f37ffd349f 100644 --- a/hw/char/pl011.c +++ b/hw/char/pl011.c @@ -24,7 +24,7 @@ #include "hw/core/irq.h" #include "hw/sysbus.h" #include "hw/core/qdev-clock.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" #include "chardev/char-fe.h" diff --git a/hw/char/renesas_sci.c b/hw/char/renesas_sci.c index b32e41d5b8..3c1cc43954 100644 --- a/hw/char/renesas_sci.c +++ b/hw/char/renesas_sci.c @@ -25,7 +25,7 @@ #include "qemu/log.h" #include "hw/core/irq.h" #include "hw/registerfields.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/char/renesas_sci.h" #include "migration/vmstate.h" diff --git a/hw/char/sclpconsole-lm.c b/hw/char/sclpconsole-lm.c index c51308f9c5..ed08cf42da 100644 --- a/hw/char/sclpconsole-lm.c +++ b/hw/char/sclpconsole-lm.c @@ -22,7 +22,7 @@ #include "hw/s390x/sclp.h" #include "migration/vmstate.h" #include "hw/s390x/event-facility.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/s390x/ebcdic.h" #include "qom/object.h" diff --git a/hw/char/sclpconsole.c b/hw/char/sclpconsole.c index 2abf861dbc..ab444fe1fa 100644 --- a/hw/char/sclpconsole.c +++ b/hw/char/sclpconsole.c @@ -19,7 +19,7 @@ #include "hw/s390x/sclp.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/s390x/event-facility.h" #include "chardev/char-fe.h" diff --git a/hw/char/serial-isa.c b/hw/char/serial-isa.c index 0ea59a3d5c..a4be0492c5 100644 --- a/hw/char/serial-isa.c +++ b/hw/char/serial-isa.c @@ -31,7 +31,7 @@ #include "hw/char/serial.h" #include "hw/char/serial-isa.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qom/object.h" diff --git a/hw/char/serial-mm.c b/hw/char/serial-mm.c index 13aba780ec..6e963e581f 100644 --- a/hw/char/serial-mm.c +++ b/hw/char/serial-mm.c @@ -28,7 +28,7 @@ #include "exec/cpu-common.h" #include "migration/vmstate.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" static uint64_t serial_mm_read(void *opaque, hwaddr addr, unsigned size) { diff --git a/hw/char/serial-pci-multi.c b/hw/char/serial-pci-multi.c index 3460856998..f0af12c14f 100644 --- a/hw/char/serial-pci-multi.c +++ b/hw/char/serial-pci-multi.c @@ -32,7 +32,7 @@ #include "hw/char/serial.h" #include "hw/core/irq.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" diff --git a/hw/char/serial-pci.c b/hw/char/serial-pci.c index d05d089899..d8cacc9085 100644 --- a/hw/char/serial-pci.c +++ b/hw/char/serial-pci.c @@ -31,7 +31,7 @@ #include "hw/char/serial.h" #include "hw/core/irq.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qom/object.h" diff --git a/hw/char/serial.c b/hw/char/serial.c index 11685b397b..cbff68a711 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -35,7 +35,7 @@ #include "system/runstate.h" #include "qemu/error-report.h" #include "trace.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #define UART_LCR_DLAB 0x80 /* Divisor latch access bit */ diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c index 008a2ea2f0..9cd79fce33 100644 --- a/hw/char/sh_serial.c +++ b/hw/char/sh_serial.c @@ -29,7 +29,7 @@ #include "hw/sysbus.h" #include "hw/core/irq.h" #include "hw/core/qdev.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/sh4/sh.h" #include "chardev/char-fe.h" diff --git a/hw/char/shakti_uart.c b/hw/char/shakti_uart.c index 6e216edb0f..51e45351d9 100644 --- a/hw/char/shakti_uart.c +++ b/hw/char/shakti_uart.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "hw/char/shakti_uart.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "qemu/log.h" diff --git a/hw/char/spapr_vty.c b/hw/char/spapr_vty.c index 766b2bfcac..17a17c47c3 100644 --- a/hw/char/spapr_vty.c +++ b/hw/char/spapr_vty.c @@ -6,7 +6,7 @@ #include "chardev/char-fe.h" #include "hw/ppc/spapr.h" #include "hw/ppc/spapr_vio.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "qom/object.h" diff --git a/hw/char/stm32f2xx_usart.c b/hw/char/stm32f2xx_usart.c index 49bbda03b8..2c19ec69cc 100644 --- a/hw/char/stm32f2xx_usart.c +++ b/hw/char/stm32f2xx_usart.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "hw/char/stm32f2xx_usart.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/char/stm32l4x5_usart.c b/hw/char/stm32l4x5_usart.c index 4533cbc93b..8b208ba9b6 100644 --- a/hw/char/stm32l4x5_usart.c +++ b/hw/char/stm32l4x5_usart.c @@ -26,7 +26,7 @@ #include "hw/core/clock.h" #include "hw/core/irq.h" #include "hw/core/qdev-clock.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/registerfields.h" #include "trace.h" diff --git a/hw/char/terminal3270.c b/hw/char/terminal3270.c index c993f67b42..821a75c37a 100644 --- a/hw/char/terminal3270.c +++ b/hw/char/terminal3270.c @@ -15,7 +15,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "chardev/char-fe.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/s390x/3270-ccw.h" #include "qom/object.h" diff --git a/hw/char/virtio-console.c b/hw/char/virtio-console.c index 1b669c9be8..8c2a6a9d1d 100644 --- a/hw/char/virtio-console.c +++ b/hw/char/virtio-console.c @@ -15,7 +15,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "trace.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/virtio/virtio-serial.h" #include "qapi/error.h" diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c index 673c50f0be..5ec5f5313b 100644 --- a/hw/char/virtio-serial-bus.c +++ b/hw/char/virtio-serial-bus.c @@ -27,7 +27,7 @@ #include "monitor/monitor.h" #include "qemu/error-report.h" #include "qemu/queue.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "trace.h" #include "hw/virtio/virtio-serial.h" #include "hw/virtio/virtio-access.h" diff --git a/hw/char/xen_console.c b/hw/char/xen_console.c index a639fb0b11..a0d142582e 100644 --- a/hw/char/xen_console.c +++ b/hw/char/xen_console.c @@ -29,7 +29,7 @@ #include "chardev/char-fe.h" #include "hw/xen/xen-backend.h" #include "hw/xen/xen-bus-helper.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/xen/interface/io/console.h" #include "hw/xen/interface/io/xs_wire.h" diff --git a/hw/char/xilinx_uartlite.c b/hw/char/xilinx_uartlite.c index da1ecd249c..9d81cd904c 100644 --- a/hw/char/xilinx_uartlite.c +++ b/hw/char/xilinx_uartlite.c @@ -27,7 +27,7 @@ #include "qapi/error.h" #include "hw/char/xilinx_uartlite.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/sysbus.h" #include "qemu/module.h" diff --git a/hw/core/bus.c b/hw/core/bus.c index bddfc22d38..53f392fdda 100644 --- a/hw/core/bus.c +++ b/hw/core/bus.c @@ -18,7 +18,7 @@ */ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/ctype.h" #include "qemu/module.h" #include "qapi/error.h" diff --git a/hw/core/cpu-common.c b/hw/core/cpu-common.c index fb8421184d..2e925880af 100644 --- a/hw/core/cpu-common.c +++ b/hw/core/cpu-common.c @@ -32,7 +32,7 @@ #include "exec/gdbstub.h" #include "system/tcg.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "trace.h" #ifdef CONFIG_PLUGIN #include "qemu/plugin.h" diff --git a/hw/core/cpu-system.c b/hw/core/cpu-system.c index 5d5a435739..48c8ddf4b1 100644 --- a/hw/core/cpu-system.c +++ b/hw/core/cpu-system.c @@ -25,7 +25,7 @@ #include "system/memory.h" #include "qemu/target-info.h" #include "hw/core/qdev.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/sysemu-cpu-ops.h" #include "migration/vmstate.h" #include "system/tcg.h" diff --git a/hw/core/cpu-user.c b/hw/core/cpu-user.c index 270afe5b9f..25aa25ad24 100644 --- a/hw/core/cpu-user.c +++ b/hw/core/cpu-user.c @@ -8,7 +8,7 @@ #include "qemu/osdep.h" #include "hw/core/qdev.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/cpu.h" #include "migration/vmstate.h" diff --git a/hw/core/generic-loader.c b/hw/core/generic-loader.c index 590c6a8131..24f3908b1c 100644 --- a/hw/core/generic-loader.c +++ b/hw/core/generic-loader.c @@ -35,7 +35,7 @@ #include "system/reset.h" #include "hw/core/boards.h" #include "hw/core/loader.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/module.h" #include "hw/core/generic-loader.h" diff --git a/hw/core/guest-loader.c b/hw/core/guest-loader.c index e46897c497..38cb9f992c 100644 --- a/hw/core/guest-loader.c +++ b/hw/core/guest-loader.c @@ -28,7 +28,7 @@ #include "hw/core/cpu.h" #include "system/dma.h" #include "hw/core/loader.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/module.h" #include "guest-loader.h" diff --git a/hw/core/or-irq.c b/hw/core/or-irq.c index bcc7ad1e44..3dc008ea4f 100644 --- a/hw/core/or-irq.c +++ b/hw/core/or-irq.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/core/or-irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/core/platform-bus.c b/hw/core/platform-bus.c index 4b6cc5f649..a2217a2dee 100644 --- a/hw/core/platform-bus.c +++ b/hw/core/platform-bus.c @@ -21,7 +21,7 @@ #include "qemu/osdep.h" #include "hw/core/platform-bus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c index 7aa5cbb510..d0a66358b5 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -11,7 +11,7 @@ */ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "qapi/error.h" #include "qapi/visitor.h" diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index 0930d64252..05489c8fbb 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -1,5 +1,5 @@ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qapi/qapi-types-misc.h" #include "qapi/qapi-visit-common.h" diff --git a/hw/core/qdev.c b/hw/core/qdev.c index fae9ffc759..a3b41286ea 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -33,7 +33,7 @@ #include "qemu/error-report.h" #include "qemu/option.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/boards.h" #include "hw/sysbus.h" #include "hw/core/qdev-clock.h" diff --git a/hw/core/split-irq.c b/hw/core/split-irq.c index d0aaa108eb..7491d74791 100644 --- a/hw/core/split-irq.c +++ b/hw/core/split-irq.c @@ -26,7 +26,7 @@ #include "qemu/osdep.h" #include "hw/core/split-irq.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/cpu/a15mpcore.c b/hw/cpu/a15mpcore.c index 1a6fb914f3..28cc4b3a4b 100644 --- a/hw/cpu/a15mpcore.c +++ b/hw/cpu/a15mpcore.c @@ -23,7 +23,7 @@ #include "qemu/module.h" #include "hw/cpu/a15mpcore.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/kvm.h" #include "kvm_arm.h" #include "target/arm/gtimer.h" diff --git a/hw/cpu/a9mpcore.c b/hw/cpu/a9mpcore.c index 9f8e0f70c4..2127f95578 100644 --- a/hw/cpu/a9mpcore.c +++ b/hw/cpu/a9mpcore.c @@ -13,7 +13,7 @@ #include "qemu/module.h" #include "hw/cpu/a9mpcore.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/cpu.h" #include "target/arm/cpu-qom.h" diff --git a/hw/cpu/arm11mpcore.c b/hw/cpu/arm11mpcore.c index 1953d12f61..f3a5174c1f 100644 --- a/hw/cpu/arm11mpcore.c +++ b/hw/cpu/arm11mpcore.c @@ -13,7 +13,7 @@ #include "hw/cpu/arm11mpcore.h" #include "hw/intc/realview_gic.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #define ARM11MPCORE_NUM_GIC_PRIORITY_BITS 4 diff --git a/hw/cpu/cluster.c b/hw/cpu/cluster.c index ef3b3d1e94..628fe33367 100644 --- a/hw/cpu/cluster.c +++ b/hw/cpu/cluster.c @@ -22,7 +22,7 @@ #include "hw/core/cpu.h" #include "hw/cpu/cluster.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" static const Property cpu_cluster_properties[] = { diff --git a/hw/cxl/switch-mailbox-cci.c b/hw/cxl/switch-mailbox-cci.c index 223f220433..5ba587b4e5 100644 --- a/hw/cxl/switch-mailbox-cci.c +++ b/hw/cxl/switch-mailbox-cci.c @@ -14,7 +14,7 @@ #include "qapi/error.h" #include "qemu/log.h" #include "qemu/module.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/cxl/cxl.h" #define CXL_SWCCI_MSIX_MBOX 3 diff --git a/hw/display/apple-gfx.h b/hw/display/apple-gfx.h index a8b1d1efc0..3197bd853d 100644 --- a/hw/display/apple-gfx.h +++ b/hw/display/apple-gfx.h @@ -10,7 +10,7 @@ #include "qemu/queue.h" #include "system/memory.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "ui/surface.h" #define TYPE_APPLE_GFX_MMIO "apple-gfx-mmio" diff --git a/hw/display/artist.c b/hw/display/artist.c index e6fed03786..22524d9c5f 100644 --- a/hw/display/artist.c +++ b/hw/display/artist.c @@ -17,7 +17,7 @@ #include "hw/sysbus.h" #include "hw/core/loader.h" #include "hw/core/qdev.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "ui/console.h" #include "trace.h" diff --git a/hw/display/ati.c b/hw/display/ati.c index f7c0006a87..e9c3ad2cd1 100644 --- a/hw/display/ati.c +++ b/hw/display/ati.c @@ -20,7 +20,7 @@ #include "ati_int.h" #include "ati_regs.h" #include "vga-access.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "vga_regs.h" #include "qemu/bswap.h" #include "qemu/log.h" diff --git a/hw/display/bcm2835_fb.c b/hw/display/bcm2835_fb.c index f8f13b55cb..8eec0dc600 100644 --- a/hw/display/bcm2835_fb.c +++ b/hw/display/bcm2835_fb.c @@ -31,7 +31,7 @@ #include "framebuffer.h" #include "ui/pixel_ops.h" #include "hw/misc/bcm2835_mbox_defs.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/display/bochs-display.c b/hw/display/bochs-display.c index ad2821c974..5fb6b733cb 100644 --- a/hw/display/bochs-display.c +++ b/hw/display/bochs-display.c @@ -9,7 +9,7 @@ #include "qemu/module.h" #include "qemu/units.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/display/bochs-vbe.h" #include "hw/display/edid.h" diff --git a/hw/display/cg3.c b/hw/display/cg3.c index 5ec09b6324..f4067d7825 100644 --- a/hw/display/cg3.c +++ b/hw/display/cg3.c @@ -32,7 +32,7 @@ #include "migration/vmstate.h" #include "hw/core/irq.h" #include "hw/core/loader.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/log.h" #include "qemu/module.h" #include "trace.h" diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index ef08694626..37228ff134 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -40,7 +40,7 @@ #include "qapi/error.h" #include "trace.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "ui/pixel_ops.h" #include "vga_regs.h" diff --git a/hw/display/cirrus_vga_isa.c b/hw/display/cirrus_vga_isa.c index 5cacf4fc12..bad9ec7599 100644 --- a/hw/display/cirrus_vga_isa.c +++ b/hw/display/cirrus_vga_isa.c @@ -27,7 +27,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/core/loader.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/isa/isa.h" #include "cirrus_vga_internal.h" #include "qom/object.h" diff --git a/hw/display/dm163.c b/hw/display/dm163.c index e78804693c..4feae91294 100644 --- a/hw/display/dm163.c +++ b/hw/display/dm163.c @@ -18,7 +18,7 @@ #include "qapi/error.h" #include "migration/vmstate.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/display/dm163.h" #include "ui/console.h" #include "trace.h" diff --git a/hw/display/exynos4210_fimd.c b/hw/display/exynos4210_fimd.c index 8d8062f427..8e3a61ed0e 100644 --- a/hw/display/exynos4210_fimd.c +++ b/hw/display/exynos4210_fimd.c @@ -23,7 +23,7 @@ */ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/hw.h" #include "hw/core/irq.h" #include "hw/sysbus.h" diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c index 10686cd676..8ed3e6ecc3 100644 --- a/hw/display/g364fb.c +++ b/hw/display/g364fb.c @@ -21,7 +21,7 @@ #include "qemu/units.h" #include "hw/hw.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/hw/display/i2c-ddc.c b/hw/display/i2c-ddc.c index 2adfc1a147..1fddc5807a 100644 --- a/hw/display/i2c-ddc.c +++ b/hw/display/i2c-ddc.c @@ -20,7 +20,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/i2c/i2c.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/display/i2c-ddc.h" diff --git a/hw/display/macfb.c b/hw/display/macfb.c index 574d667173..fa3572ead3 100644 --- a/hw/display/macfb.c +++ b/hw/display/macfb.c @@ -18,7 +18,7 @@ #include "hw/nubus/nubus.h" #include "hw/display/macfb.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/display/pl110.c b/hw/display/pl110.c index e78a55184e..2537c26462 100644 --- a/hw/display/pl110.c +++ b/hw/display/pl110.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/sysbus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "ui/console.h" #include "framebuffer.h" diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 18f482ca7f..f29b736722 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -28,7 +28,7 @@ #include "qemu/atomic.h" #include "qemu/main-loop.h" #include "qemu/module.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/runstate.h" #include "migration/cpr.h" #include "migration/vmstate.h" diff --git a/hw/display/ramfb-standalone.c b/hw/display/ramfb-standalone.c index 130f4e01df..f1958be32a 100644 --- a/hw/display/ramfb-standalone.c +++ b/hw/display/ramfb-standalone.c @@ -3,7 +3,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/core/loader.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/display/ramfb.h" #include "ui/console.h" #include "qom/object.h" diff --git a/hw/display/sm501.c b/hw/display/sm501.c index bc091b3c9f..6ccec03fe7 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -35,7 +35,7 @@ #include "hw/sysbus.h" #include "migration/vmstate.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/i2c/i2c.h" #include "hw/display/i2c-ddc.h" #include "qemu/range.h" diff --git a/hw/display/tcx.c b/hw/display/tcx.c index dfe234e335..b208923523 100644 --- a/hw/display/tcx.c +++ b/hw/display/tcx.c @@ -28,7 +28,7 @@ #include "ui/console.h" #include "ui/pixel_ops.h" #include "hw/core/loader.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "qemu/error-report.h" diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c index d2213b0f3e..95d85ff69a 100644 --- a/hw/display/vga-isa.c +++ b/hw/display/vga-isa.c @@ -31,7 +31,7 @@ #include "qemu/module.h" #include "qemu/timer.h" #include "hw/core/loader.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "ui/console.h" #include "qom/object.h" diff --git a/hw/display/vga-mmio.c b/hw/display/vga-mmio.c index 33263856b7..4c497b70f4 100644 --- a/hw/display/vga-mmio.c +++ b/hw/display/vga-mmio.c @@ -26,7 +26,7 @@ #include "qapi/error.h" #include "hw/sysbus.h" #include "hw/display/vga.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "ui/console.h" #include "vga_int.h" diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c index 7a39bb9b21..d0f9de1ab3 100644 --- a/hw/display/vga-pci.c +++ b/hw/display/vga-pci.c @@ -26,7 +26,7 @@ #include "qemu/osdep.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "vga_int.h" #include "ui/pixel_ops.h" diff --git a/hw/display/vhost-user-gpu.c b/hw/display/vhost-user-gpu.c index 9fc6bbcd2c..3f6fb7a803 100644 --- a/hw/display/vhost-user-gpu.c +++ b/hw/display/vhost-user-gpu.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" #include "qemu/sockets.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-gpu.h" #include "chardev/char-fe.h" #include "qapi/error.h" diff --git a/hw/display/virtio-gpu-gl.c b/hw/display/virtio-gpu-gl.c index c06a078fb3..b98ef2ef98 100644 --- a/hw/display/virtio-gpu-gl.c +++ b/hw/display/virtio-gpu-gl.c @@ -21,7 +21,7 @@ #include "hw/virtio/virtio-gpu.h" #include "hw/virtio/virtio-gpu-bswap.h" #include "hw/virtio/virtio-gpu-pixman.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include diff --git a/hw/display/virtio-gpu-pci-gl.c b/hw/display/virtio-gpu-pci-gl.c index a2819e1ca9..c8923795df 100644 --- a/hw/display/virtio-gpu-pci-gl.c +++ b/hw/display/virtio-gpu-pci-gl.c @@ -15,7 +15,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-gpu-pci.h" diff --git a/hw/display/virtio-gpu-pci-rutabaga.c b/hw/display/virtio-gpu-pci-rutabaga.c index 5fdff37f2c..4db77cb868 100644 --- a/hw/display/virtio-gpu-pci-rutabaga.c +++ b/hw/display/virtio-gpu-pci-rutabaga.c @@ -4,7 +4,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-gpu-pci.h" diff --git a/hw/display/virtio-gpu-pci.c b/hw/display/virtio-gpu-pci.c index c0d71b6254..22659ca196 100644 --- a/hw/display/virtio-gpu-pci.c +++ b/hw/display/virtio-gpu-pci.c @@ -15,7 +15,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-gpu-pci.h" diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 43e88a4daf..f23eec6862 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -26,7 +26,7 @@ #include "hw/virtio/virtio-gpu-bswap.h" #include "hw/virtio/virtio-gpu-pixman.h" #include "hw/virtio/virtio-bus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/log.h" #include "qemu/memfd.h" #include "qemu/module.h" diff --git a/hw/display/virtio-vga-gl.c b/hw/display/virtio-vga-gl.c index 984faa6b39..178e4c7172 100644 --- a/hw/display/virtio-vga-gl.c +++ b/hw/display/virtio-vga-gl.c @@ -1,6 +1,6 @@ #include "qemu/osdep.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-gpu.h" #include "hw/display/vga.h" #include "qapi/error.h" diff --git a/hw/display/virtio-vga-rutabaga.c b/hw/display/virtio-vga-rutabaga.c index a7bef6da24..1e07ee0b0d 100644 --- a/hw/display/virtio-vga-rutabaga.c +++ b/hw/display/virtio-vga-rutabaga.c @@ -2,7 +2,7 @@ #include "qemu/osdep.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-gpu.h" #include "hw/display/vga.h" #include "qapi/error.h" diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c index 40e60f70fc..5e087169f2 100644 --- a/hw/display/virtio-vga.c +++ b/hw/display/virtio-vga.c @@ -1,6 +1,6 @@ #include "qemu/osdep.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-gpu.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c index 7ca5a55142..ea7a9fca04 100644 --- a/hw/display/vmware_vga.c +++ b/hw/display/vmware_vga.c @@ -30,7 +30,7 @@ #include "hw/core/loader.h" #include "trace.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qom/object.h" #include "ui/console.h" diff --git a/hw/dma/i82374.c b/hw/dma/i82374.c index e226eda6d1..c909cf4640 100644 --- a/hw/dma/i82374.c +++ b/hw/dma/i82374.c @@ -26,7 +26,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/dma/i8257.h" #include "qom/object.h" diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c index 2463952ada..d909d6c8fc 100644 --- a/hw/dma/i8257.c +++ b/hw/dma/i8257.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/dma/i8257.h" #include "qapi/error.h" diff --git a/hw/dma/pl080.c b/hw/dma/pl080.c index 28f7937164..bd61d8ed48 100644 --- a/hw/dma/pl080.c +++ b/hw/dma/pl080.c @@ -15,7 +15,7 @@ #include "hw/dma/pl080.h" #include "hw/hw.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #define PL080_CONF_E 0x1 diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c index a9e6d2746f..4f00092f85 100644 --- a/hw/dma/pl330.c +++ b/hw/dma/pl330.c @@ -17,7 +17,7 @@ #include "qemu/osdep.h" #include "qemu/cutils.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "qapi/error.h" diff --git a/hw/dma/sifive_pdma.c b/hw/dma/sifive_pdma.c index bae77544b2..2fbc37ffd1 100644 --- a/hw/dma/sifive_pdma.c +++ b/hw/dma/sifive_pdma.c @@ -25,7 +25,7 @@ #include "qemu/log.h" #include "qapi/error.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "system/dma.h" diff --git a/hw/dma/sparc32_dma.c b/hw/dma/sparc32_dma.c index 9f56faf9a5..5601d221ec 100644 --- a/hw/dma/sparc32_dma.c +++ b/hw/dma/sparc32_dma.c @@ -27,7 +27,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sparc/sparc32_dma.h" #include "hw/sparc/sun4m_iommu.h" #include "hw/sysbus.h" diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c index 15da3fcbc2..7cdd76330f 100644 --- a/hw/dma/xilinx_axidma.c +++ b/hw/dma/xilinx_axidma.c @@ -29,7 +29,7 @@ #include "hw/hw.h" #include "hw/core/irq.h" #include "hw/core/ptimer.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/dma/xlnx-zdma.c b/hw/dma/xlnx-zdma.c index 660fc21b6d..306c56c3ef 100644 --- a/hw/dma/xlnx-zdma.c +++ b/hw/dma/xlnx-zdma.c @@ -29,7 +29,7 @@ #include "qemu/osdep.h" #include "hw/dma/xlnx-zdma.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/bitops.h" #include "qemu/log.h" diff --git a/hw/dma/xlnx_csu_dma.c b/hw/dma/xlnx_csu_dma.c index 92f445034e..650401614e 100644 --- a/hw/dma/xlnx_csu_dma.c +++ b/hw/dma/xlnx_csu_dma.c @@ -22,7 +22,7 @@ #include "qemu/log.h" #include "qapi/error.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "system/dma.h" diff --git a/hw/fsi/cfam.c b/hw/fsi/cfam.c index e2145c5934..54c0b05769 100644 --- a/hw/fsi/cfam.c +++ b/hw/fsi/cfam.c @@ -14,7 +14,7 @@ #include "hw/fsi/cfam.h" #include "hw/fsi/fsi.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #define ENGINE_CONFIG_NEXT BIT(31) #define ENGINE_CONFIG_TYPE_PEEK (0x02 << 4) diff --git a/hw/fsi/lbus.c b/hw/fsi/lbus.c index 8ec7f5fd78..cae29e0658 100644 --- a/hw/fsi/lbus.c +++ b/hw/fsi/lbus.c @@ -8,7 +8,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/fsi/lbus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/log.h" #include "trace.h" diff --git a/hw/gpio/imx_gpio.c b/hw/gpio/imx_gpio.c index 842c997a2a..5abf208df4 100644 --- a/hw/gpio/imx_gpio.c +++ b/hw/gpio/imx_gpio.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "hw/gpio/imx_gpio.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/gpio/npcm7xx_gpio.c b/hw/gpio/npcm7xx_gpio.c index 59b95d232b..ad19b9fd42 100644 --- a/hw/gpio/npcm7xx_gpio.c +++ b/hw/gpio/npcm7xx_gpio.c @@ -17,7 +17,7 @@ #include "hw/gpio/npcm7xx_gpio.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/log.h" diff --git a/hw/gpio/omap_gpio.c b/hw/gpio/omap_gpio.c index 547f0a15a2..0c2a0f9aa6 100644 --- a/hw/gpio/omap_gpio.c +++ b/hw/gpio/omap_gpio.c @@ -21,7 +21,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/arm/omap.h" #include "hw/sysbus.h" #include "qemu/error-report.h" diff --git a/hw/gpio/pca9552.c b/hw/gpio/pca9552.c index fe1d8dbffa..dd3c795e49 100644 --- a/hw/gpio/pca9552.c +++ b/hw/gpio/pca9552.c @@ -14,7 +14,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "qemu/bitops.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/gpio/pca9552.h" #include "hw/gpio/pca9552_regs.h" #include "hw/core/irq.h" diff --git a/hw/gpio/pca9554.c b/hw/gpio/pca9554.c index c6cdd27b3f..8427e01e9b 100644 --- a/hw/gpio/pca9554.c +++ b/hw/gpio/pca9554.c @@ -10,7 +10,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "qemu/bitops.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/gpio/pca9554.h" #include "hw/gpio/pca9554_regs.h" #include "hw/core/irq.h" diff --git a/hw/gpio/pl061.c b/hw/gpio/pl061.c index 09b3224712..55f51b6cf2 100644 --- a/hw/gpio/pl061.c +++ b/hw/gpio/pl061.c @@ -32,7 +32,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/sysbus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/log.h" diff --git a/hw/gpio/sifive_gpio.c b/hw/gpio/sifive_gpio.c index 63ca721fad..b7a56935c0 100644 --- a/hw/gpio/sifive_gpio.c +++ b/hw/gpio/sifive_gpio.c @@ -14,7 +14,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/gpio/sifive_gpio.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/gpio/stm32l4x5_gpio.c b/hw/gpio/stm32l4x5_gpio.c index 5686bd53c2..92fa397fba 100644 --- a/hw/gpio/stm32l4x5_gpio.c +++ b/hw/gpio/stm32l4x5_gpio.c @@ -22,7 +22,7 @@ #include "hw/core/irq.h" #include "hw/core/clock.h" #include "hw/core/qdev-clock.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/visitor.h" #include "qapi/error.h" #include "migration/vmstate.h" diff --git a/hw/hyperv/hv-balloon.c b/hw/hyperv/hv-balloon.c index deb20d7b6a..9dd759f11e 100644 --- a/hw/hyperv/hv-balloon.c +++ b/hw/hyperv/hv-balloon.c @@ -20,7 +20,7 @@ #include "hw/mem/memory-device.h" #include "hw/mem/pc-dimm.h" #include "hw/core/qdev.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "monitor/qdev.h" #include "qapi/error.h" #include "qapi/qapi-commands-machine.h" diff --git a/hw/hyperv/syndbg.c b/hw/hyperv/syndbg.c index 29908e886b..dc6cc84b50 100644 --- a/hw/hyperv/syndbg.c +++ b/hw/hyperv/syndbg.c @@ -13,7 +13,7 @@ #include "qemu/units.h" #include "qapi/error.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/loader.h" #include "exec/target_page.h" #include "hw/hyperv/hyperv.h" diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c index 961406cdd6..639d932b09 100644 --- a/hw/hyperv/vmbus.c +++ b/hw/hyperv/vmbus.c @@ -13,7 +13,7 @@ #include "exec/target_page.h" #include "qapi/error.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/hyperv/hyperv.h" #include "hw/hyperv/vmbus.h" diff --git a/hw/i2c/aspeed_i2c.c b/hw/i2c/aspeed_i2c.c index 3d66dd863a..e3ca77865b 100644 --- a/hw/i2c/aspeed_i2c.c +++ b/hw/i2c/aspeed_i2c.c @@ -28,7 +28,7 @@ #include "qapi/error.h" #include "hw/i2c/aspeed_i2c.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/registerfields.h" #include "trace.h" diff --git a/hw/i2c/core.c b/hw/i2c/core.c index 4b6345b588..54f6bdca88 100644 --- a/hw/i2c/core.c +++ b/hw/i2c/core.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "hw/i2c/i2c.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/i2c/i2c_mux_pca954x.c b/hw/i2c/i2c_mux_pca954x.c index fd317f5670..7802c68452 100644 --- a/hw/i2c/i2c_mux_pca954x.c +++ b/hw/i2c/i2c_mux_pca954x.c @@ -20,7 +20,7 @@ #include "hw/i2c/i2c_mux_pca954x.h" #include "hw/i2c/smbus_slave.h" #include "hw/core/qdev.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/i2c/omap_i2c.c b/hw/i2c/omap_i2c.c index 6ac151d851..c768f99e38 100644 --- a/hw/i2c/omap_i2c.c +++ b/hw/i2c/omap_i2c.c @@ -22,7 +22,7 @@ #include "qemu/module.h" #include "hw/i2c/i2c.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/arm/omap.h" #include "hw/sysbus.h" #include "qemu/error-report.h" diff --git a/hw/i2c/smbus_eeprom.c b/hw/i2c/smbus_eeprom.c index ce3723e148..d9ac556a0a 100644 --- a/hw/i2c/smbus_eeprom.c +++ b/hw/i2c/smbus_eeprom.c @@ -28,7 +28,7 @@ #include "hw/core/boards.h" #include "hw/i2c/i2c.h" #include "hw/i2c/smbus_slave.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/i2c/smbus_eeprom.h" #include "qom/object.h" diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c index d689a06eca..789e09d6f2 100644 --- a/hw/i386/amd_iommu.c +++ b/hw/i386/amd_iommu.c @@ -31,7 +31,7 @@ #include "hw/i386/apic_internal.h" #include "trace.h" #include "hw/i386/apic-msidef.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "kvm/kvm_i386.h" #include "qemu/iova-tree.h" diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 78b142ccea..f744be9f70 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -27,7 +27,7 @@ #include "intel_iommu_internal.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/i386/pc.h" #include "hw/i386/apic-msidef.h" #include "hw/i386/x86-iommu.h" diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c index f56382717f..310b9a8eb5 100644 --- a/hw/i386/kvm/clock.c +++ b/hw/i386/kvm/clock.c @@ -23,7 +23,7 @@ #include "migration/vmstate.h" #include "hw/sysbus.h" #include "hw/i386/kvm/clock.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include diff --git a/hw/i386/kvm/ioapic.c b/hw/i386/kvm/ioapic.c index 693ee978a1..ba7888e3d1 100644 --- a/hw/i386/kvm/ioapic.c +++ b/hw/i386/kvm/ioapic.c @@ -12,7 +12,7 @@ #include "qemu/osdep.h" #include "monitor/monitor.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/intc/ioapic_internal.h" #include "hw/intc/kvm_irqcount.h" #include "system/kvm.h" diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 5fd2f9d1e0..18158ad15e 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -40,7 +40,7 @@ #include "hw/i386/kvm/clock.h" #include "hw/pci-host/q35.h" #include "hw/pci/pcie_port.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/i386/x86.h" #include "hw/i386/pc.h" #include "hw/i386/amd_iommu.h" diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c index 4d64aa1555..906df5e788 100644 --- a/hw/i386/pc_sysfw.c +++ b/hw/i386/pc_sysfw.c @@ -33,7 +33,7 @@ #include "hw/i386/x86.h" #include "hw/i386/pc.h" #include "hw/core/loader.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/block/flash.h" #include "system/kvm.h" #include "target/i386/sev.h" diff --git a/hw/i386/sgx-epc.c b/hw/i386/sgx-epc.c index 2b3b2823b5..d3fe10028c 100644 --- a/hw/i386/sgx-epc.c +++ b/hw/i386/sgx-epc.c @@ -13,7 +13,7 @@ #include "hw/i386/pc.h" #include "hw/i386/sgx-epc.h" #include "hw/mem/memory-device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qapi/visitor.h" #include "target/i386/cpu.h" diff --git a/hw/i386/vmmouse.c b/hw/i386/vmmouse.c index 3896159b05..2ae7f3a242 100644 --- a/hw/i386/vmmouse.c +++ b/hw/i386/vmmouse.c @@ -27,7 +27,7 @@ #include "ui/console.h" #include "hw/i386/vmport.h" #include "hw/input/i8042.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "cpu.h" #include "qom/object.h" diff --git a/hw/i386/vmport.c b/hw/i386/vmport.c index 32e02e1eeb..865e0e70db 100644 --- a/hw/i386/vmport.c +++ b/hw/i386/vmport.c @@ -31,7 +31,7 @@ #include "qemu/osdep.h" #include "hw/isa/isa.h" #include "hw/i386/vmport.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/boards.h" #include "system/system.h" #include "system/hw_accel.h" diff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c index c127a44bb4..21e0d40e11 100644 --- a/hw/i386/x86-iommu.c +++ b/hw/i386/x86-iommu.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/i386/x86-iommu.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/i386/pc.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/hw/i386/xen/xen_pvdevice.c b/hw/i386/xen/xen_pvdevice.c index 87a974ae5a..fab26a06af 100644 --- a/hw/i386/xen/xen_pvdevice.c +++ b/hw/i386/xen/xen_pvdevice.c @@ -33,7 +33,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "trace.h" #include "qom/object.h" diff --git a/hw/ide/ahci-sysbus.c b/hw/ide/ahci-sysbus.c index 210818d047..c722e91be1 100644 --- a/hw/ide/ahci-sysbus.c +++ b/hw/ide/ahci-sysbus.c @@ -23,7 +23,7 @@ #include "qemu/osdep.h" #include "system/address-spaces.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/ide/ahci-sysbus.h" diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index 2a59516a9d..d44a90a162 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "hw/isa/isa.h" diff --git a/hw/ide/isa.c b/hw/ide/isa.c index 5f418413c1..c97b7a1ff4 100644 --- a/hw/ide/isa.c +++ b/hw/ide/isa.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/ide/macio.c b/hw/ide/macio.c index 07db7dc34a..a7ed41fa26 100644 --- a/hw/ide/macio.c +++ b/hw/ide/macio.c @@ -26,7 +26,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/ppc/mac_dbdma.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "hw/misc/macio/macio.h" diff --git a/hw/ide/mmio.c b/hw/ide/mmio.c index 699874db78..04b56ac5d8 100644 --- a/hw/ide/mmio.c +++ b/hw/ide/mmio.c @@ -30,7 +30,7 @@ #include "system/dma.h" #include "hw/ide/mmio.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "ide-internal.h" /***********************************************************/ diff --git a/hw/input/adb.c b/hw/input/adb.c index bcb11edca3..29c09c7559 100644 --- a/hw/input/adb.c +++ b/hw/input/adb.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "hw/input/adb.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "qemu/timer.h" diff --git a/hw/input/lasips2.c b/hw/input/lasips2.c index 70a179907c..e34e9cb5c0 100644 --- a/hw/input/lasips2.c +++ b/hw/input/lasips2.c @@ -23,7 +23,7 @@ */ #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "hw/input/ps2.h" #include "hw/input/lasips2.h" diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c index 48b457cac7..b09c3bce93 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.c @@ -33,7 +33,7 @@ #include "hw/input/ps2.h" #include "hw/core/irq.h" #include "hw/input/i8042.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/reset.h" #include "system/runstate.h" diff --git a/hw/input/stellaris_gamepad.c b/hw/input/stellaris_gamepad.c index bd80db6fac..f64f5ea9ce 100644 --- a/hw/input/stellaris_gamepad.c +++ b/hw/input/stellaris_gamepad.c @@ -11,7 +11,7 @@ #include "qapi/error.h" #include "hw/input/stellaris_gamepad.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "ui/console.h" diff --git a/hw/input/virtio-input-hid.c b/hw/input/virtio-input-hid.c index d986c3c16e..bcbfef0b90 100644 --- a/hw/input/virtio-input-hid.c +++ b/hw/input/virtio-input-hid.c @@ -9,7 +9,7 @@ #include "qemu/module.h" #include "hw/virtio/virtio.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-input.h" #include "ui/console.h" diff --git a/hw/input/virtio-input-host.c b/hw/input/virtio-input-host.c index 9f62532559..633547cc4f 100644 --- a/hw/input/virtio-input-host.c +++ b/hw/input/virtio-input-host.c @@ -10,7 +10,7 @@ #include "qemu/sockets.h" #include "hw/virtio/virtio.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-input.h" #include diff --git a/hw/input/virtio-input.c b/hw/input/virtio-input.c index a3f554f211..6494cfbbe8 100644 --- a/hw/input/virtio-input.c +++ b/hw/input/virtio-input.c @@ -11,7 +11,7 @@ #include "trace.h" #include "hw/virtio/virtio.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-input.h" #include "standard-headers/linux/input.h" diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index 83e1bc2d75..afac20440f 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -29,7 +29,7 @@ #include "trace.h" #include "hw/core/boards.h" #include "system/kvm.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/intc/arm_gic_common.c b/hw/intc/arm_gic_common.c index ed5be05645..304d89cf56 100644 --- a/hw/intc/arm_gic_common.c +++ b/hw/intc/arm_gic_common.c @@ -24,7 +24,7 @@ #include "qemu/error-report.h" #include "gic_internal.h" #include "hw/arm/linux-boot-if.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "system/kvm.h" diff --git a/hw/intc/arm_gicv2m.c b/hw/intc/arm_gicv2m.c index e823fcc97f..c39d31b187 100644 --- a/hw/intc/arm_gicv2m.c +++ b/hw/intc/arm_gicv2m.c @@ -30,7 +30,7 @@ #include "hw/sysbus.h" #include "hw/core/irq.h" #include "hw/pci/msi.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/kvm.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/intc/arm_gicv3_common.c b/hw/intc/arm_gicv3_common.c index 2d0df6da86..0a2e5a3e2f 100644 --- a/hw/intc/arm_gicv3_common.c +++ b/hw/intc/arm_gicv3_common.c @@ -27,7 +27,7 @@ #include "qemu/error-report.h" #include "hw/core/cpu.h" #include "hw/intc/arm_gicv3_common.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "gicv3_internal.h" #include "hw/arm/linux-boot-if.h" diff --git a/hw/intc/arm_gicv3_its.c b/hw/intc/arm_gicv3_its.c index 577b445405..cce3486d74 100644 --- a/hw/intc/arm_gicv3_its.c +++ b/hw/intc/arm_gicv3_its.c @@ -14,7 +14,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "trace.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/intc/arm_gicv3_its_common.h" #include "gicv3_internal.h" #include "qom/object.h" diff --git a/hw/intc/arm_gicv3_its_kvm.c b/hw/intc/arm_gicv3_its_kvm.c index 9812d50859..ae12d41eee 100644 --- a/hw/intc/arm_gicv3_its_kvm.c +++ b/hw/intc/arm_gicv3_its_kvm.c @@ -23,7 +23,7 @@ #include "qemu/module.h" #include "qemu/error-report.h" #include "hw/intc/arm_gicv3_its_common.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/runstate.h" #include "system/kvm.h" #include "kvm_arm.h" diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c index bb39a690a5..5fa210c633 100644 --- a/hw/intc/armv7m_nvic.c +++ b/hw/intc/armv7m_nvic.c @@ -17,7 +17,7 @@ #include "qemu/timer.h" #include "hw/intc/armv7m_nvic.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/tcg.h" #include "system/runstate.h" #include "target/arm/cpu.h" diff --git a/hw/intc/exynos4210_combiner.c b/hw/intc/exynos4210_combiner.c index b9e74d19c3..8bea69d91b 100644 --- a/hw/intc/exynos4210_combiner.c +++ b/hw/intc/exynos4210_combiner.c @@ -35,7 +35,7 @@ #include "hw/arm/exynos4210.h" #include "hw/hw.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qom/object.h" //#define DEBUG_COMBINER diff --git a/hw/intc/exynos4210_gic.c b/hw/intc/exynos4210_gic.c index 5b156f7ef5..a65c9c6d28 100644 --- a/hw/intc/exynos4210_gic.c +++ b/hw/intc/exynos4210_gic.c @@ -26,7 +26,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/intc/exynos4210_gic.h" #include "hw/arm/exynos4210.h" #include "qom/object.h" diff --git a/hw/intc/goldfish_pic.c b/hw/intc/goldfish_pic.c index 7aaccba75a..96e7d5c225 100644 --- a/hw/intc/goldfish_pic.c +++ b/hw/intc/goldfish_pic.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" diff --git a/hw/intc/grlib_irqmp.c b/hw/intc/grlib_irqmp.c index bb2ee5f801..ce7cbc98c1 100644 --- a/hw/intc/grlib_irqmp.c +++ b/hw/intc/grlib_irqmp.c @@ -30,7 +30,7 @@ #include "hw/core/irq.h" #include "hw/sysbus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/intc/grlib_irqmp.h" #include "trace.h" diff --git a/hw/intc/i8259_common.c b/hw/intc/i8259_common.c index 602e44c8ea..8ceb5841b9 100644 --- a/hw/intc/i8259_common.c +++ b/hw/intc/i8259_common.c @@ -26,7 +26,7 @@ #include "qemu/osdep.h" #include "hw/intc/i8259.h" #include "hw/isa/i8259_internal.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qapi/error.h" diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c index 38e4384648..98de6ca810 100644 --- a/hw/intc/ioapic.c +++ b/hw/intc/ioapic.c @@ -29,7 +29,7 @@ #include "hw/intc/ioapic.h" #include "hw/intc/ioapic_internal.h" #include "hw/pci/msi.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/accel-irq.h" #include "system/kvm.h" #include "system/system.h" diff --git a/hw/intc/loongarch_dintc.c b/hw/intc/loongarch_dintc.c index 082755d28b..574e4a0d27 100644 --- a/hw/intc/loongarch_dintc.c +++ b/hw/intc/loongarch_dintc.c @@ -15,7 +15,7 @@ #include "hw/misc/unimp.h" #include "migration/vmstate.h" #include "trace.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "target/loongarch/cpu.h" #include "qemu/error-report.h" #include "system/hw_accel.h" diff --git a/hw/intc/loongarch_extioi_common.c b/hw/intc/loongarch_extioi_common.c index ba03383ed1..5cb0d396c6 100644 --- a/hw/intc/loongarch_extioi_common.c +++ b/hw/intc/loongarch_extioi_common.c @@ -7,7 +7,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/intc/loongarch_extioi_common.h" #include "migration/vmstate.h" #include "target/loongarch/cpu.h" diff --git a/hw/intc/loongarch_ipi.c b/hw/intc/loongarch_ipi.c index 2a4557a8ba..5d8b8c96df 100644 --- a/hw/intc/loongarch_ipi.c +++ b/hw/intc/loongarch_ipi.c @@ -10,7 +10,7 @@ #include "hw/core/boards.h" #include "qapi/error.h" #include "hw/intc/loongarch_ipi.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/kvm.h" #include "target/loongarch/cpu.h" diff --git a/hw/intc/loongarch_pic_common.c b/hw/intc/loongarch_pic_common.c index de170501cf..309182b2fb 100644 --- a/hw/intc/loongarch_pic_common.c +++ b/hw/intc/loongarch_pic_common.c @@ -7,7 +7,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/intc/loongarch_pic_common.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" static int loongarch_pic_pre_save(void *opaque) diff --git a/hw/intc/loongson_ipi.c b/hw/intc/loongson_ipi.c index fbc73e8b00..88d22afa6a 100644 --- a/hw/intc/loongson_ipi.c +++ b/hw/intc/loongson_ipi.c @@ -7,7 +7,7 @@ #include "qemu/osdep.h" #include "hw/intc/loongson_ipi.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "target/mips/cpu.h" diff --git a/hw/intc/loongson_liointc.c b/hw/intc/loongson_liointc.c index 4c24f330ed..053d9898f8 100644 --- a/hw/intc/loongson_liointc.c +++ b/hw/intc/loongson_liointc.c @@ -23,7 +23,7 @@ #include "qemu/module.h" #include "qemu/log.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/intc/loongson_liointc.h" #define NUM_IRQS 32 diff --git a/hw/intc/m68k_irqc.c b/hw/intc/m68k_irqc.c index 67cb9acb41..c652bf143f 100644 --- a/hw/intc/m68k_irqc.c +++ b/hw/intc/m68k_irqc.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/nmi.h" #include "hw/intc/intc.h" #include "hw/intc/m68k_irqc.h" diff --git a/hw/intc/mips_gic.c b/hw/intc/mips_gic.c index 08925fe1e4..e983f3a2b5 100644 --- a/hw/intc/mips_gic.c +++ b/hw/intc/mips_gic.c @@ -20,7 +20,7 @@ #include "kvm_mips.h" #include "hw/intc/mips_gic.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" static void mips_gic_set_vp_irq(MIPSGICState *gic, int vp, int pin) { diff --git a/hw/intc/omap_intc.c b/hw/intc/omap_intc.c index 7b23b6d2ce..deb21f9dc1 100644 --- a/hw/intc/omap_intc.c +++ b/hw/intc/omap_intc.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/arm/omap.h" #include "hw/sysbus.h" #include "qemu/error-report.h" diff --git a/hw/intc/ompic.c b/hw/intc/ompic.c index 5a630bd51c..05f0ef8254 100644 --- a/hw/intc/ompic.c +++ b/hw/intc/ompic.c @@ -10,7 +10,7 @@ #include "qemu/module.h" #include "qapi/error.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "system/memory.h" diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c index edac46227f..4cc5068ffc 100644 --- a/hw/intc/openpic.c +++ b/hw/intc/openpic.c @@ -35,7 +35,7 @@ #include "hw/pci/pci.h" #include "hw/ppc/openpic.h" #include "hw/ppc/ppc_e500.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "hw/pci/msi.h" diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c index 673ea9ca05..6558135baa 100644 --- a/hw/intc/openpic_kvm.c +++ b/hw/intc/openpic_kvm.c @@ -28,7 +28,7 @@ #include "hw/ppc/openpic.h" #include "hw/ppc/openpic_kvm.h" #include "hw/pci/msi.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "system/kvm.h" #include "qemu/log.h" diff --git a/hw/intc/pnv_xive.c b/hw/intc/pnv_xive.c index c2ca40b8be..13ac2c6ccb 100644 --- a/hw/intc/pnv_xive.c +++ b/hw/intc/pnv_xive.c @@ -21,7 +21,7 @@ #include "hw/ppc/pnv_xscom.h" #include "hw/ppc/pnv_xive.h" #include "hw/ppc/xive_regs.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ppc/ppc.h" #include "trace.h" diff --git a/hw/intc/pnv_xive2.c b/hw/intc/pnv_xive2.c index 0663baab54..ae424d01c4 100644 --- a/hw/intc/pnv_xive2.c +++ b/hw/intc/pnv_xive2.c @@ -22,7 +22,7 @@ #include "hw/ppc/xive_regs.h" #include "hw/ppc/xive2_regs.h" #include "hw/ppc/ppc.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/reset.h" #include "system/qtest.h" diff --git a/hw/intc/ppc-uic.c b/hw/intc/ppc-uic.c index bfc4a4fbce..5090101f07 100644 --- a/hw/intc/ppc-uic.c +++ b/hw/intc/ppc-uic.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "hw/intc/ppc-uic.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" enum { diff --git a/hw/intc/realview_gic.c b/hw/intc/realview_gic.c index ecaf8201fd..56ece334a5 100644 --- a/hw/intc/realview_gic.c +++ b/hw/intc/realview_gic.c @@ -12,7 +12,7 @@ #include "qemu/module.h" #include "hw/intc/realview_gic.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" static void realview_gic_set_irq(void *opaque, int irq, int level) { diff --git a/hw/intc/riscv_aclint.c b/hw/intc/riscv_aclint.c index f3e37df47d..83968ad7cc 100644 --- a/hw/intc/riscv_aclint.c +++ b/hw/intc/riscv_aclint.c @@ -29,7 +29,7 @@ #include "hw/sysbus.h" #include "target/riscv/cpu.h" #include "target/riscv/time_helper.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/intc/riscv_aclint.h" #include "qemu/timer.h" #include "hw/core/irq.h" diff --git a/hw/intc/riscv_aplic.c b/hw/intc/riscv_aplic.c index 580622d171..cc5f30b558 100644 --- a/hw/intc/riscv_aplic.c +++ b/hw/intc/riscv_aplic.c @@ -26,7 +26,7 @@ #include "hw/sysbus.h" #include "hw/pci/msi.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/intc/riscv_aplic.h" #include "hw/core/irq.h" #include "target/riscv/cpu.h" diff --git a/hw/intc/riscv_imsic.c b/hw/intc/riscv_imsic.c index 54e72b81e7..bc580c000e 100644 --- a/hw/intc/riscv_imsic.c +++ b/hw/intc/riscv_imsic.c @@ -26,7 +26,7 @@ #include "hw/sysbus.h" #include "hw/pci/msi.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/intc/riscv_imsic.h" #include "hw/core/irq.h" #include "target/riscv/cpu.h" diff --git a/hw/intc/rx_icu.c b/hw/intc/rx_icu.c index 84712e2e4d..788afe6b1a 100644 --- a/hw/intc/rx_icu.c +++ b/hw/intc/rx_icu.c @@ -28,7 +28,7 @@ #include "qemu/error-report.h" #include "hw/core/irq.h" #include "hw/registerfields.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/intc/rx_icu.h" #include "migration/vmstate.h" diff --git a/hw/intc/s390_flic.c b/hw/intc/s390_flic.c index 1eed5125d1..508b58382e 100644 --- a/hw/intc/s390_flic.c +++ b/hw/intc/s390_flic.c @@ -17,7 +17,7 @@ #include "hw/sysbus.h" #include "hw/s390x/ioinst.h" #include "hw/s390x/s390_flic.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/s390x/css.h" #include "trace.h" #include "qapi/error.h" diff --git a/hw/intc/sifive_plic.c b/hw/intc/sifive_plic.c index c578b6e36d..5df578822f 100644 --- a/hw/intc/sifive_plic.c +++ b/hw/intc/sifive_plic.c @@ -25,7 +25,7 @@ #include "qemu/error-report.h" #include "hw/sysbus.h" #include "hw/pci/msi.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/intc/sifive_plic.h" #include "target/riscv/cpu.h" #include "migration/vmstate.h" diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c index e393f5dcdc..76ab476f59 100644 --- a/hw/intc/spapr_xive.c +++ b/hw/intc/spapr_xive.c @@ -21,7 +21,7 @@ #include "hw/ppc/spapr_xive.h" #include "hw/ppc/xive.h" #include "hw/ppc/xive_regs.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "trace.h" /* diff --git a/hw/intc/xics.c b/hw/intc/xics.c index e87c0ad2bc..1d40c4386d 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -30,7 +30,7 @@ #include "trace.h" #include "qemu/timer.h" #include "hw/ppc/xics.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/error-report.h" #include "qemu/module.h" #include "qapi/visitor.h" diff --git a/hw/intc/xilinx_intc.c b/hw/intc/xilinx_intc.c index f5a59d8983..465df1c3af 100644 --- a/hw/intc/xilinx_intc.c +++ b/hw/intc/xilinx_intc.c @@ -30,7 +30,7 @@ #include "hw/sysbus.h" #include "qemu/module.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "qom/object.h" diff --git a/hw/intc/xive.c b/hw/intc/xive.c index 6f9babf601..d702b58bd0 100644 --- a/hw/intc/xive.c +++ b/hw/intc/xive.c @@ -14,7 +14,7 @@ #include "system/cpus.h" #include "system/dma.h" #include "system/reset.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/core/irq.h" #include "hw/ppc/xive.h" diff --git a/hw/intc/xive2.c b/hw/intc/xive2.c index fbb3b7975e..495925196a 100644 --- a/hw/intc/xive2.c +++ b/hw/intc/xive2.c @@ -13,7 +13,7 @@ #include "target/ppc/cpu.h" #include "system/cpus.h" #include "system/dma.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ppc/xive.h" #include "hw/ppc/xive2.h" #include "hw/ppc/xive2_regs.h" diff --git a/hw/intc/xlnx-pmu-iomod-intc.c b/hw/intc/xlnx-pmu-iomod-intc.c index 098c1f327c..f3509efa0a 100644 --- a/hw/intc/xlnx-pmu-iomod-intc.c +++ b/hw/intc/xlnx-pmu-iomod-intc.c @@ -33,7 +33,7 @@ #include "qemu/module.h" #include "hw/intc/xlnx-pmu-iomod-intc.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #ifndef XLNX_PMU_IO_INTC_ERR_DEBUG #define XLNX_PMU_IO_INTC_ERR_DEBUG 0 diff --git a/hw/ipack/ipack.c b/hw/ipack/ipack.c index 4a710eb187..f2e5524fa8 100644 --- a/hw/ipack/ipack.c +++ b/hw/ipack/ipack.c @@ -13,7 +13,7 @@ #include "qemu/module.h" #include "hw/ipack/ipack.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" IPackDevice *ipack_device_find(IPackBus *bus, int32_t slot) diff --git a/hw/ipmi/ipmi.c b/hw/ipmi/ipmi.c index 2a7bc667ec..b49affacce 100644 --- a/hw/ipmi/ipmi.c +++ b/hw/ipmi/ipmi.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "hw/ipmi/ipmi.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qom/object_interfaces.h" #include "system/runstate.h" #include "qapi/error.h" diff --git a/hw/ipmi/ipmi_bmc_extern.c b/hw/ipmi/ipmi_bmc_extern.c index 2c6c515579..fb90a7d7c3 100644 --- a/hw/ipmi/ipmi_bmc_extern.c +++ b/hw/ipmi/ipmi_bmc_extern.c @@ -34,7 +34,7 @@ #include "qemu/timer.h" #include "chardev/char-fe.h" #include "hw/ipmi/ipmi.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" #include "qom/object.h" diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c index 9b3e3a4b7e..b86943c324 100644 --- a/hw/ipmi/ipmi_bmc_sim.c +++ b/hw/ipmi/ipmi_bmc_sim.c @@ -29,7 +29,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "hw/core/loader.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" diff --git a/hw/ipmi/isa_ipmi_bt.c b/hw/ipmi/isa_ipmi_bt.c index 2b26f9c9f0..911e16afbe 100644 --- a/hw/ipmi/isa_ipmi_bt.c +++ b/hw/ipmi/isa_ipmi_bt.c @@ -28,7 +28,7 @@ #include "hw/core/irq.h" #include "hw/ipmi/ipmi_bt.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qom/object.h" #include "hw/acpi/ipmi.h" diff --git a/hw/ipmi/isa_ipmi_kcs.c b/hw/ipmi/isa_ipmi_kcs.c index 14e85e6e9f..927f6b7a56 100644 --- a/hw/ipmi/isa_ipmi_kcs.c +++ b/hw/ipmi/isa_ipmi_kcs.c @@ -28,7 +28,7 @@ #include "hw/core/irq.h" #include "hw/ipmi/ipmi_kcs.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qom/object.h" #include "hw/acpi/ipmi.h" diff --git a/hw/isa/isa-superio.c b/hw/isa/isa-superio.c index 941b0f91d7..dc6ae3cb10 100644 --- a/hw/isa/isa-superio.c +++ b/hw/isa/isa-superio.c @@ -20,7 +20,7 @@ #include "hw/char/parallel.h" #include "hw/block/fdc.h" #include "hw/isa/superio.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/input/i8042.h" #include "hw/char/parallel-isa.h" #include "hw/char/serial-isa.h" diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index 6e772eca57..51dc680029 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -45,7 +45,7 @@ #include "hw/acpi/ich9.h" #include "hw/acpi/ich9_timer.h" #include "hw/pci/pci_bus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/runstate.h" #include "system/system.h" #include "hw/core/cpu.h" diff --git a/hw/isa/pc87312.c b/hw/isa/pc87312.c index 388da8f590..2a2c3e7b66 100644 --- a/hw/isa/pc87312.c +++ b/hw/isa/pc87312.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "hw/isa/pc87312.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/hw/isa/piix.c b/hw/isa/piix.c index bf1c79a3e6..04b2be2cc3 100644 --- a/hw/isa/piix.c +++ b/hw/isa/piix.c @@ -30,7 +30,7 @@ #include "hw/southbridge/piix.h" #include "hw/timer/i8254.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ide/piix.h" #include "hw/intc/i8259.h" #include "hw/isa/isa.h" diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 1362a1f404..99be41d0ad 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -19,7 +19,7 @@ #include "hw/char/parallel-isa.h" #include "hw/char/serial-isa.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ide/pci.h" #include "hw/isa/isa.h" #include "hw/isa/superio.h" diff --git a/hw/m68k/mcf5206.c b/hw/m68k/mcf5206.c index e17da4fd20..4bc7b1d189 100644 --- a/hw/m68k/mcf5206.c +++ b/hw/m68k/mcf5206.c @@ -10,7 +10,7 @@ #include "qemu/error-report.h" #include "qemu/log.h" #include "cpu.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/boards.h" #include "hw/core/irq.h" #include "hw/m68k/mcf.h" diff --git a/hw/m68k/mcf_intc.c b/hw/m68k/mcf_intc.c index efac6802a9..b8770e3a53 100644 --- a/hw/m68k/mcf_intc.c +++ b/hw/m68k/mcf_intc.c @@ -14,7 +14,7 @@ #include "hw/core/irq.h" #include "hw/sysbus.h" #include "hw/m68k/mcf.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qom/object.h" #define TYPE_MCF_INTC "mcf-intc" diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index e7217cbaea..75ae66c311 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -25,7 +25,7 @@ #include "hw/char/escc.h" /* ZILOG 8530 Serial Emulation */ #include "hw/block/fdc.h" #include "hw/misc/empty_slot.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "ui/console.h" diff --git a/hw/m68k/q800-glue.c b/hw/m68k/q800-glue.c index 84dd01459c..24fccab966 100644 --- a/hw/m68k/q800-glue.c +++ b/hw/m68k/q800-glue.c @@ -26,7 +26,7 @@ #include "hw/core/boards.h" #include "hw/core/irq.h" #include "hw/core/nmi.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" /* diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c index 7007d4e4e9..2d83919fa8 100644 --- a/hw/m68k/virt.c +++ b/hw/m68k/virt.c @@ -14,7 +14,7 @@ #include "system/system.h" #include "cpu.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "elf.h" #include "hw/core/loader.h" #include "ui/console.h" diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c index 4f3688a71b..26baa1c3d6 100644 --- a/hw/mem/cxl_type3.c +++ b/hw/mem/cxl_type3.c @@ -17,7 +17,7 @@ #include "hw/mem/memory-device.h" #include "hw/mem/pc-dimm.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "qapi/error.h" #include "qemu/log.h" diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c index 23ab143ef8..b703252527 100644 --- a/hw/mem/nvdimm.c +++ b/hw/mem/nvdimm.c @@ -28,7 +28,7 @@ #include "qapi/error.h" #include "qapi/visitor.h" #include "hw/mem/nvdimm.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/mem/memory-device.h" #include "system/hostmem.h" diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index 33e5a376ff..3efe47f499 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -21,7 +21,7 @@ #include "qemu/osdep.h" #include "hw/core/boards.h" #include "hw/mem/pc-dimm.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/mem/nvdimm.h" #include "hw/mem/memory-device.h" diff --git a/hw/mem/sparse-mem.c b/hw/mem/sparse-mem.c index d7b00e563a..9186da6b1a 100644 --- a/hw/mem/sparse-mem.c +++ b/hw/mem/sparse-mem.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "qapi/error.h" #include "qemu/units.h" diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c index f5b9b2e890..9c2b0ff0b3 100644 --- a/hw/microblaze/petalogix_ml605_mmu.c +++ b/hw/microblaze/petalogix_ml605_mmu.c @@ -35,7 +35,7 @@ #include "system/system.h" #include "hw/core/boards.h" #include "hw/char/serial-mm.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/address-spaces.h" #include "hw/ssi/ssi.h" diff --git a/hw/mips/boston.c b/hw/mips/boston.c index b63b27d03f..4579df23eb 100644 --- a/hw/mips/boston.c +++ b/hw/mips/boston.c @@ -31,7 +31,7 @@ #include "hw/mips/cps.h" #include "hw/pci-host/xilinx-pcie.h" #include "hw/core/qdev-clock.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/guest-random.h" diff --git a/hw/mips/cps.c b/hw/mips/cps.c index 13f048ef9c..620ee972f8 100644 --- a/hw/mips/cps.c +++ b/hw/mips/cps.c @@ -23,7 +23,7 @@ #include "hw/mips/cps.h" #include "hw/mips/mips.h" #include "hw/core/qdev-clock.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/tcg.h" #include "system/reset.h" diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c index d4c100b69a..d0efe36f7c 100644 --- a/hw/mips/fuloong2e.c +++ b/hw/mips/fuloong2e.c @@ -33,7 +33,7 @@ #include "hw/pci/pci.h" #include "hw/core/loader.h" #include "hw/ide/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "elf.h" #include "hw/isa/vt82c686.h" #include "system/qtest.h" diff --git a/hw/misc/a9scu.c b/hw/misc/a9scu.c index bb00ae2969..d5eb985044 100644 --- a/hw/misc/a9scu.c +++ b/hw/misc/a9scu.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "hw/misc/a9scu.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/log.h" diff --git a/hw/misc/allwinner-h3-dramc.c b/hw/misc/allwinner-h3-dramc.c index 8834524c30..ef491b36ff 100644 --- a/hw/misc/allwinner-h3-dramc.c +++ b/hw/misc/allwinner-h3-dramc.c @@ -25,7 +25,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "system/address-spaces.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "hw/misc/allwinner-h3-dramc.h" #include "trace.h" diff --git a/hw/misc/allwinner-r40-dramc.c b/hw/misc/allwinner-r40-dramc.c index 1c8e17e3c0..3af8af733a 100644 --- a/hw/misc/allwinner-r40-dramc.c +++ b/hw/misc/allwinner-r40-dramc.c @@ -25,7 +25,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "system/address-spaces.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/bitops.h" #include "hw/misc/allwinner-r40-dramc.h" diff --git a/hw/misc/allwinner-sid.c b/hw/misc/allwinner-sid.c index 1e66c14567..17faf67e60 100644 --- a/hw/misc/allwinner-sid.c +++ b/hw/misc/allwinner-sid.c @@ -25,7 +25,7 @@ #include "qemu/module.h" #include "qemu/guest-random.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/misc/allwinner-sid.h" #include "trace.h" diff --git a/hw/misc/allwinner-sramc.c b/hw/misc/allwinner-sramc.c index ed299ecaae..bd7f59fec9 100644 --- a/hw/misc/allwinner-sramc.c +++ b/hw/misc/allwinner-sramc.c @@ -24,7 +24,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/misc/allwinner-sramc.h" #include "trace.h" diff --git a/hw/misc/applesmc.c b/hw/misc/applesmc.c index a015d4a9b8..fd96f5f245 100644 --- a/hw/misc/applesmc.c +++ b/hw/misc/applesmc.c @@ -32,7 +32,7 @@ #include "qemu/osdep.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "ui/console.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/hw/misc/arm11scu.c b/hw/misc/arm11scu.c index 2ad4fd1d21..89c2c4cd73 100644 --- a/hw/misc/arm11scu.c +++ b/hw/misc/arm11scu.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "hw/misc/arm11scu.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/arm_l2x0.c b/hw/misc/arm_l2x0.c index 8b4b61eed0..a5511845c7 100644 --- a/hw/misc/arm_l2x0.c +++ b/hw/misc/arm_l2x0.c @@ -19,7 +19,7 @@ */ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" diff --git a/hw/misc/arm_sysctl.c b/hw/misc/arm_sysctl.c index 8995eaeec3..0c91ebafac 100644 --- a/hw/misc/arm_sysctl.c +++ b/hw/misc/arm_sysctl.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/timer.h" #include "system/runstate.h" #include "qemu/bitops.h" diff --git a/hw/misc/armsse-cpuid.c b/hw/misc/armsse-cpuid.c index a57764d731..3a52bb5381 100644 --- a/hw/misc/armsse-cpuid.c +++ b/hw/misc/armsse-cpuid.c @@ -26,7 +26,7 @@ #include "hw/sysbus.h" #include "hw/registerfields.h" #include "hw/misc/armsse-cpuid.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" REG32(CPUID, 0x0) REG32(PID4, 0xfd0) diff --git a/hw/misc/aspeed_hace.c b/hw/misc/aspeed_hace.c index 51c73ca2a5..23e8030cd9 100644 --- a/hw/misc/aspeed_hace.c +++ b/hw/misc/aspeed_hace.c @@ -18,7 +18,7 @@ #include "qapi/error.h" #include "migration/vmstate.h" #include "crypto/hash.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/irq.h" #include "trace.h" diff --git a/hw/misc/aspeed_i3c.c b/hw/misc/aspeed_i3c.c index 3bef1c84dd..37a05b9ce2 100644 --- a/hw/misc/aspeed_i3c.c +++ b/hw/misc/aspeed_i3c.c @@ -12,7 +12,7 @@ #include "qemu/error-report.h" #include "hw/misc/aspeed_i3c.h" #include "hw/registerfields.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/misc/aspeed_lpc.c b/hw/misc/aspeed_lpc.c index 829955e6f1..68f0f6334b 100644 --- a/hw/misc/aspeed_lpc.c +++ b/hw/misc/aspeed_lpc.c @@ -14,7 +14,7 @@ #include "qapi/error.h" #include "qapi/visitor.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #define TO_REG(offset) ((offset) >> 2) diff --git a/hw/misc/aspeed_sbc.c b/hw/misc/aspeed_sbc.c index 2fc5db749d..065e822e70 100644 --- a/hw/misc/aspeed_sbc.c +++ b/hw/misc/aspeed_sbc.c @@ -11,7 +11,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "qemu/error-report.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/misc/aspeed_sbc.h" #include "qapi/error.h" #include "migration/vmstate.h" diff --git a/hw/misc/aspeed_scu.c b/hw/misc/aspeed_scu.c index a0ab5eed8f..d27e0c7f91 100644 --- a/hw/misc/aspeed_scu.c +++ b/hw/misc/aspeed_scu.c @@ -11,7 +11,7 @@ #include "qemu/osdep.h" #include "hw/misc/aspeed_scu.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qapi/visitor.h" diff --git a/hw/misc/aspeed_sdmc.c b/hw/misc/aspeed_sdmc.c index dff7cc362d..59b4a9a426 100644 --- a/hw/misc/aspeed_sdmc.c +++ b/hw/misc/aspeed_sdmc.c @@ -12,7 +12,7 @@ #include "qemu/module.h" #include "qemu/error-report.h" #include "hw/misc/aspeed_sdmc.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "trace.h" diff --git a/hw/misc/aspeed_sli.c b/hw/misc/aspeed_sli.c index c51484035e..5b4d70cdc0 100644 --- a/hw/misc/aspeed_sli.c +++ b/hw/misc/aspeed_sli.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "qemu/error-report.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/misc/aspeed_sli.h" #include "qapi/error.h" #include "migration/vmstate.h" diff --git a/hw/misc/avr_power.c b/hw/misc/avr_power.c index 947304ed3b..f42cf4fd90 100644 --- a/hw/misc/avr_power.c +++ b/hw/misc/avr_power.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "hw/misc/avr_power.h" #include "qemu/log.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/irq.h" #include "trace.h" diff --git a/hw/misc/bcm2835_cprman.c b/hw/misc/bcm2835_cprman.c index efe6f900db..8220f7a6b4 100644 --- a/hw/misc/bcm2835_cprman.c +++ b/hw/misc/bcm2835_cprman.c @@ -46,7 +46,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/misc/bcm2835_cprman.h" #include "hw/misc/bcm2835_cprman_internals.h" #include "trace.h" diff --git a/hw/misc/bcm2835_property.c b/hw/misc/bcm2835_property.c index 2026294ce1..216a746c2b 100644 --- a/hw/misc/bcm2835_property.c +++ b/hw/misc/bcm2835_property.c @@ -8,7 +8,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/misc/bcm2835_property.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/core/irq.h" #include "hw/misc/bcm2835_mbox_defs.h" diff --git a/hw/misc/debugexit.c b/hw/misc/debugexit.c index 04a9fc3122..cdd19166a5 100644 --- a/hw/misc/debugexit.c +++ b/hw/misc/debugexit.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/module.h" #include "qom/object.h" #include "system/runstate.h" diff --git a/hw/misc/djmemc.c b/hw/misc/djmemc.c index c5b09f551b..5fd3a8bfb2 100644 --- a/hw/misc/djmemc.c +++ b/hw/misc/djmemc.c @@ -11,7 +11,7 @@ #include "qemu/log.h" #include "migration/vmstate.h" #include "hw/misc/djmemc.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "trace.h" diff --git a/hw/misc/eccmemctl.c b/hw/misc/eccmemctl.c index 71243ba5ba..f93cbd1659 100644 --- a/hw/misc/eccmemctl.c +++ b/hw/misc/eccmemctl.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/misc/empty_slot.c b/hw/misc/empty_slot.c index 239d760320..a012668214 100644 --- a/hw/misc/empty_slot.c +++ b/hw/misc/empty_slot.c @@ -11,7 +11,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/misc/empty_slot.h" #include "qapi/error.h" #include "trace.h" diff --git a/hw/misc/iotkit-secctl.c b/hw/misc/iotkit-secctl.c index f8a2946191..64e94a7647 100644 --- a/hw/misc/iotkit-secctl.c +++ b/hw/misc/iotkit-secctl.c @@ -20,7 +20,7 @@ #include "hw/core/irq.h" #include "hw/misc/iotkit-secctl.h" #include "hw/arm/armsse-version.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" /* Registers in the secure privilege control block */ REG32(SECRESPCFG, 0x10) diff --git a/hw/misc/iotkit-sysctl.c b/hw/misc/iotkit-sysctl.c index d70e51ab2e..a9c3568c21 100644 --- a/hw/misc/iotkit-sysctl.c +++ b/hw/misc/iotkit-sysctl.c @@ -27,7 +27,7 @@ #include "migration/vmstate.h" #include "hw/registerfields.h" #include "hw/misc/iotkit-sysctl.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/arm/armsse-version.h" #include "target/arm/arm-powerctl.h" diff --git a/hw/misc/iotkit-sysinfo.c b/hw/misc/iotkit-sysinfo.c index 57405cb7e1..a53b1f5180 100644 --- a/hw/misc/iotkit-sysinfo.c +++ b/hw/misc/iotkit-sysinfo.c @@ -25,7 +25,7 @@ #include "hw/sysbus.h" #include "hw/registerfields.h" #include "hw/misc/iotkit-sysinfo.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/arm/armsse-version.h" REG32(SYS_VERSION, 0x0) diff --git a/hw/misc/ivshmem-pci.c b/hw/misc/ivshmem-pci.c index 636d0b83de..fb69af52f6 100644 --- a/hw/misc/ivshmem-pci.c +++ b/hw/misc/ivshmem-pci.c @@ -22,7 +22,7 @@ #include "qapi/error.h" #include "qemu/cutils.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" diff --git a/hw/misc/led.c b/hw/misc/led.c index f7f709072a..d9256aaaf5 100644 --- a/hw/misc/led.c +++ b/hw/misc/led.c @@ -8,7 +8,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/misc/led.h" #include "trace.h" diff --git a/hw/misc/mac_via.c b/hw/misc/mac_via.c index 13ccd3023f..887397ae84 100644 --- a/hw/misc/mac_via.c +++ b/hw/misc/mac_via.c @@ -27,7 +27,7 @@ #include "system/runstate.h" #include "qapi/error.h" #include "qemu/cutils.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "system/block-backend.h" #include "system/rtc.h" diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c index 3b8dd462f5..312dde242b 100644 --- a/hw/misc/macio/cuda.c +++ b/hw/misc/macio/cuda.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/misc/macio/cuda.h" #include "qemu/timer.h" diff --git a/hw/misc/macio/gpio.c b/hw/misc/macio/gpio.c index 77658cb6d0..1a7c534d65 100644 --- a/hw/misc/macio/gpio.c +++ b/hw/misc/macio/gpio.c @@ -24,7 +24,7 @@ */ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/misc/macio/macio.h" #include "hw/misc/macio/gpio.h" diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c index 6710485d72..2813705c03 100644 --- a/hw/misc/macio/macio.c +++ b/hw/misc/macio/macio.c @@ -29,7 +29,7 @@ #include "hw/misc/macio/cuda.h" #include "hw/pci/pci.h" #include "hw/ppc/mac_dbdma.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/char/escc.h" #include "hw/misc/macio/macio.h" diff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c index 73e64306b8..04640c20e0 100644 --- a/hw/misc/macio/pmu.c +++ b/hw/misc/macio/pmu.c @@ -29,7 +29,7 @@ */ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/core/irq.h" #include "hw/misc/macio/pmu.h" diff --git a/hw/misc/max78000_gcr.c b/hw/misc/max78000_gcr.c index 6d2e2bd617..e8dc593732 100644 --- a/hw/misc/max78000_gcr.c +++ b/hw/misc/max78000_gcr.c @@ -12,7 +12,7 @@ #include "hw/core/irq.h" #include "system/runstate.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/char/max78000_uart.h" #include "hw/misc/max78000_trng.h" #include "hw/misc/max78000_aes.h" diff --git a/hw/misc/mips_cmgcr.c b/hw/misc/mips_cmgcr.c index 5484b73967..1c6e9d1f6f 100644 --- a/hw/misc/mips_cmgcr.c +++ b/hw/misc/mips_cmgcr.c @@ -16,7 +16,7 @@ #include "migration/vmstate.h" #include "hw/misc/mips_cmgcr.h" #include "hw/misc/mips_cpc.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/intc/mips_gic.h" static inline bool is_cpc_connected(MIPSGCRState *s) diff --git a/hw/misc/mips_cpc.c b/hw/misc/mips_cpc.c index 9bfb7c9721..efc0326f6f 100644 --- a/hw/misc/mips_cpc.c +++ b/hw/misc/mips_cpc.c @@ -26,7 +26,7 @@ #include "migration/vmstate.h" #include "hw/misc/mips_cpc.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" static inline uint64_t cpc_vp_run_mask(MIPSCPCState *cpc) { diff --git a/hw/misc/mips_itu.c b/hw/misc/mips_itu.c index fc17385cde..82c0a90f70 100644 --- a/hw/misc/mips_itu.c +++ b/hw/misc/mips_itu.c @@ -24,7 +24,7 @@ #include "qapi/error.h" #include "hw/core/cpu.h" #include "hw/misc/mips_itu.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "target/mips/cpu.h" #define ITC_TAG_ADDRSPACE_SZ (ITC_ADDRESSMAP_NUM * 8) diff --git a/hw/misc/mos6522.c b/hw/misc/mos6522.c index 728931883d..bae766ef17 100644 --- a/hw/misc/mos6522.c +++ b/hw/misc/mos6522.c @@ -27,7 +27,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/misc/mos6522.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "monitor/monitor.h" #include "monitor/hmp.h" diff --git a/hw/misc/mps2-fpgaio.c b/hw/misc/mps2-fpgaio.c index bee1309f5a..f3d51fd228 100644 --- a/hw/misc/mps2-fpgaio.c +++ b/hw/misc/mps2-fpgaio.c @@ -25,7 +25,7 @@ #include "hw/registerfields.h" #include "hw/misc/mps2-fpgaio.h" #include "hw/misc/led.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/timer.h" REG32(LED0, 0) diff --git a/hw/misc/mps2-scc.c b/hw/misc/mps2-scc.c index ea9cad85dc..56aa013507 100644 --- a/hw/misc/mps2-scc.c +++ b/hw/misc/mps2-scc.c @@ -28,7 +28,7 @@ #include "hw/registerfields.h" #include "hw/misc/mps2-scc.h" #include "hw/misc/led.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" REG32(CFG0, 0) REG32(CFG1, 4) diff --git a/hw/misc/msf2-sysreg.c b/hw/misc/msf2-sysreg.c index ce0ad50c1b..90c786e95a 100644 --- a/hw/misc/msf2-sysreg.c +++ b/hw/misc/msf2-sysreg.c @@ -17,7 +17,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/misc/msf2-sysreg.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/error-report.h" #include "trace.h" diff --git a/hw/misc/npcm7xx_mft.c b/hw/misc/npcm7xx_mft.c index 0bbae111cf..21e74385c7 100644 --- a/hw/misc/npcm7xx_mft.c +++ b/hw/misc/npcm7xx_mft.c @@ -17,7 +17,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/core/qdev-clock.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/misc/npcm7xx_mft.h" #include "hw/misc/npcm7xx_pwm.h" #include "hw/registerfields.h" diff --git a/hw/misc/npcm7xx_pwm.c b/hw/misc/npcm7xx_pwm.c index 39ac0dbe2a..1b010e51ec 100644 --- a/hw/misc/npcm7xx_pwm.c +++ b/hw/misc/npcm7xx_pwm.c @@ -17,7 +17,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/core/qdev-clock.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/misc/npcm7xx_pwm.h" #include "hw/registerfields.h" #include "migration/vmstate.h" diff --git a/hw/misc/npcm_gcr.c b/hw/misc/npcm_gcr.c index 2acaa16771..2d7e5b5a01 100644 --- a/hw/misc/npcm_gcr.c +++ b/hw/misc/npcm_gcr.c @@ -17,7 +17,7 @@ #include "qemu/osdep.h" #include "hw/misc/npcm_gcr.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/cutils.h" diff --git a/hw/misc/nrf51_rng.c b/hw/misc/nrf51_rng.c index 0254fb377a..37c832d976 100644 --- a/hw/misc/nrf51_rng.c +++ b/hw/misc/nrf51_rng.c @@ -16,7 +16,7 @@ #include "hw/arm/nrf51.h" #include "hw/core/irq.h" #include "hw/misc/nrf51_rng.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/guest-random.h" diff --git a/hw/misc/pci-testdev.c b/hw/misc/pci-testdev.c index ba71c5069f..3c3887afe0 100644 --- a/hw/misc/pci-testdev.c +++ b/hw/misc/pci-testdev.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/event_notifier.h" #include "qemu/module.h" #include "system/kvm.h" diff --git a/hw/misc/pvpanic-isa.c b/hw/misc/pvpanic-isa.c index f7b421c713..85fb7da5e5 100644 --- a/hw/misc/pvpanic-isa.c +++ b/hw/misc/pvpanic-isa.c @@ -17,7 +17,7 @@ #include "system/runstate.h" #include "hw/nvram/fw_cfg.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/misc/pvpanic.h" #include "qom/object.h" #include "hw/isa/isa.h" diff --git a/hw/misc/pvpanic-mmio.c b/hw/misc/pvpanic-mmio.c index 2a363106b2..2d1464435a 100644 --- a/hw/misc/pvpanic-mmio.c +++ b/hw/misc/pvpanic-mmio.c @@ -8,7 +8,7 @@ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/misc/pvpanic.h" #include "hw/sysbus.h" #include "standard-headers/misc/pvpanic.h" diff --git a/hw/misc/pvpanic-pci.c b/hw/misc/pvpanic-pci.c index 2869b6a7ff..5509f70a3e 100644 --- a/hw/misc/pvpanic-pci.c +++ b/hw/misc/pvpanic-pci.c @@ -16,7 +16,7 @@ #include "system/runstate.h" #include "hw/nvram/fw_cfg.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/misc/pvpanic.h" #include "qom/object.h" diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c index c83247c408..bbd06d9acc 100644 --- a/hw/misc/pvpanic.c +++ b/hw/misc/pvpanic.c @@ -18,7 +18,7 @@ #include "system/runstate.h" #include "hw/nvram/fw_cfg.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/misc/pvpanic.h" #include "qom/object.h" #include "standard-headers/misc/pvpanic.h" diff --git a/hw/misc/sifive_e_aon.c b/hw/misc/sifive_e_aon.c index 9b1e7baf95..4d6e015ca3 100644 --- a/hw/misc/sifive_e_aon.c +++ b/hw/misc/sifive_e_aon.c @@ -25,7 +25,7 @@ #include "qapi/visitor.h" #include "qapi/error.h" #include "system/watchdog.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" REG32(AON_WDT_WDOGCFG, 0x0) FIELD(AON_WDT_WDOGCFG, SCALE, 0, 4) diff --git a/hw/misc/sifive_u_otp.c b/hw/misc/sifive_u_otp.c index 1ebed2fd8b..1d35268046 100644 --- a/hw/misc/sifive_u_otp.c +++ b/hw/misc/sifive_u_otp.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/sysbus.h" #include "qemu/error-report.h" diff --git a/hw/misc/stm32l4x5_rcc.c b/hw/misc/stm32l4x5_rcc.c index 1b012d1cc1..c2b25e9a4d 100644 --- a/hw/misc/stm32l4x5_rcc.c +++ b/hw/misc/stm32l4x5_rcc.c @@ -26,7 +26,7 @@ #include "hw/core/clock.h" #include "hw/core/irq.h" #include "hw/core/qdev-clock.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/registerfields.h" #include "trace.h" diff --git a/hw/misc/tz-mpc.c b/hw/misc/tz-mpc.c index d922639da1..fb5d232bff 100644 --- a/hw/misc/tz-mpc.c +++ b/hw/misc/tz-mpc.c @@ -19,7 +19,7 @@ #include "hw/registerfields.h" #include "hw/core/irq.h" #include "hw/misc/tz-mpc.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" /* Our IOMMU has two IOMMU indexes, one for secure transactions and one for * non-secure transactions. diff --git a/hw/misc/tz-msc.c b/hw/misc/tz-msc.c index 74c31f6d7d..3e33455d42 100644 --- a/hw/misc/tz-msc.c +++ b/hw/misc/tz-msc.c @@ -19,7 +19,7 @@ #include "hw/registerfields.h" #include "hw/core/irq.h" #include "hw/misc/tz-msc.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" static void tz_msc_update_irq(TZMSC *s) { diff --git a/hw/misc/tz-ppc.c b/hw/misc/tz-ppc.c index 2ab03fa973..a41c6011fb 100644 --- a/hw/misc/tz-ppc.c +++ b/hw/misc/tz-ppc.c @@ -19,7 +19,7 @@ #include "hw/registerfields.h" #include "hw/core/irq.h" #include "hw/misc/tz-ppc.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" static void tz_ppc_update_irq(TZPPC *s) { diff --git a/hw/misc/virt_ctrl.c b/hw/misc/virt_ctrl.c index 9f16093ca2..7cb1ea5d18 100644 --- a/hw/misc/virt_ctrl.c +++ b/hw/misc/virt_ctrl.c @@ -5,7 +5,7 @@ */ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" diff --git a/hw/misc/xlnx-versal-cframe-reg.c b/hw/misc/xlnx-versal-cframe-reg.c index 616c0ecf83..33a4ece26f 100644 --- a/hw/misc/xlnx-versal-cframe-reg.c +++ b/hw/misc/xlnx-versal-cframe-reg.c @@ -16,7 +16,7 @@ #include "qemu/log.h" #include "qemu/units.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/core/irq.h" #include "hw/misc/xlnx-versal-cframe-reg.h" diff --git a/hw/misc/xlnx-versal-cfu.c b/hw/misc/xlnx-versal-cfu.c index ce58404eb2..80f9612b2f 100644 --- a/hw/misc/xlnx-versal-cfu.c +++ b/hw/misc/xlnx-versal-cfu.c @@ -18,7 +18,7 @@ #include "qemu/log.h" #include "qemu/units.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/misc/xlnx-versal-cfu.h" diff --git a/hw/misc/xlnx-versal-crl.c b/hw/misc/xlnx-versal-crl.c index 8f9a40d941..b0baabc1ad 100644 --- a/hw/misc/xlnx-versal-crl.c +++ b/hw/misc/xlnx-versal-crl.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "hw/core/irq.h" #include "hw/register.h" diff --git a/hw/misc/xlnx-versal-pmc-iou-slcr.c b/hw/misc/xlnx-versal-pmc-iou-slcr.c index c75800c1b3..84d474c38f 100644 --- a/hw/misc/xlnx-versal-pmc-iou-slcr.c +++ b/hw/misc/xlnx-versal-pmc-iou-slcr.c @@ -30,7 +30,7 @@ #include "qemu/bitops.h" #include "qemu/log.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/misc/xlnx-versal-pmc-iou-slcr.h" #ifndef XILINX_VERSAL_PMC_IOU_SLCR_ERR_DEBUG diff --git a/hw/misc/xlnx-versal-trng.c b/hw/misc/xlnx-versal-trng.c index 2b573a45bd..aa1d65de7b 100644 --- a/hw/misc/xlnx-versal-trng.c +++ b/hw/misc/xlnx-versal-trng.c @@ -35,7 +35,7 @@ #include "qemu/timer.h" #include "qapi/visitor.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #ifndef XLNX_VERSAL_TRNG_ERR_DEBUG #define XLNX_VERSAL_TRNG_ERR_DEBUG 0 diff --git a/hw/misc/xlnx-versal-xramc.c b/hw/misc/xlnx-versal-xramc.c index af58bc761f..6a86f6b5d4 100644 --- a/hw/misc/xlnx-versal-xramc.c +++ b/hw/misc/xlnx-versal-xramc.c @@ -12,7 +12,7 @@ #include "migration/vmstate.h" #include "hw/sysbus.h" #include "hw/register.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/irq.h" #include "hw/misc/xlnx-versal-xramc.h" diff --git a/hw/misc/xlnx-zynqmp-apu-ctrl.c b/hw/misc/xlnx-zynqmp-apu-ctrl.c index 196e2452ae..93f0bedc48 100644 --- a/hw/misc/xlnx-zynqmp-apu-ctrl.c +++ b/hw/misc/xlnx-zynqmp-apu-ctrl.c @@ -12,7 +12,7 @@ #include "qapi/error.h" #include "qemu/log.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "hw/core/irq.h" #include "hw/register.h" diff --git a/hw/misc/zynq_slcr.c b/hw/misc/zynq_slcr.c index cc18b21b22..d1900a2b94 100644 --- a/hw/misc/zynq_slcr.c +++ b/hw/misc/zynq_slcr.c @@ -24,7 +24,7 @@ #include "hw/registerfields.h" #include "hw/core/qdev-clock.h" #include "qom/object.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #ifndef ZYNQ_SLCR_ERR_DEBUG diff --git a/hw/net/allwinner-sun8i-emac.c b/hw/net/allwinner-sun8i-emac.c index a4824d61bd..8ff0db5ccd 100644 --- a/hw/net/allwinner-sun8i-emac.c +++ b/hw/net/allwinner-sun8i-emac.c @@ -24,7 +24,7 @@ #include "migration/vmstate.h" #include "net/net.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/log.h" #include "trace.h" #include "net/checksum.h" diff --git a/hw/net/allwinner_emac.c b/hw/net/allwinner_emac.c index 9158c77cb4..cbe4cb80e4 100644 --- a/hw/net/allwinner_emac.c +++ b/hw/net/allwinner_emac.c @@ -24,7 +24,7 @@ #include "qemu/fifo8.h" #include "hw/core/irq.h" #include "hw/net/allwinner_emac.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/log.h" #include "qemu/module.h" #include diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c index ef72821f8d..fe9747fdb6 100644 --- a/hw/net/cadence_gem.c +++ b/hw/net/cadence_gem.c @@ -27,7 +27,7 @@ #include "hw/core/irq.h" #include "hw/net/cadence_gem.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/registerfields.h" #include "migration/vmstate.h" #include "qapi/error.h" diff --git a/hw/net/can/can_kvaser_pci.c b/hw/net/can/can_kvaser_pci.c index 52584c5d6f..f2912b206d 100644 --- a/hw/net/can/can_kvaser_pci.c +++ b/hw/net/can/can_kvaser_pci.c @@ -34,7 +34,7 @@ #include "qapi/error.h" #include "hw/core/irq.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "net/can_emu.h" diff --git a/hw/net/can/can_mioe3680_pci.c b/hw/net/can/can_mioe3680_pci.c index 2e9e09741b..fe1a91ee0e 100644 --- a/hw/net/can/can_mioe3680_pci.c +++ b/hw/net/can/can_mioe3680_pci.c @@ -30,7 +30,7 @@ #include "qapi/error.h" #include "hw/core/irq.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "net/can_emu.h" diff --git a/hw/net/can/can_pcm3680_pci.c b/hw/net/can/can_pcm3680_pci.c index 7dd23c905e..ea45de28a8 100644 --- a/hw/net/can/can_pcm3680_pci.c +++ b/hw/net/can/can_pcm3680_pci.c @@ -30,7 +30,7 @@ #include "qapi/error.h" #include "hw/core/irq.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "net/can_emu.h" diff --git a/hw/net/can/ctucan_pci.c b/hw/net/can/ctucan_pci.c index ad2b1e60cb..40654778a4 100644 --- a/hw/net/can/ctucan_pci.c +++ b/hw/net/can/ctucan_pci.c @@ -31,7 +31,7 @@ #include "qapi/error.h" #include "hw/core/irq.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "net/can_emu.h" diff --git a/hw/net/can/xlnx-versal-canfd.c b/hw/net/can/xlnx-versal-canfd.c index 0734279557..94d9178a54 100644 --- a/hw/net/can/xlnx-versal-canfd.c +++ b/hw/net/can/xlnx-versal-canfd.c @@ -36,7 +36,7 @@ #include "hw/register.h" #include "qapi/error.h" #include "qemu/log.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/net/xlnx-versal-canfd.h" #include "trace.h" diff --git a/hw/net/can/xlnx-zynqmp-can.c b/hw/net/can/xlnx-zynqmp-can.c index a98b208169..533ac854a2 100644 --- a/hw/net/can/xlnx-zynqmp-can.c +++ b/hw/net/can/xlnx-zynqmp-can.c @@ -38,7 +38,7 @@ #include "qemu/log.h" #include "qemu/cutils.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "net/can_emu.h" #include "net/can_host.h" #include "qemu/event_notifier.h" diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index 68062481c5..182f0e5f6b 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -19,7 +19,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/net/dp8393x.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/net/e1000.c b/hw/net/e1000.c index a80a7b0cdb..202ad40401 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -28,7 +28,7 @@ #include "qemu/osdep.h" #include "hw/net/mii.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "net/eth.h" #include "net/net.h" diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c index 89e6d52ba0..3d4683370c 100644 --- a/hw/net/e1000e.c +++ b/hw/net/e1000e.c @@ -45,7 +45,7 @@ #include "hw/net/mii.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "e1000_common.h" diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c index d47df5a97f..aaa3eb60f8 100644 --- a/hw/net/eepro100.c +++ b/hw/net/eepro100.c @@ -45,7 +45,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "net/net.h" #include "net/eth.h" diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c index e6a29d9ec6..5b77528e36 100644 --- a/hw/net/fsl_etsec/etsec.c +++ b/hw/net/fsl_etsec/etsec.c @@ -31,7 +31,7 @@ #include "hw/core/irq.h" #include "hw/net/mii.h" #include "hw/core/ptimer.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "etsec.h" #include "registers.h" #include "qapi/error.h" diff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c index d5590391b7..d29f7dcd17 100644 --- a/hw/net/ftgmac100.c +++ b/hw/net/ftgmac100.c @@ -21,7 +21,7 @@ #include "net/checksum.h" #include "net/eth.h" #include "hw/net/mii.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include /* for crc32 */ diff --git a/hw/net/i82596.c b/hw/net/i82596.c index a94cfa2d6d..37ce20efb1 100644 --- a/hw/net/i82596.c +++ b/hw/net/i82596.c @@ -41,7 +41,7 @@ #include "net/net.h" #include "net/eth.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "system/address-spaces.h" #include "qemu/module.h" diff --git a/hw/net/igb.c b/hw/net/igb.c index e4c02365d6..d39eba9f64 100644 --- a/hw/net/igb.c +++ b/hw/net/igb.c @@ -52,7 +52,7 @@ #include "hw/pci/pcie_sriov.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "igb_common.h" diff --git a/hw/net/imx_fec.c b/hw/net/imx_fec.c index 386d24421c..c177b7ff2b 100644 --- a/hw/net/imx_fec.c +++ b/hw/net/imx_fec.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/net/imx_fec.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "system/dma.h" #include "qemu/log.h" diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c index 191fd8b421..381fd38764 100644 --- a/hw/net/lan9118.c +++ b/hw/net/lan9118.c @@ -19,7 +19,7 @@ #include "hw/net/lan9118_phy.h" #include "hw/net/lan9118.h" #include "hw/core/ptimer.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/bswap.h" #include "qemu/log.h" diff --git a/hw/net/lance.c b/hw/net/lance.c index dfb855c23a..5d5bf9b961 100644 --- a/hw/net/lance.c +++ b/hw/net/lance.c @@ -41,7 +41,7 @@ #include "hw/sparc/sparc32_dma.h" #include "migration/vmstate.h" #include "hw/net/lance.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "trace.h" #include "system/system.h" diff --git a/hw/net/lasi_i82596.c b/hw/net/lasi_i82596.c index 2f212a7ed3..50e3c4fa86 100644 --- a/hw/net/lasi_i82596.c +++ b/hw/net/lasi_i82596.c @@ -19,7 +19,7 @@ #include "hw/net/lasi_82596.h" #include "hw/net/i82596.h" #include "trace.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #define PA_I82596_RESET 0 /* Offsets relative to LASI-LAN-Addr.*/ diff --git a/hw/net/mcf_fec.c b/hw/net/mcf_fec.c index 9cd9436985..ecf105adf2 100644 --- a/hw/net/mcf_fec.c +++ b/hw/net/mcf_fec.c @@ -14,7 +14,7 @@ #include "hw/m68k/mcf.h" #include "hw/m68k/mcf_fec.h" #include "hw/net/mii.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include /* for crc32 */ diff --git a/hw/net/msf2-emac.c b/hw/net/msf2-emac.c index 3e27920962..ac01d1ce47 100644 --- a/hw/net/msf2-emac.c +++ b/hw/net/msf2-emac.c @@ -35,7 +35,7 @@ #include "hw/net/msf2-emac.h" #include "hw/net/mii.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" REG32(CFG1, 0x0) diff --git a/hw/net/mv88w8618_eth.c b/hw/net/mv88w8618_eth.c index 68fda83966..1a1bba8b57 100644 --- a/hw/net/mv88w8618_eth.c +++ b/hw/net/mv88w8618_eth.c @@ -7,7 +7,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "hw/core/irq.h" #include "hw/net/mv88w8618_eth.h" diff --git a/hw/net/ne2000-pci.c b/hw/net/ne2000-pci.c index 7b215eb1f2..f741478101 100644 --- a/hw/net/ne2000-pci.c +++ b/hw/net/ne2000-pci.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "ne2000.h" #include "system/system.h" diff --git a/hw/net/npcm7xx_emc.c b/hw/net/npcm7xx_emc.c index 704f438768..4105e89429 100644 --- a/hw/net/npcm7xx_emc.c +++ b/hw/net/npcm7xx_emc.c @@ -33,7 +33,7 @@ #include "hw/core/irq.h" #include "hw/core/qdev-clock.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/net/npcm7xx_emc.h" #include "net/eth.h" #include "migration/vmstate.h" diff --git a/hw/net/opencores_eth.c b/hw/net/opencores_eth.c index 85419321d9..34992f3cc9 100644 --- a/hw/net/opencores_eth.c +++ b/hw/net/opencores_eth.c @@ -34,7 +34,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/net/mii.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "net/net.h" #include "qemu/module.h" diff --git a/hw/net/pcnet-pci.c b/hw/net/pcnet-pci.c index dad5d2ab06..bef608959a 100644 --- a/hw/net/pcnet-pci.c +++ b/hw/net/pcnet-pci.c @@ -30,7 +30,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "net/net.h" #include "qemu/module.h" diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c index fc2ce5eeb2..0bd7d4314e 100644 --- a/hw/net/pcnet.c +++ b/hw/net/pcnet.c @@ -38,7 +38,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "net/net.h" #include "net/eth.h" diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c index cc49701dd3..935e74fd7d 100644 --- a/hw/net/rocker/rocker.c +++ b/hw/net/rocker/rocker.c @@ -17,7 +17,7 @@ #include "qemu/osdep.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" #include "hw/pci/msix.h" diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index 324fb932aa..9fd00574d2 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -52,7 +52,7 @@ #include /* for crc32 */ #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "system/dma.h" #include "qemu/module.h" diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c index b1c675be6f..e3bf3b0e72 100644 --- a/hw/net/smc91c111.c +++ b/hw/net/smc91c111.c @@ -14,7 +14,7 @@ #include "hw/core/irq.h" #include "hw/net/smc91c111.h" #include "hw/registerfields.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/net/spapr_llan.c b/hw/net/spapr_llan.c index f6f217d632..550848307d 100644 --- a/hw/net/spapr_llan.c +++ b/hw/net/spapr_llan.c @@ -32,7 +32,7 @@ #include "migration/vmstate.h" #include "hw/ppc/spapr.h" #include "hw/ppc/spapr_vio.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/system.h" #include "trace.h" diff --git a/hw/net/stellaris_enet.c b/hw/net/stellaris_enet.c index a05aa8a024..c97d694585 100644 --- a/hw/net/stellaris_enet.c +++ b/hw/net/stellaris_enet.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "net/net.h" diff --git a/hw/net/sungem.c b/hw/net/sungem.c index b405eb89fa..308c2d0dbd 100644 --- a/hw/net/sungem.c +++ b/hw/net/sungem.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/net/sunhme.c b/hw/net/sunhme.c index c2f7a8483d..e2cd1b5271 100644 --- a/hw/net/sunhme.c +++ b/hw/net/sunhme.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/net/mii.h" #include "net/net.h" diff --git a/hw/net/tulip.c b/hw/net/tulip.c index 5f9df76a74..bc7b18ed36 100644 --- a/hw/net/tulip.c +++ b/hw/net/tulip.c @@ -10,7 +10,7 @@ #include "qemu/log.h" #include "hw/core/irq.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/nvram/eeprom93xx.h" #include "migration/vmstate.h" #include "system/system.h" diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index ca813203d7..317f1ad23b 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -33,7 +33,7 @@ #include "hw/virtio/virtio-bus.h" #include "qapi/error.h" #include "qapi/qapi-events-net.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/qapi-types-migration.h" #include "qapi/qapi-events-migration.h" #include "hw/virtio/virtio-access.h" diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index 03732375a7..bae3a44cb0 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -18,7 +18,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "net/tap.h" #include "net/checksum.h" #include "system/system.h" diff --git a/hw/net/xen_nic.c b/hw/net/xen_nic.c index e7bdc732de..4ef1b7dd29 100644 --- a/hw/net/xen_nic.c +++ b/hw/net/xen_nic.c @@ -37,7 +37,7 @@ #include "hw/xen/xen-backend.h" #include "hw/xen/xen-bus-helper.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/xen/interface/io/netif.h" diff --git a/hw/net/xgmac.c b/hw/net/xgmac.c index 25768644f5..f07be72512 100644 --- a/hw/net/xgmac.c +++ b/hw/net/xgmac.c @@ -26,7 +26,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c index c7cb257e62..36047a51c0 100644 --- a/hw/net/xilinx_axienet.c +++ b/hw/net/xilinx_axienet.c @@ -32,7 +32,7 @@ #include "net/checksum.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/stream.h" #include "qom/object.h" diff --git a/hw/net/xilinx_ethlite.c b/hw/net/xilinx_ethlite.c index 0d00e3cc0d..39e64a46e2 100644 --- a/hw/net/xilinx_ethlite.c +++ b/hw/net/xilinx_ethlite.c @@ -33,7 +33,7 @@ #include "qapi/error.h" #include "hw/sysbus.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/misc/unimp.h" #include "net/net.h" diff --git a/hw/nvram/aspeed_otp.c b/hw/nvram/aspeed_otp.c index dcf8ed3917..a60289000c 100644 --- a/hw/nvram/aspeed_otp.c +++ b/hw/nvram/aspeed_otp.c @@ -10,7 +10,7 @@ #include "qemu/log.h" #include "qapi/error.h" #include "system/block-backend.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/nvram/aspeed_otp.h" #include "hw/nvram/trace.h" diff --git a/hw/nvram/ds1225y.c b/hw/nvram/ds1225y.c index 0945e36652..512e548518 100644 --- a/hw/nvram/ds1225y.c +++ b/hw/nvram/ds1225y.c @@ -23,7 +23,7 @@ */ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/nvram/eeprom_at24c.c b/hw/nvram/eeprom_at24c.c index 82ea97e552..e947cf8a3b 100644 --- a/hw/nvram/eeprom_at24c.c +++ b/hw/nvram/eeprom_at24c.c @@ -14,7 +14,7 @@ #include "qemu/module.h" #include "hw/i2c/i2c.h" #include "hw/nvram/eeprom_at24c.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "system/block-backend.h" #include "qom/object.h" diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index df07424e55..e5c35b0e2e 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -30,7 +30,7 @@ #include "system/address-spaces.h" #include "hw/core/boards.h" #include "hw/nvram/fw_cfg.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "migration/qemu-file-types.h" #include "migration/vmstate.h" diff --git a/hw/nvram/mac_nvram.c b/hw/nvram/mac_nvram.c index 66526a2291..b048db0777 100644 --- a/hw/nvram/mac_nvram.c +++ b/hw/nvram/mac_nvram.c @@ -27,7 +27,7 @@ #include "qapi/error.h" #include "hw/nvram/chrp_nvram.h" #include "hw/nvram/mac_nvram.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "system/block-backend.h" #include "migration/vmstate.h" diff --git a/hw/nvram/nrf51_nvm.c b/hw/nvram/nrf51_nvm.c index 23cc9fe9b3..b841ead579 100644 --- a/hw/nvram/nrf51_nvm.c +++ b/hw/nvram/nrf51_nvm.c @@ -23,7 +23,7 @@ #include "qemu/module.h" #include "hw/arm/nrf51.h" #include "hw/nvram/nrf51_nvm.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" /* diff --git a/hw/nvram/spapr_nvram.c b/hw/nvram/spapr_nvram.c index d0ac4e5735..c9202ddfcd 100644 --- a/hw/nvram/spapr_nvram.c +++ b/hw/nvram/spapr_nvram.c @@ -36,7 +36,7 @@ #include "hw/nvram/chrp_nvram.h" #include "hw/ppc/spapr.h" #include "hw/ppc/spapr_vio.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "qom/object.h" diff --git a/hw/nvram/xlnx-bbram.c b/hw/nvram/xlnx-bbram.c index 22aefbc240..aad445b901 100644 --- a/hw/nvram/xlnx-bbram.c +++ b/hw/nvram/xlnx-bbram.c @@ -31,7 +31,7 @@ #include "qapi/error.h" #include "system/blockdev.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/nvram/xlnx-efuse.h" diff --git a/hw/nvram/xlnx-efuse.c b/hw/nvram/xlnx-efuse.c index 4c23f8b931..7eb156f941 100644 --- a/hw/nvram/xlnx-efuse.c +++ b/hw/nvram/xlnx-efuse.c @@ -31,7 +31,7 @@ #include "qemu/log.h" #include "qapi/error.h" #include "system/blockdev.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #define TBIT0_OFFSET 28 diff --git a/hw/nvram/xlnx-versal-efuse-cache.c b/hw/nvram/xlnx-versal-efuse-cache.c index d4ec96a626..56c2def5f8 100644 --- a/hw/nvram/xlnx-versal-efuse-cache.c +++ b/hw/nvram/xlnx-versal-efuse-cache.c @@ -26,7 +26,7 @@ #include "hw/nvram/xlnx-versal-efuse.h" #include "qemu/log.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #define MR_SIZE 0xC00 diff --git a/hw/nvram/xlnx-versal-efuse-ctrl.c b/hw/nvram/xlnx-versal-efuse-ctrl.c index 6f17f32a0c..b7dc0e49e5 100644 --- a/hw/nvram/xlnx-versal-efuse-ctrl.c +++ b/hw/nvram/xlnx-versal-efuse-ctrl.c @@ -29,7 +29,7 @@ #include "qemu/log.h" #include "qapi/error.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #ifndef XLNX_VERSAL_EFUSE_CTRL_ERR_DEBUG #define XLNX_VERSAL_EFUSE_CTRL_ERR_DEBUG 0 diff --git a/hw/nvram/xlnx-zynqmp-efuse.c b/hw/nvram/xlnx-zynqmp-efuse.c index ce35bb0cc1..e6bc54fc6b 100644 --- a/hw/nvram/xlnx-zynqmp-efuse.c +++ b/hw/nvram/xlnx-zynqmp-efuse.c @@ -31,7 +31,7 @@ #include "qemu/log.h" #include "qapi/error.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #ifndef ZYNQMP_EFUSE_ERR_DEBUG #define ZYNQMP_EFUSE_ERR_DEBUG 0 diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c index a42e7b5e27..bafb877cc3 100644 --- a/hw/openrisc/openrisc_sim.c +++ b/hw/openrisc/openrisc_sim.c @@ -27,7 +27,7 @@ #include "hw/char/serial-mm.h" #include "net/net.h" #include "hw/openrisc/boot.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/address-spaces.h" #include "system/device_tree.h" #include "system/system.h" diff --git a/hw/openrisc/virt.c b/hw/openrisc/virt.c index bc5d27dbdd..446a81579c 100644 --- a/hw/openrisc/virt.c +++ b/hw/openrisc/virt.c @@ -20,7 +20,7 @@ #include "hw/misc/sifive_test.h" #include "hw/pci/pci.h" #include "hw/pci-host/gpex.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/rtc/goldfish_rtc.h" #include "hw/sysbus.h" #include "hw/virtio/virtio-mmio.h" diff --git a/hw/pci-bridge/cxl_downstream.c b/hw/pci-bridge/cxl_downstream.c index 1065245a8b..1265e40c39 100644 --- a/hw/pci-bridge/cxl_downstream.c +++ b/hw/pci-bridge/cxl_downstream.c @@ -13,7 +13,7 @@ #include "hw/pci/msi.h" #include "hw/pci/pcie.h" #include "hw/pci/pcie_port.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/cxl/cxl.h" #include "qapi/error.h" diff --git a/hw/pci-bridge/cxl_root_port.c b/hw/pci-bridge/cxl_root_port.c index e6a4035d26..df359dee67 100644 --- a/hw/pci-bridge/cxl_root_port.c +++ b/hw/pci-bridge/cxl_root_port.c @@ -23,7 +23,7 @@ #include "hw/pci/pci_bridge.h" #include "hw/pci/pcie_port.h" #include "hw/pci/msi.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/sysbus.h" #include "qapi/error.h" diff --git a/hw/pci-bridge/cxl_upstream.c b/hw/pci-bridge/cxl_upstream.c index 208e0c6172..019c311bb5 100644 --- a/hw/pci-bridge/cxl_upstream.c +++ b/hw/pci-bridge/cxl_upstream.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/pci/msi.h" #include "hw/pci/pcie.h" diff --git a/hw/pci-bridge/gen_pcie_root_port.c b/hw/pci-bridge/gen_pcie_root_port.c index d9078e783b..fa1cf5e58f 100644 --- a/hw/pci-bridge/gen_pcie_root_port.c +++ b/hw/pci-bridge/gen_pcie_root_port.c @@ -15,7 +15,7 @@ #include "qemu/module.h" #include "hw/pci/msix.h" #include "hw/pci/pcie_port.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" #include "qom/object.h" diff --git a/hw/pci-bridge/pci_bridge_dev.c b/hw/pci-bridge/pci_bridge_dev.c index cb4809f38b..0c1383562d 100644 --- a/hw/pci-bridge/pci_bridge_dev.c +++ b/hw/pci-bridge/pci_bridge_dev.c @@ -27,7 +27,7 @@ #include "hw/pci/msi.h" #include "hw/pci/shpc.h" #include "hw/pci/slotid_cap.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/memory.h" #include "hw/pci/pci_bus.h" #include "hw/core/hotplug.h" diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expander_bridge.c index b3a5f16e22..08d40aa2ea 100644 --- a/hw/pci-bridge/pci_expander_bridge.c +++ b/hw/pci-bridge/pci_expander_bridge.c @@ -16,7 +16,7 @@ #include "hw/pci/pci_bus.h" #include "hw/pci/pci_host.h" #include "hw/pci/pcie_port.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/pci/pci_bridge.h" #include "hw/pci-bridge/pci_expander_bridge.h" #include "hw/cxl/cxl.h" diff --git a/hw/pci-bridge/pcie_pci_bridge.c b/hw/pci-bridge/pcie_pci_bridge.c index fce292a519..e826fb2829 100644 --- a/hw/pci-bridge/pcie_pci_bridge.c +++ b/hw/pci-bridge/pcie_pci_bridge.c @@ -16,7 +16,7 @@ #include "hw/pci/msi.h" #include "hw/pci/shpc.h" #include "hw/pci/slotid_cap.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qom/object.h" struct PCIEPCIBridge { diff --git a/hw/pci-bridge/pcie_root_port.c b/hw/pci-bridge/pcie_root_port.c index 22c2fdb71e..fe3ced5685 100644 --- a/hw/pci-bridge/pcie_root_port.c +++ b/hw/pci-bridge/pcie_root_port.c @@ -16,7 +16,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/pci/pcie_port.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" static void rp_aer_vector_update(PCIDevice *d) { diff --git a/hw/pci-bridge/xio3130_downstream.c b/hw/pci-bridge/xio3130_downstream.c index dc7d1aa7d7..0c3fed3053 100644 --- a/hw/pci-bridge/xio3130_downstream.c +++ b/hw/pci-bridge/xio3130_downstream.c @@ -24,7 +24,7 @@ #include "hw/pci/msi.h" #include "hw/pci/pcie.h" #include "hw/pci/pcie_port.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/pci-host/aspeed_pcie.c b/hw/pci-host/aspeed_pcie.c index 5d837f638c..27f1078e3a 100644 --- a/hw/pci-host/aspeed_pcie.c +++ b/hw/pci-host/aspeed_pcie.c @@ -17,7 +17,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/registerfields.h" #include "hw/core/irq.h" #include "hw/pci/pci_host.h" diff --git a/hw/pci-host/astro.c b/hw/pci-host/astro.c index b54f6ef2d5..00a904277c 100644 --- a/hw/pci-host/astro.c +++ b/hw/pci-host/astro.c @@ -28,7 +28,7 @@ #include "hw/core/irq.h" #include "hw/pci/pci_device.h" #include "hw/pci/pci_bus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/pci-host/astro.h" #include "hw/hppa/hppa_hardware.h" #include "migration/vmstate.h" diff --git a/hw/pci-host/designware.c b/hw/pci-host/designware.c index 5a80502abb..019e025382 100644 --- a/hw/pci-host/designware.c +++ b/hw/pci-host/designware.c @@ -26,7 +26,7 @@ #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_host.h" #include "hw/pci/pcie_port.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/core/irq.h" #include "hw/pci-host/designware.h" diff --git a/hw/pci-host/dino.c b/hw/pci-host/dino.c index e6fdb927f5..4e64e0f553 100644 --- a/hw/pci-host/dino.c +++ b/hw/pci-host/dino.c @@ -17,7 +17,7 @@ #include "hw/core/irq.h" #include "hw/pci/pci_device.h" #include "hw/pci/pci_bus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/pci-host/dino.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/pci-host/gpex.c b/hw/pci-host/gpex.c index 3db4c8c9f0..b5074c05c0 100644 --- a/hw/pci-host/gpex.c +++ b/hw/pci-host/gpex.c @@ -34,7 +34,7 @@ #include "hw/core/irq.h" #include "hw/pci/pci_bus.h" #include "hw/pci-host/gpex.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/pci-host/grackle.c b/hw/pci-host/grackle.c index 85a4b83228..9a58f0e9b5 100644 --- a/hw/pci-host/grackle.c +++ b/hw/pci-host/grackle.c @@ -24,7 +24,7 @@ */ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/pci/pci_device.h" #include "hw/core/irq.h" #include "qapi/error.h" diff --git a/hw/pci-host/gt64120.c b/hw/pci-host/gt64120.c index 3e497b5da5..2339f10a30 100644 --- a/hw/pci-host/gt64120.c +++ b/hw/pci-host/gt64120.c @@ -29,7 +29,7 @@ #include "qemu/units.h" #include "qemu/log.h" #include "qemu/bswap.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/registerfields.h" #include "hw/pci/pci_device.h" #include "hw/pci/pci_host.h" diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c index e13bb1b53e..15354abf3b 100644 --- a/hw/pci-host/i440fx.c +++ b/hw/pci-host/i440fx.c @@ -29,7 +29,7 @@ #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" #include "hw/pci-host/i440fx.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "qapi/error.h" #include "migration/vmstate.h" diff --git a/hw/pci-host/mv64361.c b/hw/pci-host/mv64361.c index 9f080e4825..636228c407 100644 --- a/hw/pci-host/mv64361.c +++ b/hw/pci-host/mv64361.c @@ -16,7 +16,7 @@ #include "hw/pci/pci_host.h" #include "hw/core/irq.h" #include "hw/intc/i8259.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/address-spaces.h" #include "qemu/log.h" #include "qemu/error-report.h" diff --git a/hw/pci-host/pnv_phb.c b/hw/pci-host/pnv_phb.c index 4b0ced79b0..85fcc3b686 100644 --- a/hw/pci-host/pnv_phb.c +++ b/hw/pci-host/pnv_phb.c @@ -15,7 +15,7 @@ #include "hw/pci-host/pnv_phb3.h" #include "hw/pci-host/pnv_phb4.h" #include "hw/ppc/pnv.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qom/object.h" #include "system/system.h" diff --git a/hw/pci-host/pnv_phb3.c b/hw/pci-host/pnv_phb3.c index 9808d57550..d6ab515337 100644 --- a/hw/pci-host/pnv_phb3.c +++ b/hw/pci-host/pnv_phb3.c @@ -19,7 +19,7 @@ #include "hw/ppc/pnv.h" #include "hw/ppc/pnv_chip.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qom/object.h" #include "system/system.h" diff --git a/hw/pci-host/pnv_phb3_msi.c b/hw/pci-host/pnv_phb3_msi.c index f6bf4e323a..66ba7b7913 100644 --- a/hw/pci-host/pnv_phb3_msi.c +++ b/hw/pci-host/pnv_phb3_msi.c @@ -14,7 +14,7 @@ #include "hw/ppc/pnv.h" #include "hw/pci/msi.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/reset.h" static uint64_t phb3_msi_ive_addr(PnvPHB3 *phb, int srcno) diff --git a/hw/pci-host/pnv_phb4.c b/hw/pci-host/pnv_phb4.c index 9f17fc1bb4..396bc47817 100644 --- a/hw/pci-host/pnv_phb4.c +++ b/hw/pci-host/pnv_phb4.c @@ -19,7 +19,7 @@ #include "hw/ppc/pnv.h" #include "hw/ppc/pnv_xscom.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qom/object.h" #include "trace.h" diff --git a/hw/pci-host/pnv_phb4_pec.c b/hw/pci-host/pnv_phb4_pec.c index 5bac1c42ed..58ec14ec2f 100644 --- a/hw/pci-host/pnv_phb4_pec.c +++ b/hw/pci-host/pnv_phb4_pec.c @@ -18,7 +18,7 @@ #include "hw/pci/pci_bus.h" #include "hw/ppc/pnv.h" #include "hw/ppc/pnv_chip.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/system.h" #include diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c index a8e172136e..76623f78c4 100644 --- a/hw/pci-host/ppce500.c +++ b/hw/pci-host/ppce500.c @@ -16,7 +16,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/pci/pci_device.h" #include "hw/pci/pci_host.h" diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index a708758d36..bf56229051 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -32,7 +32,7 @@ #include "qemu/log.h" #include "hw/i386/pc.h" #include "hw/pci-host/q35.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qapi/visitor.h" diff --git a/hw/pci-host/raven.c b/hw/pci-host/raven.c index a587f16131..c50061996c 100644 --- a/hw/pci-host/raven.c +++ b/hw/pci-host/raven.c @@ -30,7 +30,7 @@ #include "hw/pci/pci_device.h" #include "hw/pci/pci_bus.h" #include "hw/pci/pci_host.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/intc/i8259.h" #include "hw/core/irq.h" #include "hw/core/or-irq.h" diff --git a/hw/pci-host/remote.c b/hw/pci-host/remote.c index e6d2af4502..feaaa9adaa 100644 --- a/hw/pci-host/remote.c +++ b/hw/pci-host/remote.c @@ -26,7 +26,7 @@ #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" #include "hw/pci/pcie_host.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/pci-host/remote.h" #include "system/memory.h" diff --git a/hw/pci-host/sabre.c b/hw/pci-host/sabre.c index c2f99b76f8..87af933dc2 100644 --- a/hw/pci-host/sabre.c +++ b/hw/pci-host/sabre.c @@ -28,7 +28,7 @@ #include "hw/sysbus.h" #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_bus.h" #include "hw/core/irq.h" diff --git a/hw/pci-host/uninorth.c b/hw/pci-host/uninorth.c index 7a25f3f39f..d39546b6f4 100644 --- a/hw/pci-host/uninorth.c +++ b/hw/pci-host/uninorth.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/module.h" #include "hw/pci/pci_device.h" #include "hw/pci/pci_host.h" diff --git a/hw/pci-host/versatile.c b/hw/pci-host/versatile.c index 40dce72e67..1fdae78210 100644 --- a/hw/pci-host/versatile.c +++ b/hw/pci-host/versatile.c @@ -15,7 +15,7 @@ #include "hw/pci/pci_device.h" #include "hw/pci/pci_bus.h" #include "hw/pci/pci_host.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/log.h" #include "qemu/module.h" #include "qom/object.h" diff --git a/hw/pci-host/xilinx-pcie.c b/hw/pci-host/xilinx-pcie.c index ac6e61c83b..86c20377d1 100644 --- a/hw/pci-host/xilinx-pcie.c +++ b/hw/pci-host/xilinx-pcie.c @@ -22,7 +22,7 @@ #include "qemu/units.h" #include "qapi/error.h" #include "hw/pci/pci_bridge.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/irq.h" #include "hw/pci-host/xilinx-pcie.h" diff --git a/hw/pci/pci.c b/hw/pci/pci.c index a3118ac6d0..2371a91680 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -30,7 +30,7 @@ #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_bus.h" #include "hw/pci/pci_host.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/cpr.h" #include "migration/qemu-file-types.h" diff --git a/hw/pci/pci_bridge.c b/hw/pci/pci_bridge.c index 76255c4cd8..e85932e41a 100644 --- a/hw/pci/pci_bridge.c +++ b/hw/pci/pci_bridge.c @@ -38,7 +38,7 @@ #include "qapi/error.h" #include "hw/acpi/acpi_aml_interface.h" #include "hw/acpi/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" /* PCI bridge subsystem vendor ID helper functions */ #define PCI_SSVID_SIZEOF 8 diff --git a/hw/pci/pci_host.c b/hw/pci/pci_host.c index 7179d99178..05f1475dc7 100644 --- a/hw/pci/pci_host.c +++ b/hw/pci/pci_host.c @@ -22,7 +22,7 @@ #include "hw/pci/pci.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_host.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/module.h" #include "hw/pci/pci_bus.h" #include "migration/vmstate.h" diff --git a/hw/pci/pcie_port.c b/hw/pci/pcie_port.c index 20b5e4cfb5..dbb6032160 100644 --- a/hw/pci/pcie_port.c +++ b/hw/pci/pcie_port.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "hw/pci/pcie_port.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/module.h" #include "hw/core/hotplug.h" diff --git a/hw/pci/pcie_sriov.c b/hw/pci/pcie_sriov.c index c4f88f0975..34e0875d21 100644 --- a/hw/pci/pcie_sriov.c +++ b/hw/pci/pcie_sriov.c @@ -14,7 +14,7 @@ #include "hw/pci/pci_device.h" #include "hw/pci/pcie.h" #include "hw/pci/pci_bus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/range.h" #include "qapi/error.h" #include "trace.h" diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 7c65757e21..7f164331c8 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -38,7 +38,7 @@ #include "hw/ppc/openpic.h" #include "hw/ppc/openpic_kvm.h" #include "hw/ppc/ppc.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/loader.h" #include "elf.h" #include "hw/sysbus.h" diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index 909a4fe257..410a3ac392 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -52,7 +52,7 @@ #include "qapi/error.h" #include "exec/target_page.h" #include "hw/ppc/ppc.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/nvram/mac_nvram.h" #include "hw/core/boards.h" #include "hw/pci-host/uninorth.h" diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index 8400db6c35..e679d33898 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -30,7 +30,7 @@ #include "qapi/error.h" #include "exec/target_page.h" #include "hw/ppc/ppc.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/boards.h" #include "hw/input/adb.h" #include "system/system.h" diff --git a/hw/ppc/pegasos.c b/hw/ppc/pegasos.c index 2de80a5fae..bf290a7dcd 100644 --- a/hw/ppc/pegasos.c +++ b/hw/ppc/pegasos.c @@ -20,7 +20,7 @@ #include "hw/isa/vt82c686.h" #include "hw/ide/pci.h" #include "hw/i2c/smbus_eeprom.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/reset.h" #include "system/runstate.h" #include "system/qtest.h" diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index 8a50e9f0d8..f891c3a797 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -50,7 +50,7 @@ #include "hw/pci-host/pnv_phb4.h" #include "hw/ppc/xics.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ppc/pnv_chip.h" #include "hw/ppc/pnv_xscom.h" #include "hw/ppc/pnv_pnor.h" diff --git a/hw/ppc/pnv_adu.c b/hw/ppc/pnv_adu.c index 005fbda475..d686bfa62d 100644 --- a/hw/ppc/pnv_adu.c +++ b/hw/ppc/pnv_adu.c @@ -17,7 +17,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ppc/pnv.h" #include "hw/ppc/pnv_adu.h" #include "hw/ppc/pnv_chip.h" diff --git a/hw/ppc/pnv_chiptod.c b/hw/ppc/pnv_chiptod.c index 540d5e365f..09a5a52ac7 100644 --- a/hw/ppc/pnv_chiptod.c +++ b/hw/ppc/pnv_chiptod.c @@ -29,7 +29,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ppc/fdt.h" #include "hw/ppc/ppc.h" #include "hw/ppc/pnv.h" diff --git a/hw/ppc/pnv_core.c b/hw/ppc/pnv_core.c index fb2dfc7ba2..59a9eee597 100644 --- a/hw/ppc/pnv_core.c +++ b/hw/ppc/pnv_core.c @@ -29,7 +29,7 @@ #include "hw/ppc/pnv_core.h" #include "hw/ppc/pnv_xscom.h" #include "hw/ppc/xics.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "helper_regs.h" static const char *pnv_core_cpu_typename(PnvCore *pc) diff --git a/hw/ppc/pnv_homer.c b/hw/ppc/pnv_homer.c index fb394cc6e0..1683513dac 100644 --- a/hw/ppc/pnv_homer.c +++ b/hw/ppc/pnv_homer.c @@ -23,7 +23,7 @@ #include "system/memory.h" #include "system/cpus.h" #include "hw/core/qdev.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ppc/pnv.h" #include "hw/ppc/pnv_chip.h" #include "hw/ppc/pnv_homer.h" diff --git a/hw/ppc/pnv_i2c.c b/hw/ppc/pnv_i2c.c index 213e58b455..c8e90c636f 100644 --- a/hw/ppc/pnv_i2c.c +++ b/hw/ppc/pnv_i2c.c @@ -12,7 +12,7 @@ #include "system/reset.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ppc/pnv.h" #include "hw/ppc/pnv_chip.h" diff --git a/hw/ppc/pnv_lpc.c b/hw/ppc/pnv_lpc.c index 538681bdb3..3b65c12316 100644 --- a/hw/ppc/pnv_lpc.c +++ b/hw/ppc/pnv_lpc.c @@ -24,7 +24,7 @@ #include "qemu/module.h" #include "hw/core/irq.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ppc/pnv.h" #include "hw/ppc/pnv_chip.h" #include "hw/ppc/pnv_lpc.h" diff --git a/hw/ppc/pnv_n1_chiplet.c b/hw/ppc/pnv_n1_chiplet.c index 053f6473f2..c75ac671d3 100644 --- a/hw/ppc/pnv_n1_chiplet.c +++ b/hw/ppc/pnv_n1_chiplet.c @@ -8,7 +8,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ppc/pnv.h" #include "hw/ppc/pnv_xscom.h" #include "hw/ppc/pnv_n1_chiplet.h" diff --git a/hw/ppc/pnv_nest_pervasive.c b/hw/ppc/pnv_nest_pervasive.c index 1b1b14fed9..01119e667c 100644 --- a/hw/ppc/pnv_nest_pervasive.c +++ b/hw/ppc/pnv_nest_pervasive.c @@ -8,7 +8,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ppc/pnv.h" #include "hw/ppc/pnv_xscom.h" #include "hw/ppc/pnv_nest_pervasive.h" diff --git a/hw/ppc/pnv_occ.c b/hw/ppc/pnv_occ.c index 7e93e6a6b1..64cab3e9dc 100644 --- a/hw/ppc/pnv_occ.c +++ b/hw/ppc/pnv_occ.c @@ -22,7 +22,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ppc/pnv.h" #include "hw/ppc/pnv_chip.h" #include "hw/ppc/pnv_xscom.h" diff --git a/hw/ppc/pnv_pnor.c b/hw/ppc/pnv_pnor.c index c7cbc525b3..1083e42ab5 100644 --- a/hw/ppc/pnv_pnor.c +++ b/hw/ppc/pnv_pnor.c @@ -15,7 +15,7 @@ #include "system/blockdev.h" #include "hw/core/loader.h" #include "hw/ppc/pnv_pnor.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" static uint64_t pnv_pnor_read(void *opaque, hwaddr addr, unsigned size) diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c index 1cea9375c0..264568cdfb 100644 --- a/hw/ppc/pnv_psi.c +++ b/hw/ppc/pnv_psi.c @@ -30,7 +30,7 @@ #include "hw/ppc/fdt.h" #include "hw/ppc/pnv.h" #include "hw/ppc/pnv_xscom.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ppc/pnv_psi.h" #include diff --git a/hw/ppc/pnv_sbe.c b/hw/ppc/pnv_sbe.c index 4798e12998..27383ce683 100644 --- a/hw/ppc/pnv_sbe.c +++ b/hw/ppc/pnv_sbe.c @@ -22,7 +22,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ppc/pnv.h" #include "hw/ppc/pnv_xscom.h" #include "hw/ppc/pnv_sbe.h" diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c index 9e71037d84..491560575c 100644 --- a/hw/ppc/ppc440_bamboo.c +++ b/hw/ppc/ppc440_bamboo.c @@ -30,7 +30,7 @@ #include "system/reset.h" #include "hw/sysbus.h" #include "hw/intc/ppc-uic.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c index fd9203d7e2..fc6dd332e8 100644 --- a/hw/ppc/ppc440_uc.c +++ b/hw/ppc/ppc440_uc.c @@ -15,7 +15,7 @@ #include "hw/core/irq.h" #include "hw/ppc/ppc4xx.h" #include "hw/pci-host/ppc4xx.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/pci/pci.h" #include "system/reset.h" #include "cpu.h" diff --git a/hw/ppc/ppc4xx_devs.c b/hw/ppc/ppc4xx_devs.c index f36c519c8b..1e6b6fec5d 100644 --- a/hw/ppc/ppc4xx_devs.c +++ b/hw/ppc/ppc4xx_devs.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "hw/ppc/ppc4xx.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" /*****************************************************************************/ diff --git a/hw/ppc/ppc4xx_sdram.c b/hw/ppc/ppc4xx_sdram.c index 6cc2a82ac5..b2c8f96d5f 100644 --- a/hw/ppc/ppc4xx_sdram.c +++ b/hw/ppc/ppc4xx_sdram.c @@ -36,7 +36,7 @@ #include "qemu/error-report.h" #include "system/address-spaces.h" /* get_system_memory() */ #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ppc/ppc4xx.h" #include "trace.h" diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 90164face1..c4efd1d390 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -39,7 +39,7 @@ #include "hw/core/loader.h" #include "hw/rtc/mc146818rtc.h" #include "hw/isa/pc87312.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "exec/target_page.h" #include "system/kvm.h" #include "system/reset.h" diff --git a/hw/ppc/prep_systemio.c b/hw/ppc/prep_systemio.c index d0e42e8731..bc8b0964e7 100644 --- a/hw/ppc/prep_systemio.c +++ b/hw/ppc/prep_systemio.c @@ -26,7 +26,7 @@ #include "qemu/log.h" #include "hw/core/irq.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "system/address-spaces.h" #include "qom/object.h" diff --git a/hw/ppc/rs6000_mc.c b/hw/ppc/rs6000_mc.c index a0964051d1..d87afd6d5b 100644 --- a/hw/ppc/rs6000_mc.c +++ b/hw/ppc/rs6000_mc.c @@ -22,7 +22,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "system/address-spaces.h" #include "qapi/error.h" diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c index 550aaa21fa..b6e233747e 100644 --- a/hw/ppc/sam460ex.c +++ b/hw/ppc/sam460ex.c @@ -37,7 +37,7 @@ #include "hw/ide/pci.h" #include "hw/usb/hcd-ehci.h" #include "hw/ppc/fdt.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/intc/ppc-uic.h" #include diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 7363e533e1..eb626547eb 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -68,7 +68,7 @@ #include "hw/ppc/spapr_nested.h" #include "hw/ppc/spapr_vio.h" #include "hw/ppc/vof.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/pci-host/spapr.h" #include "hw/pci/msi.h" diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c index 4952f9bd2c..41e37103c0 100644 --- a/hw/ppc/spapr_cpu_core.c +++ b/hw/ppc/spapr_cpu_core.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "hw/cpu/core.h" #include "hw/ppc/spapr_cpu_core.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "target/ppc/cpu.h" #include "hw/ppc/spapr.h" diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c index 32a2edbe5c..3a9c96d939 100644 --- a/hw/ppc/spapr_irq.c +++ b/hw/ppc/spapr_irq.c @@ -17,7 +17,7 @@ #include "hw/ppc/spapr_xive.h" #include "hw/ppc/xics.h" #include "hw/ppc/xics_spapr.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "cpu-models.h" #include "system/kvm.h" diff --git a/hw/ppc/spapr_nvdimm.c b/hw/ppc/spapr_nvdimm.c index 72b4a6329f..6647428391 100644 --- a/hw/ppc/spapr_nvdimm.c +++ b/hw/ppc/spapr_nvdimm.c @@ -34,7 +34,7 @@ #include "block/thread-pool.h" #include "migration/vmstate.h" #include "qemu/pmem.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" /* DIMM health bitmap bitmap indicators. Taken from kernel's papr_scm.c */ /* SCM device is unable to persist memory contents */ diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index 523edaa7b6..a7c064be33 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -43,7 +43,7 @@ #include "hw/pci/pci_bus.h" #include "hw/pci/pci_ids.h" #include "hw/ppc/spapr_drc.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/device_tree.h" #include "system/kvm.h" #include "system/hostmem.h" diff --git a/hw/ppc/spapr_rng.c b/hw/ppc/spapr_rng.c index 6fec607037..846ea3e3b6 100644 --- a/hw/ppc/spapr_rng.c +++ b/hw/ppc/spapr_rng.c @@ -25,7 +25,7 @@ #include "system/device_tree.h" #include "system/rng.h" #include "hw/ppc/spapr.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "kvm_ppc.h" #include "qom/object.h" diff --git a/hw/ppc/spapr_tpm_proxy.c b/hw/ppc/spapr_tpm_proxy.c index 1297b3ad56..a48dab7e7a 100644 --- a/hw/ppc/spapr_tpm_proxy.c +++ b/hw/ppc/spapr_tpm_proxy.c @@ -15,7 +15,7 @@ #include "qemu/error-report.h" #include "system/reset.h" #include "hw/ppc/spapr.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "trace.h" #define TPM_SPAPR_BUFSIZE 4096 diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c index 8b5f4eb57a..cf2d10ecb2 100644 --- a/hw/ppc/virtex_ml507.c +++ b/hw/ppc/virtex_ml507.c @@ -43,7 +43,7 @@ #include "hw/intc/ppc-uic.h" #include "hw/ppc/ppc.h" #include "hw/ppc/ppc4xx.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include diff --git a/hw/remote/proxy.c b/hw/remote/proxy.c index 18e0f7a064..5081d67e7f 100644 --- a/hw/remote/proxy.c +++ b/hw/remote/proxy.c @@ -12,7 +12,7 @@ #include "hw/pci/pci.h" #include "qapi/error.h" #include "io/channel-util.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "monitor/monitor.h" #include "migration/blocker.h" #include "qemu/sockets.h" diff --git a/hw/riscv/numa.c b/hw/riscv/numa.c index 726df2daf1..24a803f7fa 100644 --- a/hw/riscv/numa.c +++ b/hw/riscv/numa.c @@ -21,7 +21,7 @@ #include "qemu/error-report.h" #include "qapi/error.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/riscv/numa.h" #include "system/device_tree.h" diff --git a/hw/riscv/riscv-iommu-pci.c b/hw/riscv/riscv-iommu-pci.c index cdb4a7a8f0..5f7d359204 100644 --- a/hw/riscv/riscv-iommu-pci.c +++ b/hw/riscv/riscv-iommu-pci.c @@ -21,7 +21,7 @@ #include "hw/pci/msi.h" #include "hw/pci/msix.h" #include "hw/pci/pci_bus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/riscv/riscv_hart.h" #include "migration/vmstate.h" #include "qapi/error.h" diff --git a/hw/riscv/riscv-iommu-sys.c b/hw/riscv/riscv-iommu-sys.c index 7d8c6f1c7c..2a11c4dab6 100644 --- a/hw/riscv/riscv-iommu-sys.c +++ b/hw/riscv/riscv-iommu-sys.c @@ -19,7 +19,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/pci/pci_bus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/hw/riscv/riscv-iommu.c b/hw/riscv/riscv-iommu.c index f8656ec04b..baaadadda1 100644 --- a/hw/riscv/riscv-iommu.c +++ b/hw/riscv/riscv-iommu.c @@ -21,7 +21,7 @@ #include "exec/target_page.h" #include "hw/pci/pci_bus.h" #include "hw/pci/pci_device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/riscv/riscv_hart.h" #include "migration/vmstate.h" #include "qapi/error.h" diff --git a/hw/riscv/riscv-iommu.h b/hw/riscv/riscv-iommu.h index a31aa62144..2dabd86941 100644 --- a/hw/riscv/riscv-iommu.h +++ b/hw/riscv/riscv-iommu.h @@ -20,7 +20,7 @@ #define HW_RISCV_IOMMU_STATE_H #include "qom/object.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/dma.h" #include "hw/riscv/iommu.h" #include "hw/riscv/riscv-iommu-bits.h" diff --git a/hw/riscv/riscv_hart.c b/hw/riscv/riscv_hart.c index 33cbc9873e..3118748794 100644 --- a/hw/riscv/riscv_hart.c +++ b/hw/riscv/riscv_hart.c @@ -26,7 +26,7 @@ #include "qemu/cutils.h" #include "hw/sysbus.h" #include "target/riscv/cpu.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/riscv/riscv_hart.h" #include "qemu/error-report.h" diff --git a/hw/riscv/shakti_c.c b/hw/riscv/shakti_c.c index d309ea2e39..49a39b3021 100644 --- a/hw/riscv/shakti_c.c +++ b/hw/riscv/shakti_c.c @@ -24,7 +24,7 @@ #include "hw/intc/sifive_plic.h" #include "hw/intc/riscv_aclint.h" #include "system/system.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/address-spaces.h" #include "hw/riscv/boot.h" diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 9cb4f16432..d79add5576 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -26,7 +26,7 @@ #include "hw/core/boards.h" #include "hw/core/loader.h" #include "hw/sysbus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/char/serial-mm.h" #include "target/riscv/cpu.h" #include "hw/core/sysbus-fdt.h" diff --git a/hw/riscv/xiangshan_kmh.c b/hw/riscv/xiangshan_kmh.c index e831954cb3..436e51c1c5 100644 --- a/hw/riscv/xiangshan_kmh.c +++ b/hw/riscv/xiangshan_kmh.c @@ -37,7 +37,7 @@ #include "hw/intc/riscv_aclint.h" #include "hw/intc/riscv_aplic.h" #include "hw/intc/riscv_imsic.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/riscv/boot.h" #include "hw/riscv/xiangshan_kmh.h" #include "hw/riscv/riscv_hart.h" diff --git a/hw/rtc/allwinner-rtc.c b/hw/rtc/allwinner-rtc.c index a747bff534..0ffd38cf78 100644 --- a/hw/rtc/allwinner-rtc.c +++ b/hw/rtc/allwinner-rtc.c @@ -23,7 +23,7 @@ #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/rtc/allwinner-rtc.h" #include "system/rtc.h" #include "trace.h" diff --git a/hw/rtc/goldfish_rtc.c b/hw/rtc/goldfish_rtc.c index 67f9eacb22..79d2a04c72 100644 --- a/hw/rtc/goldfish_rtc.c +++ b/hw/rtc/goldfish_rtc.c @@ -23,7 +23,7 @@ #include "hw/rtc/goldfish_rtc.h" #include "migration/vmstate.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "qemu/bitops.h" #include "qemu/timer.h" diff --git a/hw/rtc/m48t59-isa.c b/hw/rtc/m48t59-isa.c index 9e2f6563a0..ea0f307aa0 100644 --- a/hw/rtc/m48t59-isa.c +++ b/hw/rtc/m48t59-isa.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/rtc/m48t59.h" #include "m48t59-internal.h" #include "qapi/error.h" diff --git a/hw/rtc/m48t59.c b/hw/rtc/m48t59.c index 0be17b3e79..be8efb8c0a 100644 --- a/hw/rtc/m48t59.c +++ b/hw/rtc/m48t59.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/rtc/m48t59.h" #include "qemu/timer.h" #include "system/runstate.h" diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c index 4c4c1c8421..56f8c79479 100644 --- a/hw/rtc/mc146818rtc.c +++ b/hw/rtc/mc146818rtc.c @@ -29,7 +29,7 @@ #include "hw/acpi/acpi_aml_interface.h" #include "hw/intc/kvm_irqcount.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "qemu/timer.h" #include "system/system.h" diff --git a/hw/rtc/pl031.c b/hw/rtc/pl031.c index 2ec8ac8add..847349b407 100644 --- a/hw/rtc/pl031.c +++ b/hw/rtc/pl031.c @@ -15,7 +15,7 @@ #include "hw/rtc/pl031.h" #include "migration/vmstate.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "qemu/timer.h" #include "system/system.h" diff --git a/hw/rtc/rs5c372.c b/hw/rtc/rs5c372.c index bb924534a7..58f12b836d 100644 --- a/hw/rtc/rs5c372.c +++ b/hw/rtc/rs5c372.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "hw/i2c/i2c.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/resettable.h" #include "migration/vmstate.h" #include "qemu/bcd.h" diff --git a/hw/rx/rx62n.c b/hw/rx/rx62n.c index 3fe9a4a518..e1fa3d5661 100644 --- a/hw/rx/rx62n.c +++ b/hw/rx/rx62n.c @@ -27,7 +27,7 @@ #include "hw/rx/rx62n.h" #include "hw/core/loader.h" #include "hw/sysbus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/system.h" #include "qobject/qlist.h" #include "qom/object.h" diff --git a/hw/s390x/3270-ccw.c b/hw/s390x/3270-ccw.c index 3f0d384fd8..51c6828ff1 100644 --- a/hw/s390x/3270-ccw.c +++ b/hw/s390x/3270-ccw.c @@ -15,7 +15,7 @@ #include "qemu/module.h" #include "hw/s390x/css.h" #include "hw/s390x/css-bridge.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/s390x/3270-ccw.h" /* Handle READ ccw commands from guest */ diff --git a/hw/s390x/ccw-device.c b/hw/s390x/ccw-device.c index 8be1813b9e..25c4273279 100644 --- a/hw/s390x/ccw-device.c +++ b/hw/s390x/ccw-device.c @@ -11,7 +11,7 @@ #include "qemu/osdep.h" #include "ccw-device.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/module.h" #include "ipl.h" #include "qapi/visitor.h" diff --git a/hw/s390x/cpu-topology.c b/hw/s390x/cpu-topology.c index 9182ddb628..efe88bc967 100644 --- a/hw/s390x/cpu-topology.c +++ b/hw/s390x/cpu-topology.c @@ -18,7 +18,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/error-report.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/boards.h" #include "target/s390x/cpu.h" #include "hw/s390x/s390-virtio-ccw.h" diff --git a/hw/s390x/css-bridge.c b/hw/s390x/css-bridge.c index f3b6ef5630..887794beef 100644 --- a/hw/s390x/css-bridge.c +++ b/hw/s390x/css-bridge.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/core/hotplug.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "qemu/bitops.h" #include "qemu/module.h" diff --git a/hw/s390x/css.c b/hw/s390x/css.c index 53444f6828..d2c0af6a9b 100644 --- a/hw/s390x/css.c +++ b/hw/s390x/css.c @@ -16,7 +16,7 @@ #include "qemu/error-report.h" #include "system/address-spaces.h" #include "hw/s390x/ioinst.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/s390x/css.h" #include "trace.h" #include "hw/s390x/s390_flic.h" diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index e0a04ab1a2..b119a87a86 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -20,7 +20,7 @@ #include "system/tcg.h" #include "elf.h" #include "hw/core/loader.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/boards.h" #include "hw/s390x/virtio-ccw.h" #include "hw/s390x/vfio-ccw.h" diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index 3eea2f0c9d..ff415b6312 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -22,7 +22,7 @@ #include "hw/s390x/s390-virtio-ccw.h" #include "hw/core/boards.h" #include "hw/pci/pci_bus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/msi.h" #include "qemu/error-report.h" diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c index 8eeecfd58f..d974d97b5e 100644 --- a/hw/s390x/s390-skeys.c +++ b/hw/s390x/s390-skeys.c @@ -13,7 +13,7 @@ #include "qemu/units.h" #include "exec/target_page.h" #include "hw/s390x/s390-virtio-ccw.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/s390x/storage-keys.h" #include "qapi/error.h" #include "qapi/qapi-commands-machine.h" diff --git a/hw/s390x/s390-stattrib.c b/hw/s390x/s390-stattrib.c index aa18537291..f149af16ac 100644 --- a/hw/s390x/s390-stattrib.c +++ b/hw/s390x/s390-stattrib.c @@ -14,7 +14,7 @@ #include "exec/target_page.h" #include "migration/qemu-file.h" #include "migration/register.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/s390x/storage-attributes.h" #include "qemu/error-report.h" #include "qapi/error.h" diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index c5e0691a26..8314655ec2 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -36,7 +36,7 @@ #include "migration/register.h" #include "target/s390x/cpu_models.h" #include "hw/core/nmi.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/s390x/tod.h" #include "system/system.h" #include "system/cpus.h" diff --git a/hw/s390x/vhost-scsi-ccw.c b/hw/s390x/vhost-scsi-ccw.c index 8341b23a95..1e68459eb0 100644 --- a/hw/s390x/vhost-scsi-ccw.c +++ b/hw/s390x/vhost-scsi-ccw.c @@ -10,7 +10,7 @@ */ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/vhost-user-fs-ccw.c b/hw/s390x/vhost-user-fs-ccw.c index cc1b8227fc..35a77e4cb7 100644 --- a/hw/s390x/vhost-user-fs-ccw.c +++ b/hw/s390x/vhost-user-fs-ccw.c @@ -8,7 +8,7 @@ * directory. */ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "hw/virtio/vhost-user-fs.h" #include "virtio-ccw.h" diff --git a/hw/s390x/vhost-vsock-ccw.c b/hw/s390x/vhost-vsock-ccw.c index 552e9e86a4..efdfdeec84 100644 --- a/hw/s390x/vhost-vsock-ccw.c +++ b/hw/s390x/vhost-vsock-ccw.c @@ -7,7 +7,7 @@ */ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-9p.c b/hw/s390x/virtio-ccw-9p.c index 72bf6ec80c..d8612f7cd1 100644 --- a/hw/s390x/virtio-ccw-9p.c +++ b/hw/s390x/virtio-ccw-9p.c @@ -10,7 +10,7 @@ */ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-balloon.c b/hw/s390x/virtio-ccw-balloon.c index 399b40f366..4f67310b69 100644 --- a/hw/s390x/virtio-ccw-balloon.c +++ b/hw/s390x/virtio-ccw-balloon.c @@ -10,7 +10,7 @@ */ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-blk.c b/hw/s390x/virtio-ccw-blk.c index 7d8c4a75ce..939dcaeed3 100644 --- a/hw/s390x/virtio-ccw-blk.c +++ b/hw/s390x/virtio-ccw-blk.c @@ -10,7 +10,7 @@ */ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-crypto.c b/hw/s390x/virtio-ccw-crypto.c index 75e714603b..2c4ee2ca39 100644 --- a/hw/s390x/virtio-ccw-crypto.c +++ b/hw/s390x/virtio-ccw-crypto.c @@ -9,7 +9,7 @@ */ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-gpu.c b/hw/s390x/virtio-ccw-gpu.c index edb6a47d37..4120c6bcb9 100644 --- a/hw/s390x/virtio-ccw-gpu.c +++ b/hw/s390x/virtio-ccw-gpu.c @@ -9,7 +9,7 @@ */ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-input.c b/hw/s390x/virtio-ccw-input.c index 2250d8cf98..a9ec60428c 100644 --- a/hw/s390x/virtio-ccw-input.c +++ b/hw/s390x/virtio-ccw-input.c @@ -9,7 +9,7 @@ */ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-mem.c b/hw/s390x/virtio-ccw-mem.c index daa485d189..dea30aacfb 100644 --- a/hw/s390x/virtio-ccw-mem.c +++ b/hw/s390x/virtio-ccw-mem.c @@ -11,7 +11,7 @@ */ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/module.h" #include "virtio-ccw-mem.h" diff --git a/hw/s390x/virtio-ccw-net.c b/hw/s390x/virtio-ccw-net.c index a7d4afbeb9..30e7055ab2 100644 --- a/hw/s390x/virtio-ccw-net.c +++ b/hw/s390x/virtio-ccw-net.c @@ -10,7 +10,7 @@ */ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-rng.c b/hw/s390x/virtio-ccw-rng.c index 3263287d45..0647621e33 100644 --- a/hw/s390x/virtio-ccw-rng.c +++ b/hw/s390x/virtio-ccw-rng.c @@ -10,7 +10,7 @@ */ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-scsi.c b/hw/s390x/virtio-ccw-scsi.c index 06b4c6c4a5..c181a2b769 100644 --- a/hw/s390x/virtio-ccw-scsi.c +++ b/hw/s390x/virtio-ccw-scsi.c @@ -10,7 +10,7 @@ */ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-serial.c b/hw/s390x/virtio-ccw-serial.c index 0dac590c08..7ff07a0841 100644 --- a/hw/s390x/virtio-ccw-serial.c +++ b/hw/s390x/virtio-ccw-serial.c @@ -12,7 +12,7 @@ #include "qemu/osdep.h" #include "hw/virtio/virtio.h" #include "qemu/module.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-serial.h" #include "virtio-ccw.h" diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index 844643d916..f62e420a91 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/dma.h" #include "system/block-backend.h" #include "system/rtc.h" diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c index 4ada35b7ec..e4a7b2fee4 100644 --- a/hw/scsi/mptsas.c +++ b/hw/scsi/mptsas.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/dma.h" #include "hw/pci/msi.h" #include "qemu/iov.h" diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index b9b115deed..f310ddafb9 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -4,7 +4,7 @@ #include "qemu/module.h" #include "qemu/option.h" #include "qemu/hw-version.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/scsi/scsi.h" #include "migration/qemu-file-types.h" #include "migration/vmstate.h" diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index b4782c6248..9c78c9e18e 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -36,7 +36,7 @@ #include "system/block-backend.h" #include "system/blockdev.h" #include "hw/block/block.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "system/dma.h" #include "system/system.h" diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c index 9e380a2109..2ac4fd66c3 100644 --- a/hw/scsi/scsi-generic.c +++ b/hw/scsi/scsi-generic.c @@ -18,7 +18,7 @@ #include "qemu/module.h" #include "hw/scsi/scsi.h" #include "migration/qemu-file-types.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/scsi/emulation.h" #include "system/block-backend.h" diff --git a/hw/scsi/spapr_vscsi.c b/hw/scsi/spapr_vscsi.c index a6591319db..b4c8f94d22 100644 --- a/hw/scsi/spapr_vscsi.c +++ b/hw/scsi/spapr_vscsi.c @@ -40,7 +40,7 @@ #include "srp.h" #include "hw/ppc/spapr.h" #include "hw/ppc/spapr_vio.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "viosrp.h" #include "trace.h" diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c index 573a44b2b3..699863cc10 100644 --- a/hw/scsi/vhost-scsi.c +++ b/hw/scsi/vhost-scsi.c @@ -27,7 +27,7 @@ #include "hw/virtio/virtio-scsi.h" #include "hw/virtio/virtio-bus.h" #include "hw/core/fw-path-provider.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/cutils.h" #include "system/system.h" diff --git a/hw/scsi/vhost-user-scsi.c b/hw/scsi/vhost-user-scsi.c index 2c79522b09..89f06066b7 100644 --- a/hw/scsi/vhost-user-scsi.c +++ b/hw/scsi/vhost-user-scsi.c @@ -20,7 +20,7 @@ #include "qemu/error-report.h" #include "hw/core/fw-path-provider.h" #include "hw/core/qdev.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/virtio/vhost.h" #include "hw/virtio/vhost-backend.h" diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index 93e87c459c..774968d8c7 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -24,7 +24,7 @@ #include "qemu/module.h" #include "system/block-backend.h" #include "system/dma.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/scsi/scsi.h" #include "scsi/constants.h" #include "hw/virtio/iothread-vq-mapping.h" diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c index 7c98b1b8ea..b3cdc255b4 100644 --- a/hw/scsi/vmw_pvscsi.c +++ b/hw/scsi/vmw_pvscsi.c @@ -33,7 +33,7 @@ #include "migration/vmstate.h" #include "scsi/constants.h" #include "hw/pci/msi.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "vmw_pvscsi.h" #include "trace.h" #include "qom/object.h" diff --git a/hw/sd/allwinner-sdhost.c b/hw/sd/allwinner-sdhost.c index 4c039b9520..87bb7df903 100644 --- a/hw/sd/allwinner-sdhost.c +++ b/hw/sd/allwinner-sdhost.c @@ -24,7 +24,7 @@ #include "qapi/error.h" #include "system/blockdev.h" #include "system/dma.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/irq.h" #include "hw/sd/allwinner-sdhost.h" #include "migration/vmstate.h" diff --git a/hw/sd/aspeed_sdhci.c b/hw/sd/aspeed_sdhci.c index 330e6a19c9..6684f8221a 100644 --- a/hw/sd/aspeed_sdhci.c +++ b/hw/sd/aspeed_sdhci.c @@ -13,7 +13,7 @@ #include "qapi/error.h" #include "hw/core/irq.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "trace.h" #define ASPEED_SDHCI_INFO 0x00 diff --git a/hw/sd/sd.c b/hw/sd/sd.c index ff45c8e70c..3df331d561 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -42,7 +42,7 @@ #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/bitmap.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "qemu/error-report.h" #include "qemu/timer.h" diff --git a/hw/sd/sdhci-pci.c b/hw/sd/sdhci-pci.c index 0e38bed49a..27001e5e1e 100644 --- a/hw/sd/sdhci-pci.c +++ b/hw/sd/sdhci-pci.c @@ -19,7 +19,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sd/sdhci.h" #include "sdhci-internal.h" diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 39185f0a98..9146e0cde0 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -29,7 +29,7 @@ #include "qemu/error-report.h" #include "qapi/error.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/dma.h" #include "qemu/timer.h" #include "qemu/bitops.h" diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c index 3aacbd0387..c6e350af2d 100644 --- a/hw/sd/ssi-sd.c +++ b/hw/sd/ssi-sd.c @@ -19,7 +19,7 @@ #include "system/blockdev.h" #include "hw/ssi/ssi.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sd/sd.h" #include "qapi/error.h" #include "qemu/crc-ccitt.h" diff --git a/hw/sensor/isl_pmbus_vr.c b/hw/sensor/isl_pmbus_vr.c index e8d29b08ff..0fad04def7 100644 --- a/hw/sensor/isl_pmbus_vr.c +++ b/hw/sensor/isl_pmbus_vr.c @@ -8,7 +8,7 @@ #include "qemu/osdep.h" #include "hw/sensor/isl_pmbus_vr.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/visitor.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index 9e8c2fa8d1..35db5cbbcd 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -35,7 +35,7 @@ #include "system/system.h" #include "hw/core/boards.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "net/net.h" #include "sh7750_regs.h" #include "hw/ide/mmio.h" diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c index 6cb42e3441..aff45320bc 100644 --- a/hw/sh4/sh7750.c +++ b/hw/sh4/sh7750.c @@ -30,7 +30,7 @@ #include "hw/sh4/sh.h" #include "system/system.h" #include "target/sh4/cpu.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "sh7750_regs.h" #include "sh7750_regnames.h" diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c index 50f1cf9170..ec9a386b48 100644 --- a/hw/sparc/leon3.c +++ b/hw/sparc/leon3.c @@ -33,7 +33,7 @@ #include "hw/core/irq.h" #include "qemu/timer.h" #include "hw/core/ptimer.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "system/system.h" #include "system/qtest.h" #include "system/reset.h" diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index fa52451303..2e3952c917 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -43,7 +43,7 @@ #include "hw/core/boards.h" #include "hw/scsi/esp.h" #include "hw/nvram/sun_nvram.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/nvram/chrp_nvram.h" #include "hw/nvram/fw_cfg.h" #include "hw/char/escc.h" diff --git a/hw/sparc/sun4m_iommu.c b/hw/sparc/sun4m_iommu.c index 9ce2e3b7fc..10c4786dad 100644 --- a/hw/sparc/sun4m_iommu.c +++ b/hw/sparc/sun4m_iommu.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sparc/sun4m_iommu.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index c0fb421d2b..14b47c037b 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -33,7 +33,7 @@ #include "hw/pci/pci.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_host.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/pci-host/sabre.h" #include "hw/char/serial-isa.h" #include "hw/char/serial-mm.h" diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c index 9819904a4a..6bef856c62 100644 --- a/hw/ssi/aspeed_smc.c +++ b/hw/ssi/aspeed_smc.c @@ -34,7 +34,7 @@ #include "trace.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ssi/aspeed_smc.h" /* CE Type Setting Register */ diff --git a/hw/ssi/ibex_spi_host.c b/hw/ssi/ibex_spi_host.c index 63f4cce512..a7dc0c2f03 100644 --- a/hw/ssi/ibex_spi_host.c +++ b/hw/ssi/ibex_spi_host.c @@ -29,7 +29,7 @@ #include "hw/registerfields.h" #include "hw/ssi/ibex_spi_host.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/ssi/npcm7xx_fiu.c b/hw/ssi/npcm7xx_fiu.c index bc5e4e20cc..02707de350 100644 --- a/hw/ssi/npcm7xx_fiu.c +++ b/hw/ssi/npcm7xx_fiu.c @@ -17,7 +17,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ssi/npcm7xx_fiu.h" #include "migration/vmstate.h" #include "qapi/error.h" diff --git a/hw/ssi/pnv_spi.c b/hw/ssi/pnv_spi.c index e59386712b..1cf3a4416d 100644 --- a/hw/ssi/pnv_spi.c +++ b/hw/ssi/pnv_spi.c @@ -8,7 +8,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ppc/pnv_xscom.h" #include "hw/ssi/pnv_spi.h" #include "hw/ssi/pnv_spi_regs.h" diff --git a/hw/ssi/sifive_spi.c b/hw/ssi/sifive_spi.c index c66fae80a9..577cd5d2d8 100644 --- a/hw/ssi/sifive_spi.c +++ b/hw/ssi/sifive_spi.c @@ -21,7 +21,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "hw/ssi/ssi.h" #include "qemu/fifo8.h" diff --git a/hw/ssi/ssi.c b/hw/ssi/ssi.c index d0de640fe6..3a4fade2d5 100644 --- a/hw/ssi/ssi.c +++ b/hw/ssi/ssi.c @@ -13,7 +13,7 @@ */ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ssi/ssi.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/ssi/xilinx_spi.c b/hw/ssi/xilinx_spi.c index 9e8656b556..6dcdd63916 100644 --- a/hw/ssi/xilinx_spi.c +++ b/hw/ssi/xilinx_spi.c @@ -32,7 +32,7 @@ #include "qemu/fifo8.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/ssi/ssi.h" #include "qom/object.h" diff --git a/hw/ssi/xilinx_spips.c b/hw/ssi/xilinx_spips.c index 5fa9bf965f..e3c6035c16 100644 --- a/hw/ssi/xilinx_spips.c +++ b/hw/ssi/xilinx_spips.c @@ -26,7 +26,7 @@ #include "hw/sysbus.h" #include "hw/core/irq.h" #include "hw/core/ptimer.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/log.h" #include "qemu/module.h" #include "qemu/bitops.h" diff --git a/hw/ssi/xlnx-versal-ospi.c b/hw/ssi/xlnx-versal-ospi.c index 88fafb5a2e..93cdc9d399 100644 --- a/hw/ssi/xlnx-versal-ospi.c +++ b/hw/ssi/xlnx-versal-ospi.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/bitops.h" #include "qemu/log.h" #include "hw/core/irq.h" diff --git a/hw/timer/a9gtimer.c b/hw/timer/a9gtimer.c index a0b73fb731..a2363a89a5 100644 --- a/hw/timer/a9gtimer.c +++ b/hw/timer/a9gtimer.c @@ -23,7 +23,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/timer/a9gtimer.h" #include "migration/vmstate.h" #include "qapi/error.h" diff --git a/hw/timer/allwinner-a10-pit.c b/hw/timer/allwinner-a10-pit.c index 6c0d3b556a..d52669787e 100644 --- a/hw/timer/allwinner-a10-pit.c +++ b/hw/timer/allwinner-a10-pit.c @@ -17,7 +17,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "hw/timer/allwinner-a10-pit.h" #include "migration/vmstate.h" diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c index adec87cc8d..869db913d4 100644 --- a/hw/timer/arm_mptimer.c +++ b/hw/timer/arm_mptimer.c @@ -23,7 +23,7 @@ #include "hw/hw.h" #include "hw/core/irq.h" #include "hw/core/ptimer.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/timer/arm_mptimer.h" #include "migration/vmstate.h" #include "qapi/error.h" diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c index 8d8b250698..c38e56f5b8 100644 --- a/hw/timer/arm_timer.c +++ b/hw/timer/arm_timer.c @@ -13,7 +13,7 @@ #include "qemu/timer.h" #include "hw/core/irq.h" #include "hw/core/ptimer.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/module.h" #include "qemu/log.h" #include "qom/object.h" diff --git a/hw/timer/aspeed_timer.c b/hw/timer/aspeed_timer.c index b08a737bc9..20adb7decb 100644 --- a/hw/timer/aspeed_timer.c +++ b/hw/timer/aspeed_timer.c @@ -19,7 +19,7 @@ #include "qemu/timer.h" #include "qemu/log.h" #include "qemu/module.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "trace.h" #define TIMER_NR_REGS 4 diff --git a/hw/timer/avr_timer16.c b/hw/timer/avr_timer16.c index 0f1fda4218..1a65a61ed2 100644 --- a/hw/timer/avr_timer16.c +++ b/hw/timer/avr_timer16.c @@ -35,7 +35,7 @@ #include "qapi/error.h" #include "qemu/log.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/timer/avr_timer16.h" #include "trace.h" diff --git a/hw/timer/cmsdk-apb-dualtimer.c b/hw/timer/cmsdk-apb-dualtimer.c index 5f4848ef61..bcb6f8e43d 100644 --- a/hw/timer/cmsdk-apb-dualtimer.c +++ b/hw/timer/cmsdk-apb-dualtimer.c @@ -23,7 +23,7 @@ #include "qemu/module.h" #include "hw/sysbus.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/registerfields.h" #include "hw/core/qdev-clock.h" #include "hw/timer/cmsdk-apb-dualtimer.h" diff --git a/hw/timer/grlib_gptimer.c b/hw/timer/grlib_gptimer.c index 82d0d9d762..dbce6f736f 100644 --- a/hw/timer/grlib_gptimer.c +++ b/hw/timer/grlib_gptimer.c @@ -30,7 +30,7 @@ #include "qemu/timer.h" #include "hw/core/irq.h" #include "hw/core/ptimer.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/module.h" #include "trace.h" diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index 1387c417ae..82006df0e3 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -29,7 +29,7 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/timer.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/timer/hpet.h" #include "hw/sysbus.h" #include "hw/rtc/mc146818rtc.h" diff --git a/hw/timer/ibex_timer.c b/hw/timer/ibex_timer.c index d2c4f86e03..ee18652189 100644 --- a/hw/timer/ibex_timer.c +++ b/hw/timer/ibex_timer.c @@ -30,7 +30,7 @@ #include "qemu/timer.h" #include "hw/timer/ibex_timer.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "target/riscv/cpu.h" #include "migration/vmstate.h" diff --git a/hw/timer/mss-timer.c b/hw/timer/mss-timer.c index 946e87c99a..bd3f3e845f 100644 --- a/hw/timer/mss-timer.c +++ b/hw/timer/mss-timer.c @@ -27,7 +27,7 @@ #include "qemu/module.h" #include "qemu/log.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/timer/mss-timer.h" #include "migration/vmstate.h" diff --git a/hw/timer/npcm7xx_timer.c b/hw/timer/npcm7xx_timer.c index 0e62add74d..16b62d3374 100644 --- a/hw/timer/npcm7xx_timer.c +++ b/hw/timer/npcm7xx_timer.c @@ -18,7 +18,7 @@ #include "hw/core/irq.h" #include "hw/core/qdev-clock.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/timer/npcm7xx_timer.h" #include "migration/vmstate.h" #include "qemu/bitops.h" diff --git a/hw/timer/nrf51_timer.c b/hw/timer/nrf51_timer.c index 0688f49eef..b0443b9482 100644 --- a/hw/timer/nrf51_timer.c +++ b/hw/timer/nrf51_timer.c @@ -17,7 +17,7 @@ #include "hw/arm/nrf51.h" #include "hw/core/irq.h" #include "hw/timer/nrf51_timer.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/timer/pxa2xx_timer.c b/hw/timer/pxa2xx_timer.c index d18d98b233..b875c05052 100644 --- a/hw/timer/pxa2xx_timer.c +++ b/hw/timer/pxa2xx_timer.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/timer.h" #include "system/runstate.h" #include "hw/sysbus.h" diff --git a/hw/timer/renesas_cmt.c b/hw/timer/renesas_cmt.c index c62dad690f..35962e66c3 100644 --- a/hw/timer/renesas_cmt.c +++ b/hw/timer/renesas_cmt.c @@ -25,7 +25,7 @@ #include "qemu/log.h" #include "hw/core/irq.h" #include "hw/registerfields.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/timer/renesas_cmt.h" #include "migration/vmstate.h" diff --git a/hw/timer/renesas_tmr.c b/hw/timer/renesas_tmr.c index 1fc539e949..2e7d7d4543 100644 --- a/hw/timer/renesas_tmr.c +++ b/hw/timer/renesas_tmr.c @@ -25,7 +25,7 @@ #include "qemu/log.h" #include "hw/core/irq.h" #include "hw/registerfields.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/timer/renesas_tmr.h" #include "migration/vmstate.h" diff --git a/hw/timer/sifive_pwm.c b/hw/timer/sifive_pwm.c index f1882ae6bc..8fda5445e7 100644 --- a/hw/timer/sifive_pwm.c +++ b/hw/timer/sifive_pwm.c @@ -28,7 +28,7 @@ #include "trace.h" #include "hw/core/irq.h" #include "hw/timer/sifive_pwm.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/registerfields.h" #include "migration/vmstate.h" #include "qemu/log.h" diff --git a/hw/timer/slavio_timer.c b/hw/timer/slavio_timer.c index f66b3aaa43..07359a6fe7 100644 --- a/hw/timer/slavio_timer.c +++ b/hw/timer/slavio_timer.c @@ -26,7 +26,7 @@ #include "qemu/timer.h" #include "hw/core/irq.h" #include "hw/core/ptimer.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/timer/sse-timer.c b/hw/timer/sse-timer.c index 1de882f3eb..50d1de5805 100644 --- a/hw/timer/sse-timer.c +++ b/hw/timer/sse-timer.c @@ -45,7 +45,7 @@ #include "hw/registerfields.h" #include "hw/core/clock.h" #include "hw/core/qdev-clock.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" REG32(CNTPCT_LO, 0x0) diff --git a/hw/timer/stm32f2xx_timer.c b/hw/timer/stm32f2xx_timer.c index 979b6ad5ba..0442ac64ad 100644 --- a/hw/timer/stm32f2xx_timer.c +++ b/hw/timer/stm32f2xx_timer.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/timer/stm32f2xx_timer.h" #include "migration/vmstate.h" #include "qemu/log.h" diff --git a/hw/timer/xilinx_timer.c b/hw/timer/xilinx_timer.c index fbc1001591..57a2c7101d 100644 --- a/hw/timer/xilinx_timer.c +++ b/hw/timer/xilinx_timer.c @@ -30,7 +30,7 @@ #include "hw/sysbus.h" #include "hw/core/irq.h" #include "hw/core/ptimer.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/tpm/tpm_crb.c b/hw/tpm/tpm_crb.c index bc7a78f898..8723536f93 100644 --- a/hw/tpm/tpm_crb.c +++ b/hw/tpm/tpm_crb.c @@ -19,7 +19,7 @@ #include "qemu/module.h" #include "qapi/error.h" #include "system/address-spaces.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/pci/pci_ids.h" #include "hw/acpi/tpm.h" #include "migration/vmstate.h" diff --git a/hw/tpm/tpm_prop.h b/hw/tpm/tpm_prop.h index c4df74805a..876f5c80fc 100644 --- a/hw/tpm/tpm_prop.h +++ b/hw/tpm/tpm_prop.h @@ -23,7 +23,7 @@ #define HW_TPM_PROP_H #include "system/tpm_backend.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" extern const PropertyInfo qdev_prop_tpm; diff --git a/hw/tpm/tpm_spapr.c b/hw/tpm/tpm_spapr.c index ea608ba4c8..19075d1f01 100644 --- a/hw/tpm/tpm_spapr.c +++ b/hw/tpm/tpm_spapr.c @@ -16,7 +16,7 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "system/tpm_backend.h" diff --git a/hw/tpm/tpm_tis_common.c b/hw/tpm/tpm_tis_common.c index 1615be2933..f594b15b8a 100644 --- a/hw/tpm/tpm_tis_common.c +++ b/hw/tpm/tpm_tis_common.c @@ -32,7 +32,7 @@ #include "hw/acpi/tpm.h" #include "hw/pci/pci_ids.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "system/tpm_backend.h" #include "system/tpm_util.h" diff --git a/hw/tpm/tpm_tis_isa.c b/hw/tpm/tpm_tis_isa.c index dce83057a9..61e95434f5 100644 --- a/hw/tpm/tpm_tis_isa.c +++ b/hw/tpm/tpm_tis_isa.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/acpi/tpm.h" #include "tpm_prop.h" diff --git a/hw/tpm/tpm_tis_sysbus.c b/hw/tpm/tpm_tis_sysbus.c index 2ffa85852a..07c3040130 100644 --- a/hw/tpm/tpm_tis_sysbus.c +++ b/hw/tpm/tpm_tis_sysbus.c @@ -23,7 +23,7 @@ */ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/acpi/tpm.h" #include "tpm_prop.h" diff --git a/hw/tricore/triboard.c b/hw/tricore/triboard.c index db6f2b765a..23f11cf0a1 100644 --- a/hw/tricore/triboard.c +++ b/hw/tricore/triboard.c @@ -21,7 +21,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "net/net.h" #include "hw/core/loader.h" #include "elf.h" diff --git a/hw/tricore/tricore_testdevice.c b/hw/tricore/tricore_testdevice.c index e8daf95298..d3ffc5fe9f 100644 --- a/hw/tricore/tricore_testdevice.c +++ b/hw/tricore/tricore_testdevice.c @@ -18,7 +18,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "hw/sysbus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/tricore/tricore_testdevice.h" static void tricore_testdevice_write(void *opaque, hwaddr offset, diff --git a/hw/uefi/var-service-sysbus.c b/hw/uefi/var-service-sysbus.c index a5aa218e26..3bf9335650 100644 --- a/hw/uefi/var-service-sysbus.c +++ b/hw/uefi/var-service-sysbus.c @@ -6,7 +6,7 @@ #include "qemu/osdep.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "hw/uefi/hardware-info.h" diff --git a/hw/usb/bus.c b/hw/usb/bus.c index c1dd142965..3b6fbd46ac 100644 --- a/hw/usb/bus.c +++ b/hw/usb/bus.c @@ -1,5 +1,5 @@ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/usb/usb.h" #include "qapi/error.h" #include "qapi/qapi-commands-machine.h" diff --git a/hw/usb/canokey.c b/hw/usb/canokey.c index acd4ea30d9..c3baedac2c 100644 --- a/hw/usb/canokey.c +++ b/hw/usb/canokey.c @@ -13,7 +13,7 @@ #include "qemu/module.h" #include "qapi/error.h" #include "hw/usb/usb.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "trace.h" #include "desc.h" #include "canokey.h" diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c index c21cefd82d..985f21997a 100644 --- a/hw/usb/ccid-card-emulated.c +++ b/hw/usb/ccid-card-emulated.c @@ -34,7 +34,7 @@ #include "qemu/main-loop.h" #include "qemu/module.h" #include "ccid.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qom/object.h" diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c index c8aada0988..306dd7d914 100644 --- a/hw/usb/ccid-card-passthru.c +++ b/hw/usb/ccid-card-passthru.c @@ -13,7 +13,7 @@ #include "qemu/units.h" #include #include "chardev/char-fe.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" #include "qemu/error-report.h" diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c index 988824ea75..dfda2dccc0 100644 --- a/hw/usb/dev-audio.c +++ b/hw/usb/dev-audio.c @@ -31,7 +31,7 @@ #include "qemu/osdep.h" #include "qemu/module.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/usb/usb.h" #include "migration/vmstate.h" #include "desc.h" diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c index 296e9d0d85..ae19d60203 100644 --- a/hw/usb/dev-hid.c +++ b/hw/usb/dev-hid.c @@ -33,7 +33,7 @@ #include "qemu/timer.h" #include "hw/input/hid.h" #include "hw/usb/hid.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qom/object.h" struct USBHIDState { diff --git a/hw/usb/dev-hub.c b/hw/usb/dev-hub.c index f418da1409..b45d571fa8 100644 --- a/hw/usb/dev-hub.c +++ b/hw/usb/dev-hub.c @@ -26,7 +26,7 @@ #include "qapi/error.h" #include "qemu/timer.h" #include "trace.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/usb/usb.h" #include "migration/vmstate.h" #include "desc.h" diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index 04e8eedbf6..1d8cfd32dc 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -22,7 +22,7 @@ #include "qemu/module.h" #include "qemu/filemonitor.h" #include "trace.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/usb/usb.h" #include "migration/vmstate.h" #include "desc.h" diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c index 34cd906d6c..568a6ff24c 100644 --- a/hw/usb/dev-network.c +++ b/hw/usb/dev-network.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/usb/usb.h" #include "migration/vmstate.h" #include "desc.h" diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c index 17bdff9e82..286c7711f6 100644 --- a/hw/usb/dev-serial.c +++ b/hw/usb/dev-serial.c @@ -13,7 +13,7 @@ #include "qemu/cutils.h" #include "qemu/error-report.h" #include "qemu/module.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/usb/usb.h" #include "migration/vmstate.h" diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c index a1081e545a..964c142d10 100644 --- a/hw/usb/dev-smartcard-reader.c +++ b/hw/usb/dev-smartcard-reader.c @@ -40,7 +40,7 @@ #include "qemu/cutils.h" #include "qemu/error-report.h" #include "qemu/module.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/usb/usb.h" #include "migration/vmstate.h" #include "desc.h" diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c index bbd97406f0..040cf15051 100644 --- a/hw/usb/dev-storage.c +++ b/hw/usb/dev-storage.c @@ -16,7 +16,7 @@ #include "hw/usb/usb.h" #include "hw/usb/msd.h" #include "desc.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/scsi/scsi.h" #include "migration/vmstate.h" #include "qemu/cutils.h" diff --git a/hw/usb/dev-uas.c b/hw/usb/dev-uas.c index 75f01c7403..8576dfec96 100644 --- a/hw/usb/dev-uas.c +++ b/hw/usb/dev-uas.c @@ -21,7 +21,7 @@ #include "hw/usb/usb.h" #include "migration/vmstate.h" #include "desc.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/scsi/scsi.h" #include "scsi/constants.h" #include "qom/object.h" diff --git a/hw/usb/hcd-dwc2.c b/hw/usb/hcd-dwc2.c index 83864505bb..cd3b61158d 100644 --- a/hw/usb/hcd-dwc2.c +++ b/hw/usb/hcd-dwc2.c @@ -41,7 +41,7 @@ #include "qemu/log.h" #include "qemu/error-report.h" #include "qemu/main-loop.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #define USB_HZ_FS 12000000 #define USB_HZ_HS 96000000 diff --git a/hw/usb/hcd-dwc3.c b/hw/usb/hcd-dwc3.c index 98a342b8b8..74dff39fda 100644 --- a/hw/usb/hcd-dwc3.c +++ b/hw/usb/hcd-dwc3.c @@ -33,7 +33,7 @@ #include "qemu/bitops.h" #include "qom/object.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/usb/hcd-dwc3.h" #include "qapi/error.h" diff --git a/hw/usb/hcd-ehci-pci.c b/hw/usb/hcd-ehci-pci.c index 38ad3406b3..9febcc1031 100644 --- a/hw/usb/hcd-ehci-pci.c +++ b/hw/usb/hcd-ehci-pci.c @@ -16,7 +16,7 @@ */ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/usb/hcd-ehci.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/usb/hcd-ehci-sysbus.c b/hw/usb/hcd-ehci-sysbus.c index 0449f5fa6d..b31032bbf3 100644 --- a/hw/usb/hcd-ehci-sysbus.c +++ b/hw/usb/hcd-ehci-sysbus.c @@ -16,7 +16,7 @@ */ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/usb/hcd-ehci.h" #include "migration/vmstate.h" diff --git a/hw/usb/hcd-ohci-pci.c b/hw/usb/hcd-ohci-pci.c index 25c400698e..bdbbaaa87a 100644 --- a/hw/usb/hcd-ohci-pci.c +++ b/hw/usb/hcd-ohci-pci.c @@ -26,7 +26,7 @@ #include "hw/pci/pci_device.h" #include "hw/sysbus.h" #include "hw/core/qdev-dma.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "trace.h" #include "hcd-ohci.h" #include "qom/object.h" diff --git a/hw/usb/hcd-ohci-sysbus.c b/hw/usb/hcd-ohci-sysbus.c index 8224fb8862..350b011899 100644 --- a/hw/usb/hcd-ohci-sysbus.c +++ b/hw/usb/hcd-ohci-sysbus.c @@ -27,7 +27,7 @@ #include "migration/vmstate.h" #include "hw/sysbus.h" #include "hw/core/qdev-dma.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "trace.h" #include "hcd-ohci.h" diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c index 588cecef14..c771aafdd0 100644 --- a/hw/usb/hcd-ohci.c +++ b/hw/usb/hcd-ohci.c @@ -34,7 +34,7 @@ #include "migration/vmstate.h" #include "hw/sysbus.h" #include "hw/core/qdev-dma.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "trace.h" #include "hcd-ohci.h" diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c index c243a4f42c..b2224c7f76 100644 --- a/hw/usb/hcd-uhci.c +++ b/hw/usb/hcd-uhci.c @@ -32,7 +32,7 @@ #include "migration/vmstate.h" #include "hw/pci/pci.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/timer.h" #include "qemu/iov.h" diff --git a/hw/usb/hcd-xhci-nec.c b/hw/usb/hcd-xhci-nec.c index 5fc853eb33..46839911f3 100644 --- a/hw/usb/hcd-xhci-nec.c +++ b/hw/usb/hcd-xhci-nec.c @@ -23,7 +23,7 @@ #include "hw/usb/usb.h" #include "qemu/module.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hcd-xhci-pci.h" diff --git a/hw/usb/hcd-xhci-pci.c b/hw/usb/hcd-xhci-pci.c index b93c80b09d..aa570506fc 100644 --- a/hw/usb/hcd-xhci-pci.c +++ b/hw/usb/hcd-xhci-pci.c @@ -24,7 +24,7 @@ */ #include "qemu/osdep.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" diff --git a/hw/usb/hcd-xhci-sysbus.c b/hw/usb/hcd-xhci-sysbus.c index 862673054a..19664c5985 100644 --- a/hw/usb/hcd-xhci-sysbus.c +++ b/hw/usb/hcd-xhci-sysbus.c @@ -8,7 +8,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "trace.h" #include "qapi/error.h" diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index 292c378bfc..2cdab3ba0e 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -25,7 +25,7 @@ #include "qemu/module.h" #include "qemu/queue.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "trace.h" #include "qapi/error.h" diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c index 38893b5e68..b9f3ad3f66 100644 --- a/hw/usb/host-libusb.c +++ b/hw/usb/host-libusb.c @@ -55,7 +55,7 @@ #include "system/system.h" #include "trace.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/usb/usb.h" /* ------------------------------------------------------------------------ */ diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index 1a73db68f2..6fd04b7b42 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -41,7 +41,7 @@ #include #include -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/usb/usb.h" #include "migration/qemu-file-types.h" diff --git a/hw/usb/u2f-emulated.c b/hw/usb/u2f-emulated.c index 783e7f1af0..196d05a83a 100644 --- a/hw/usb/u2f-emulated.c +++ b/hw/usb/u2f-emulated.c @@ -29,7 +29,7 @@ #include "qemu/main-loop.h" #include "qapi/error.h" #include "hw/usb/usb.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include diff --git a/hw/usb/u2f-passthru.c b/hw/usb/u2f-passthru.c index b3206fb7fe..59b5f9829d 100644 --- a/hw/usb/u2f-passthru.c +++ b/hw/usb/u2f-passthru.c @@ -28,7 +28,7 @@ #include "qemu/main-loop.h" #include "qemu/error-report.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/usb/usb.h" #include "migration/vmstate.h" diff --git a/hw/usb/xlnx-usb-subsystem.c b/hw/usb/xlnx-usb-subsystem.c index 98967ef49f..7193dd4cd2 100644 --- a/hw/usb/xlnx-usb-subsystem.c +++ b/hw/usb/xlnx-usb-subsystem.c @@ -28,7 +28,7 @@ #include "qemu/bitops.h" #include "qom/object.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/usb/xlnx-usb-subsystem.h" static void versal_usb2_realize(DeviceState *dev, Error **errp) diff --git a/hw/vfio-user/pci.c b/hw/vfio-user/pci.c index 353d07e781..64b8b3cb8c 100644 --- a/hw/vfio-user/pci.c +++ b/hw/vfio-user/pci.c @@ -11,7 +11,7 @@ #include "qapi-visit-sockets.h" #include "qemu/error-report.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/vfio/pci.h" #include "hw/vfio-user/device.h" #include "hw/vfio-user/proxy.h" diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c index 3368ac8915..e58a0169af 100644 --- a/hw/vfio/ap.c +++ b/hw/vfio/ap.c @@ -28,7 +28,7 @@ #include "qemu/config-file.h" #include "kvm/kvm_s390x.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/s390x/ap-bridge.h" #include "system/address-spaces.h" #include "qom/object.h" diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c index 4d9588e7aa..2251facb35 100644 --- a/hw/vfio/ccw.c +++ b/hw/vfio/ccw.c @@ -25,7 +25,7 @@ #include "system/iommufd.h" #include "hw/s390x/s390-ccw.h" #include "hw/s390x/vfio-ccw.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/s390x/ccw-device.h" #include "system/address-spaces.h" #include "qemu/error-report.h" diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c index b5da6afbf5..7b907b9360 100644 --- a/hw/vfio/pci-quirks.c +++ b/hw/vfio/pci-quirks.c @@ -23,7 +23,7 @@ #include "qapi/visitor.h" #include #include "hw/nvram/fw_cfg.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "pci.h" #include "pci-quirks.h" #include "trace.h" diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index b46b1305a7..6b71605dd9 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -27,7 +27,7 @@ #include "hw/pci/msi.h" #include "hw/pci/msix.h" #include "hw/pci/pci_bridge.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/vfio/vfio-cpr.h" #include "migration/vmstate.h" diff --git a/hw/virtio/vdpa-dev-pci.c b/hw/virtio/vdpa-dev-pci.c index 3068112146..c047b0400d 100644 --- a/hw/virtio/vdpa-dev-pci.c +++ b/hw/virtio/vdpa-dev-pci.c @@ -19,7 +19,7 @@ #include "hw/virtio/virtio.h" #include "hw/virtio/vdpa-dev.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/hw/virtio/vdpa-dev.c b/hw/virtio/vdpa-dev.c index 57739385a9..3a6de7ebb4 100644 --- a/hw/virtio/vdpa-dev.c +++ b/hw/virtio/vdpa-dev.c @@ -20,7 +20,7 @@ #include "qemu/error-report.h" #include "qemu/cutils.h" #include "hw/core/qdev.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/virtio/vhost.h" #include "hw/virtio/virtio.h" diff --git a/hw/virtio/vhost-scsi-pci.c b/hw/virtio/vhost-scsi-pci.c index 7399acef8e..a78e13e038 100644 --- a/hw/virtio/vhost-scsi-pci.c +++ b/hw/virtio/vhost-scsi-pci.c @@ -17,7 +17,7 @@ #include "qemu/osdep.h" #include "standard-headers/linux/virtio_pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/vhost-scsi.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/virtio/vhost-user-base.c b/hw/virtio/vhost-user-base.c index ff67a020b4..01ab9ca56b 100644 --- a/hw/virtio/vhost-user-base.c +++ b/hw/virtio/vhost-user-base.c @@ -12,7 +12,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/vhost-user-base.h" #include "qemu/error-report.h" diff --git a/hw/virtio/vhost-user-blk-pci.c b/hw/virtio/vhost-user-blk-pci.c index 904369f5a3..20d100f665 100644 --- a/hw/virtio/vhost-user-blk-pci.c +++ b/hw/virtio/vhost-user-blk-pci.c @@ -22,7 +22,7 @@ #include "hw/virtio/virtio.h" #include "hw/virtio/vhost-user-blk.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/hw/virtio/vhost-user-fs-pci.c b/hw/virtio/vhost-user-fs-pci.c index 1490c118bc..92ae2fc8a6 100644 --- a/hw/virtio/vhost-user-fs-pci.c +++ b/hw/virtio/vhost-user-fs-pci.c @@ -12,7 +12,7 @@ */ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/vhost-user-fs.h" #include "hw/virtio/virtio-pci.h" #include "qom/object.h" diff --git a/hw/virtio/vhost-user-fs.c b/hw/virtio/vhost-user-fs.c index e77c69eb12..0acd9580b1 100644 --- a/hw/virtio/vhost-user-fs.c +++ b/hw/virtio/vhost-user-fs.c @@ -15,7 +15,7 @@ #include #include "standard-headers/linux/virtio_fs.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-access.h" diff --git a/hw/virtio/vhost-user-gpio-pci.c b/hw/virtio/vhost-user-gpio-pci.c index 9b165b54f8..9bd59e7ae7 100644 --- a/hw/virtio/vhost-user-gpio-pci.c +++ b/hw/virtio/vhost-user-gpio-pci.c @@ -7,7 +7,7 @@ */ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/vhost-user-gpio.h" #include "hw/virtio/virtio-pci.h" diff --git a/hw/virtio/vhost-user-gpio.c b/hw/virtio/vhost-user-gpio.c index a7fd49b10a..d473f87077 100644 --- a/hw/virtio/vhost-user-gpio.c +++ b/hw/virtio/vhost-user-gpio.c @@ -8,7 +8,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/vhost-user-gpio.h" #include "standard-headers/linux/virtio_ids.h" diff --git a/hw/virtio/vhost-user-i2c-pci.c b/hw/virtio/vhost-user-i2c-pci.c index 692cd66fde..5ddae8367b 100644 --- a/hw/virtio/vhost-user-i2c-pci.c +++ b/hw/virtio/vhost-user-i2c-pci.c @@ -7,7 +7,7 @@ */ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/vhost-user-i2c.h" #include "hw/virtio/virtio-pci.h" diff --git a/hw/virtio/vhost-user-i2c.c b/hw/virtio/vhost-user-i2c.c index ae007fe97d..152b1f6740 100644 --- a/hw/virtio/vhost-user-i2c.c +++ b/hw/virtio/vhost-user-i2c.c @@ -8,7 +8,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/vhost-user-i2c.h" #include "qemu/error-report.h" diff --git a/hw/virtio/vhost-user-rng-pci.c b/hw/virtio/vhost-user-rng-pci.c index 9f45fc6f35..cc289d0cb3 100644 --- a/hw/virtio/vhost-user-rng-pci.c +++ b/hw/virtio/vhost-user-rng-pci.c @@ -7,7 +7,7 @@ */ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/vhost-user-rng.h" #include "hw/virtio/virtio-pci.h" diff --git a/hw/virtio/vhost-user-rng.c b/hw/virtio/vhost-user-rng.c index 61dadcda05..106c8f211a 100644 --- a/hw/virtio/vhost-user-rng.c +++ b/hw/virtio/vhost-user-rng.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/vhost-user-rng.h" #include "standard-headers/linux/virtio_ids.h" diff --git a/hw/virtio/vhost-user-scmi-pci.c b/hw/virtio/vhost-user-scmi-pci.c index 0ab56a50bb..9a83e1f1ba 100644 --- a/hw/virtio/vhost-user-scmi-pci.c +++ b/hw/virtio/vhost-user-scmi-pci.c @@ -6,7 +6,7 @@ */ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/vhost-user-scmi.h" #include "hw/virtio/virtio-pci.h" diff --git a/hw/virtio/vhost-user-scsi-pci.c b/hw/virtio/vhost-user-scsi-pci.c index 367b8f27da..174552eb71 100644 --- a/hw/virtio/vhost-user-scsi-pci.c +++ b/hw/virtio/vhost-user-scsi-pci.c @@ -22,7 +22,7 @@ #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-scsi.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/hw/virtio/vhost-user-snd-pci.c b/hw/virtio/vhost-user-snd-pci.c index f5015fb6c4..90f47bf7a5 100644 --- a/hw/virtio/vhost-user-snd-pci.c +++ b/hw/virtio/vhost-user-snd-pci.c @@ -7,7 +7,7 @@ */ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/vhost-user-snd.h" #include "hw/virtio/virtio-pci.h" diff --git a/hw/virtio/vhost-user-snd.c b/hw/virtio/vhost-user-snd.c index 732411c655..7129b77d9c 100644 --- a/hw/virtio/vhost-user-snd.c +++ b/hw/virtio/vhost-user-snd.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/vhost-user-snd.h" #include "standard-headers/linux/virtio_ids.h" diff --git a/hw/virtio/vhost-user-test-device-pci.c b/hw/virtio/vhost-user-test-device-pci.c index b4ed0efb50..7f6d751690 100644 --- a/hw/virtio/vhost-user-test-device-pci.c +++ b/hw/virtio/vhost-user-test-device-pci.c @@ -8,7 +8,7 @@ */ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/vhost-user-base.h" #include "hw/virtio/virtio-pci.h" diff --git a/hw/virtio/vhost-user-test-device.c b/hw/virtio/vhost-user-test-device.c index 1b98ea3e48..a2f963fdf6 100644 --- a/hw/virtio/vhost-user-test-device.c +++ b/hw/virtio/vhost-user-test-device.c @@ -14,7 +14,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/vhost-user-base.h" #include "qemu/error-report.h" diff --git a/hw/virtio/vhost-user-vsock-pci.c b/hw/virtio/vhost-user-vsock-pci.c index adb877b6e0..bac96c96d8 100644 --- a/hw/virtio/vhost-user-vsock-pci.c +++ b/hw/virtio/vhost-user-vsock-pci.c @@ -11,7 +11,7 @@ #include "qemu/osdep.h" #include "hw/virtio/virtio-pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/vhost-user-vsock.h" #include "qom/object.h" diff --git a/hw/virtio/vhost-user-vsock.c b/hw/virtio/vhost-user-vsock.c index 993c287348..e20e0aee43 100644 --- a/hw/virtio/vhost-user-vsock.c +++ b/hw/virtio/vhost-user-vsock.c @@ -12,7 +12,7 @@ #include "qapi/error.h" #include "qemu/error-report.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/virtio/vhost-user-vsock.h" diff --git a/hw/virtio/vhost-vsock-common.c b/hw/virtio/vhost-vsock-common.c index c6c44d8989..b33def900a 100644 --- a/hw/virtio/vhost-vsock-common.c +++ b/hw/virtio/vhost-vsock-common.c @@ -13,7 +13,7 @@ #include "qapi/error.h" #include "hw/virtio/virtio-bus.h" #include "qemu/error-report.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/vhost.h" #include "hw/virtio/vhost-vsock.h" #include "qemu/iov.h" diff --git a/hw/virtio/vhost-vsock-pci.c b/hw/virtio/vhost-vsock-pci.c index 0022a713d4..3a94d06f8c 100644 --- a/hw/virtio/vhost-vsock-pci.c +++ b/hw/virtio/vhost-vsock-pci.c @@ -14,7 +14,7 @@ #include "qemu/osdep.h" #include "hw/virtio/virtio-pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/vhost-vsock.h" #include "qemu/module.h" #include "qom/object.h" diff --git a/hw/virtio/vhost-vsock.c b/hw/virtio/vhost-vsock.c index 7940b60d8a..da244eb165 100644 --- a/hw/virtio/vhost-vsock.c +++ b/hw/virtio/vhost-vsock.c @@ -17,7 +17,7 @@ #include "hw/virtio/virtio-access.h" #include "qemu/error-report.h" #include "qemu/sockets.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/vhost-vsock.h" #include "monitor/monitor.h" diff --git a/hw/virtio/virtio-9p-pci.c b/hw/virtio/virtio-9p-pci.c index 594742ff65..4b501ac2a3 100644 --- a/hw/virtio/virtio-9p-pci.c +++ b/hw/virtio/virtio-9p-pci.c @@ -17,7 +17,7 @@ #include "hw/virtio/virtio-pci.h" #include "hw/9pfs/virtio-9p.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/module.h" #include "qom/object.h" diff --git a/hw/virtio/virtio-balloon-pci.c b/hw/virtio/virtio-balloon-pci.c index 96e88b6b86..0bb5931bbc 100644 --- a/hw/virtio/virtio-balloon-pci.c +++ b/hw/virtio/virtio-balloon-pci.c @@ -15,7 +15,7 @@ #include "qemu/osdep.h" #include "hw/virtio/virtio-pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-balloon.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index bcf6ab6443..38bf1e84a1 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -20,7 +20,7 @@ #include "qemu/madvise.h" #include "hw/virtio/virtio.h" #include "hw/mem/pc-dimm.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/boards.h" #include "system/balloon.h" #include "system/ramblock.h" diff --git a/hw/virtio/virtio-blk-pci.c b/hw/virtio/virtio-blk-pci.c index fd33bbd7e8..64a434c81b 100644 --- a/hw/virtio/virtio-blk-pci.c +++ b/hw/virtio/virtio-blk-pci.c @@ -17,7 +17,7 @@ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-blk.h" #include "hw/virtio/virtio-pci.h" #include "qapi/error.h" diff --git a/hw/virtio/virtio-crypto-pci.c b/hw/virtio/virtio-crypto-pci.c index 868abc03a9..7b7dd05616 100644 --- a/hw/virtio/virtio-crypto-pci.c +++ b/hw/virtio/virtio-crypto-pci.c @@ -14,7 +14,7 @@ #include "qemu/osdep.h" #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-pci.h" diff --git a/hw/virtio/virtio-crypto.c b/hw/virtio/virtio-crypto.c index 517f2089c5..cbd1810fbc 100644 --- a/hw/virtio/virtio-crypto.c +++ b/hw/virtio/virtio-crypto.c @@ -20,7 +20,7 @@ #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-crypto.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "standard-headers/linux/virtio_ids.h" #include "system/cryptodev-vhost.h" diff --git a/hw/virtio/virtio-input-pci.c b/hw/virtio/virtio-input-pci.c index 3be5358b4c..cd35608460 100644 --- a/hw/virtio/virtio-input-pci.c +++ b/hw/virtio/virtio-input-pci.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "hw/virtio/virtio-pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-input.h" #include "qemu/module.h" #include "qom/object.h" diff --git a/hw/virtio/virtio-iommu-pci.c b/hw/virtio/virtio-iommu-pci.c index dd4100033f..9d32b8a7b3 100644 --- a/hw/virtio/virtio-iommu-pci.c +++ b/hw/virtio/virtio-iommu-pci.c @@ -13,7 +13,7 @@ #include "hw/virtio/virtio-pci.h" #include "hw/virtio/virtio-iommu.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "qapi/error.h" #include "hw/core/boards.h" diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c index 3500f1b082..4226a676d0 100644 --- a/hw/virtio/virtio-iommu.c +++ b/hw/virtio/virtio-iommu.c @@ -23,7 +23,7 @@ #include "qemu/range.h" #include "qemu/reserved-region.h" #include "exec/target_page.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio.h" #include "system/kvm.h" #include "system/reset.h" diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c index 5d1d90edc5..41de2ef5a0 100644 --- a/hw/virtio/virtio-mem.c +++ b/hw/virtio/virtio-mem.c @@ -28,7 +28,7 @@ #include "qapi/visitor.h" #include "migration/misc.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/acpi/acpi.h" #include "trace.h" diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c index d54d70b4fb..54bd0c57b5 100644 --- a/hw/virtio/virtio-mmio.c +++ b/hw/virtio/virtio-mmio.c @@ -22,7 +22,7 @@ #include "qemu/osdep.h" #include "standard-headers/linux/virtio_mmio.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "hw/virtio/virtio.h" #include "migration/qemu-file-types.h" diff --git a/hw/virtio/virtio-net-pci.c b/hw/virtio/virtio-net-pci.c index f857a84f11..fd3e0303f5 100644 --- a/hw/virtio/virtio-net-pci.c +++ b/hw/virtio/virtio-net-pci.c @@ -17,7 +17,7 @@ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-net.h" #include "hw/virtio/virtio-pci.h" #include "qapi/error.h" diff --git a/hw/virtio/virtio-nsm-pci.c b/hw/virtio/virtio-nsm-pci.c index ec243963e1..96e92be1b6 100644 --- a/hw/virtio/virtio-nsm-pci.c +++ b/hw/virtio/virtio-nsm-pci.c @@ -12,7 +12,7 @@ #include "hw/virtio/virtio-pci.h" #include "hw/virtio/virtio-nsm.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/module.h" #include "qom/object.h" diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 7382e7db6f..b273eb2691 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -25,7 +25,7 @@ #include "migration/qemu-file-types.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/log.h" diff --git a/hw/virtio/virtio-pmem.c b/hw/virtio/virtio-pmem.c index 3416ea1827..854d08abf6 100644 --- a/hw/virtio/virtio-pmem.c +++ b/hw/virtio/virtio-pmem.c @@ -17,7 +17,7 @@ #include "qemu/iov.h" #include "qemu/main-loop.h" #include "hw/virtio/virtio-pmem.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-access.h" #include "standard-headers/linux/virtio_ids.h" #include "standard-headers/linux/virtio_pmem.h" diff --git a/hw/virtio/virtio-rng-pci.c b/hw/virtio/virtio-rng-pci.c index 39b600356e..dcea260825 100644 --- a/hw/virtio/virtio-rng-pci.c +++ b/hw/virtio/virtio-rng-pci.c @@ -13,7 +13,7 @@ #include "hw/virtio/virtio-pci.h" #include "hw/virtio/virtio-rng.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "qemu/module.h" #include "qom/object.h" diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c index 3df5d2576e..66690a34dc 100644 --- a/hw/virtio/virtio-rng.c +++ b/hw/virtio/virtio-rng.c @@ -15,7 +15,7 @@ #include "qemu/module.h" #include "qemu/timer.h" #include "hw/virtio/virtio.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-rng.h" #include "system/rng.h" #include "system/runstate.h" diff --git a/hw/virtio/virtio-scsi-pci.c b/hw/virtio/virtio-scsi-pci.c index af87759207..fd5102819a 100644 --- a/hw/virtio/virtio-scsi-pci.c +++ b/hw/virtio/virtio-scsi-pci.c @@ -15,7 +15,7 @@ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-scsi.h" #include "qemu/module.h" #include "hw/virtio/virtio-pci.h" diff --git a/hw/virtio/virtio-serial-pci.c b/hw/virtio/virtio-serial-pci.c index 3f212ffe52..6d33d149df 100644 --- a/hw/virtio/virtio-serial-pci.c +++ b/hw/virtio/virtio-serial-pci.c @@ -17,7 +17,7 @@ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-serial.h" #include "qemu/module.h" #include "hw/virtio/virtio-pci.h" diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 257cda506a..5b64eb4d67 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -28,7 +28,7 @@ #include "migration/qemu-file-types.h" #include "qemu/atomic.h" #include "hw/virtio/virtio-bus.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/virtio/virtio-access.h" #include "system/dma.h" #include "system/iothread.h" diff --git a/hw/vmapple/vmapple.c b/hw/vmapple/vmapple.c index ad513d4cbc..2ebd0f07bd 100644 --- a/hw/vmapple/vmapple.c +++ b/hw/vmapple/vmapple.c @@ -28,7 +28,7 @@ #include "hw/core/boards.h" #include "hw/core/irq.h" #include "hw/core/loader.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "hw/usb/usb.h" #include "hw/arm/boot.h" diff --git a/hw/watchdog/cmsdk-apb-watchdog.c b/hw/watchdog/cmsdk-apb-watchdog.c index f1dd7d66ee..90d14e342b 100644 --- a/hw/watchdog/cmsdk-apb-watchdog.c +++ b/hw/watchdog/cmsdk-apb-watchdog.c @@ -28,7 +28,7 @@ #include "system/watchdog.h" #include "hw/sysbus.h" #include "hw/core/irq.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/registerfields.h" #include "hw/core/qdev-clock.h" #include "hw/watchdog/cmsdk-apb-watchdog.h" diff --git a/hw/watchdog/sbsa_gwdt.c b/hw/watchdog/sbsa_gwdt.c index ce84849df0..7ade5c6f18 100644 --- a/hw/watchdog/sbsa_gwdt.c +++ b/hw/watchdog/sbsa_gwdt.c @@ -18,7 +18,7 @@ #include "qemu/osdep.h" #include "system/reset.h" #include "system/watchdog.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/watchdog/sbsa_gwdt.h" #include "qemu/timer.h" #include "migration/vmstate.h" diff --git a/hw/watchdog/wdt_aspeed.c b/hw/watchdog/wdt_aspeed.c index 30226435ef..930834bfca 100644 --- a/hw/watchdog/wdt_aspeed.c +++ b/hw/watchdog/wdt_aspeed.c @@ -14,7 +14,7 @@ #include "qemu/module.h" #include "qemu/timer.h" #include "system/watchdog.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "hw/watchdog/wdt_aspeed.h" #include "migration/vmstate.h" diff --git a/hw/watchdog/wdt_imx2.c b/hw/watchdog/wdt_imx2.c index 10151a15d0..c83d4107c1 100644 --- a/hw/watchdog/wdt_imx2.c +++ b/hw/watchdog/wdt_imx2.c @@ -14,7 +14,7 @@ #include "qemu/module.h" #include "system/watchdog.h" #include "migration/vmstate.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/watchdog/wdt_imx2.h" #include "trace.h" diff --git a/hw/xen/xen-bus.c b/hw/xen/xen-bus.c index 6bd2e546f6..e3c51030f3 100644 --- a/hw/xen/xen-bus.c +++ b/hw/xen/xen-bus.c @@ -9,7 +9,7 @@ #include "qemu/main-loop.h" #include "qemu/module.h" #include "qemu/uuid.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "hw/xen/xen.h" #include "hw/xen/xen-backend.h" diff --git a/hw/xen/xen-legacy-backend.c b/hw/xen/xen-legacy-backend.c index da9a8e5213..f9b0dd1513 100644 --- a/hw/xen/xen-legacy-backend.c +++ b/hw/xen/xen-legacy-backend.c @@ -26,7 +26,7 @@ #include "hw/sysbus.h" #include "hw/core/boards.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/main-loop.h" #include "qapi/error.h" #include "hw/xen/xen-legacy-backend.h" diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index 006b5b55f2..c1b92d90cf 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -58,7 +58,7 @@ #include #include "hw/pci/pci.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/xen/xen_pt.h" #include "hw/xen/xen_igd.h" diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c index a96abcd4bd..a533f2bac3 100644 --- a/hw/xtensa/xtfpga.c +++ b/hw/xtensa/xtfpga.c @@ -32,7 +32,7 @@ #include "system/system.h" #include "hw/core/boards.h" #include "hw/core/loader.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "elf.h" #include "system/memory.h" #include "exec/tswap.h" diff --git a/include/hw/char/cadence_uart.h b/include/hw/char/cadence_uart.h index c87c327357..ad09fbdf32 100644 --- a/include/hw/char/cadence_uart.h +++ b/include/hw/char/cadence_uart.h @@ -19,7 +19,7 @@ #ifndef CADENCE_UART_H #define CADENCE_UART_H -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "chardev/char-fe.h" #include "qapi/error.h" diff --git a/include/hw/char/sifive_uart.h b/include/hw/char/sifive_uart.h index 6486c3f4a5..dea6055f87 100644 --- a/include/hw/char/sifive_uart.h +++ b/include/hw/char/sifive_uart.h @@ -21,7 +21,7 @@ #define HW_SIFIVE_UART_H #include "chardev/char-fe.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "qom/object.h" #include "qemu/fifo8.h" diff --git a/include/hw/qdev-properties.h b/include/hw/core/qdev-properties.h similarity index 100% rename from include/hw/qdev-properties.h rename to include/hw/core/qdev-properties.h diff --git a/include/hw/ide/ide-dev.h b/include/hw/ide/ide-dev.h index 92e8868780..617e8159c7 100644 --- a/include/hw/ide/ide-dev.h +++ b/include/hw/ide/ide-dev.h @@ -21,7 +21,7 @@ #define IDE_DEV_H #include "system/dma.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/block/block.h" typedef struct IDEDevice IDEDevice; diff --git a/include/hw/misc/unimp.h b/include/hw/misc/unimp.h index 518d627dc5..904f502fab 100644 --- a/include/hw/misc/unimp.h +++ b/include/hw/misc/unimp.h @@ -8,7 +8,7 @@ #ifndef HW_MISC_UNIMP_H #define HW_MISC_UNIMP_H -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "qapi/error.h" #include "qom/object.h" diff --git a/include/hw/net/ne2000-isa.h b/include/hw/net/ne2000-isa.h index 73bae10ad1..1e14d1afc0 100644 --- a/include/hw/net/ne2000-isa.h +++ b/include/hw/net/ne2000-isa.h @@ -11,7 +11,7 @@ #define HW_NET_NE2000_ISA_H #include "hw/isa/isa.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "net/net.h" #include "qapi/error.h" diff --git a/include/hw/nubus/nubus.h b/include/hw/nubus/nubus.h index 7825840dca..105ddddd0d 100644 --- a/include/hw/nubus/nubus.h +++ b/include/hw/nubus/nubus.h @@ -9,7 +9,7 @@ #ifndef HW_NUBUS_NUBUS_H #define HW_NUBUS_NUBUS_H -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/sysbus.h" #include "system/address-spaces.h" #include "qom/object.h" diff --git a/include/hw/qdev-properties-system.h b/include/hw/qdev-properties-system.h index 45687be005..ec39ef3bd6 100644 --- a/include/hw/qdev-properties-system.h +++ b/include/hw/qdev-properties-system.h @@ -1,7 +1,7 @@ #ifndef HW_QDEV_PROPERTIES_SYSTEM_H #define HW_QDEV_PROPERTIES_SYSTEM_H -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" bool qdev_prop_sanitize_s390x_loadparm(uint8_t *loadparm, const char *str, Error **errp); diff --git a/include/hw/timer/i8254.h b/include/hw/timer/i8254.h index f7148d9286..65775b789d 100644 --- a/include/hw/timer/i8254.h +++ b/include/hw/timer/i8254.h @@ -25,7 +25,7 @@ #ifndef HW_I8254_H #define HW_I8254_H -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/isa/isa.h" #include "qapi/error.h" #include "qom/object.h" diff --git a/migration/options.h b/migration/options.h index a7b3262d1e..d6f1742e5b 100644 --- a/migration/options.h +++ b/migration/options.h @@ -14,7 +14,7 @@ #ifndef QEMU_MIGRATION_OPTIONS_H #define QEMU_MIGRATION_OPTIONS_H -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/client-options.h" diff --git a/net/net.c b/net/net.c index 8aefdb3424..4930b573ed 100644 --- a/net/net.c +++ b/net/net.c @@ -27,7 +27,7 @@ #include "net/net.h" #include "clients.h" #include "hub.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "net/slirp.h" #include "net/eth.h" #include "util.h" diff --git a/rust/hw/core/wrapper.h b/rust/hw/core/wrapper.h index 44f8583bff..8fda78924d 100644 --- a/rust/hw/core/wrapper.h +++ b/rust/hw/core/wrapper.h @@ -27,6 +27,6 @@ typedef enum memory_order { #include "hw/sysbus.h" #include "hw/core/clock.h" #include "hw/core/qdev-clock.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/core/irq.h" diff --git a/system/physmem.c b/system/physmem.c index ba69be2d08..e3221ce00d 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -37,7 +37,7 @@ #include "exec/target_page.h" #include "exec/translation-block.h" #include "hw/core/qdev.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/boards.h" #include "system/xen.h" #include "system/kvm.h" diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c index c8773d864d..8e74e24c19 100644 --- a/system/qdev-monitor.c +++ b/system/qdev-monitor.c @@ -40,7 +40,7 @@ #include "system/block-backend.h" #include "migration/misc.h" #include "qemu/cutils.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/clock.h" #include "hw/core/boards.h" diff --git a/system/vl.c b/system/vl.c index 659c6506fc..2417f82c3e 100644 --- a/system/vl.c +++ b/system/vl.c @@ -30,7 +30,7 @@ #include "qemu/target-info.h" #include "exec/cpu-common.h" #include "exec/page-vary.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/compat-policy.h" #include "qapi/error.h" #include "qobject/qdict.h" diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 09e89272ed..caf7980b1f 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -34,7 +34,7 @@ #include "internals.h" #include "cpu-features.h" #include "exec/target_page.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #if !defined(CONFIG_USER_ONLY) #include "hw/core/loader.h" #include "hw/core/boards.h" diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index ae84d8e420..bf30381370 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -31,7 +31,7 @@ #include "kvm_arm.h" #include "hvf_arm.h" #include "qapi/visitor.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "internals.h" #include "cpu-features.h" diff --git a/target/arm/tcg/cpu64.c b/target/arm/tcg/cpu64.c index 6871956382..917db5bb09 100644 --- a/target/arm/tcg/cpu64.c +++ b/target/arm/tcg/cpu64.c @@ -23,7 +23,7 @@ #include "cpu.h" #include "qemu/module.h" #include "qapi/visitor.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qemu/units.h" #include "internals.h" #include "cpu-features.h" diff --git a/target/avr/cpu.c b/target/avr/cpu.c index a6df71d020..52237da3ce 100644 --- a/target/avr/cpu.c +++ b/target/avr/cpu.c @@ -26,7 +26,7 @@ #include "cpu.h" #include "disas/dis-asm.h" #include "tcg/debug-assert.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "accel/tcg/cpu-ops.h" static void avr_cpu_set_pc(CPUState *cs, vaddr value) diff --git a/target/hexagon/cpu.c b/target/hexagon/cpu.c index a5a04173ab..8ac4f49aa3 100644 --- a/target/hexagon/cpu.c +++ b/target/hexagon/cpu.c @@ -21,7 +21,7 @@ #include "internal.h" #include "exec/translation-block.h" #include "qapi/error.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "fpu/softfloat-helpers.h" #include "tcg/tcg.h" #include "exec/gdbstub.h" diff --git a/target/i386/cpu-apic.c b/target/i386/cpu-apic.c index 564c1288e4..eeee62b52a 100644 --- a/target/i386/cpu-apic.c +++ b/target/i386/cpu-apic.c @@ -15,7 +15,7 @@ #include "system/kvm.h" #include "system/xen.h" #include "system/address-spaces.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/i386/apic_internal.h" #include "cpu-internal.h" diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 4216ca9ec1..fe52538723 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -34,7 +34,7 @@ #include "qemu/error-report.h" #include "qapi/qapi-visit-machine.h" #include "standard-headers/asm-x86/kvm_para.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/i386/topology.h" #include "exec/watchpoint.h" #ifndef CONFIG_USER_ONLY diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c index d74c3c3766..e01e044239 100644 --- a/target/loongarch/cpu.c +++ b/target/loongarch/cpu.c @@ -14,7 +14,7 @@ #include "system/tcg.h" #include "system/kvm.h" #include "kvm/kvm_loongarch.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "exec/translation-block.h" #include "cpu.h" #include "cpu-mmu.h" diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c index 22231f09e6..53649ec656 100644 --- a/target/microblaze/cpu.c +++ b/target/microblaze/cpu.c @@ -26,7 +26,7 @@ #include "qapi/error.h" #include "cpu.h" #include "qemu/module.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "accel/tcg/cpu-ldst.h" #include "exec/gdbstub.h" #include "exec/translation-block.h" diff --git a/target/mips/cpu.c b/target/mips/cpu.c index 894799c02c..f74a9d5f61 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -29,7 +29,7 @@ #include "qemu/module.h" #include "system/kvm.h" #include "system/qtest.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/qdev-clock.h" #include "fpu_helper.h" #ifndef CONFIG_USER_ONLY diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c index a3b14ccead..929254827d 100644 --- a/target/ppc/cpu_init.c +++ b/target/ppc/cpu_init.c @@ -34,7 +34,7 @@ #include "qapi/error.h" #include "qobject/qnull.h" #include "qapi/visitor.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/ppc/ppc.h" #include "mmu-book3s-v3.h" #include "qemu/cutils.h" diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 73d4280d7c..8f26d8b8b0 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -27,7 +27,7 @@ #include "qapi/error.h" #include "qapi/visitor.h" #include "qemu/error-report.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/core/qdev-prop-internal.h" #include "migration/vmstate.h" #include "fpu/softfloat-helpers.h" diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 36e7f10037..b54cd78f8f 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -22,7 +22,7 @@ #include "hw/core/cpu.h" #include "hw/registerfields.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "exec/cpu-common.h" #include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index f05ce317da..be99b2ab94 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -30,7 +30,7 @@ #include "trace.h" #include "qapi/qapi-types-machine.h" #include "system/hw_accel.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/resettable.h" #include "fpu/softfloat-helpers.h" diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c index c9773f1540..bfc6fb9d00 100644 --- a/target/sparc/cpu.c +++ b/target/sparc/cpu.c @@ -24,7 +24,7 @@ #include "qemu/qemu-print.h" #include "accel/tcg/cpu-mmu-index.h" #include "exec/translation-block.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qapi/visitor.h" #include "tcg/tcg.h" #include "fpu/softfloat.h" diff --git a/tests/unit/test-qdev-global-props.c b/tests/unit/test-qdev-global-props.c index 33062762a6..8ea362cbb9 100644 --- a/tests/unit/test-qdev-global-props.c +++ b/tests/unit/test-qdev-global-props.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" -#include "hw/qdev-properties.h" +#include "hw/core/qdev-properties.h" #include "qom/object.h" #include "qapi/error.h" #include "qapi/visitor.h"