include: move hw/qdev-core.h to hw/core/, rename

Call it hw/core/qdev.h to avoid the duplication in the name.

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

diff --git a/backends/hostmem.c b/backends/hostmem.c
index d583491664850b361296de8545c8872352a21844..67827c42b87bb415f79262734cb26b483ebb9b37 100644 (file)
--- a/backends/hostmem.c
+++ b/backends/hostmem.c
@@ -21,7 +21,7 @@
 #include "qemu/mmap-alloc.h"
 #include "qemu/madvise.h"
 #include "qemu/cutils.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 
 #ifdef CONFIG_NUMA
 #include <numaif.h>

diff --git a/block/block-backend.c b/block/block-backend.c
index 98315d447073005949c00e007e4d34d176a3406c..99446571201abaa464e95c3c47e57c87c2d01343 100644 (file)
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -16,7 +16,7 @@
 #include "block/blockjob.h"
 #include "block/coroutines.h"
 #include "block/throttle-groups.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "system/blockdev.h"
 #include "system/runstate.h"
 #include "system/replay.h"

diff --git a/docs/devel/qdev-api.rst b/docs/devel/qdev-api.rst
index 3f35eea025a60be4f46bec1e928e440381efd8c0..27b534ba127022d87adcd296a95e0548fc361493 100644 (file)
--- a/docs/devel/qdev-api.rst
+++ b/docs/devel/qdev-api.rst
@@ -4,4 +4,4 @@
 QEMU Device (qdev) API Reference
 ================================
 
-.. kernel-doc:: include/hw/qdev-core.h
+.. kernel-doc:: include/hw/core/qdev.h

diff --git a/hw/acpi/erst.c b/hw/acpi/erst.c
index 099cabb7ab788491723cb7c442797c7e8b689fff..10bbe37c170f333ccb21b84d6c963bfbef0e7fcd 100644 (file)
--- a/hw/acpi/erst.c
+++ b/hw/acpi/erst.c
@@ -11,7 +11,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "system/memory.h"
 #include "qom/object.h"
 #include "hw/pci/pci_device.h"

diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c
index 2f17d45907d450a779a0587429ba6c3ee7705cad..1ddfdd17b7525fd866b84aced14035e80621c2d6 100644 (file)
--- a/hw/acpi/memory_hotplug.c
+++ b/hw/acpi/memory_hotplug.c
@@ -2,7 +2,7 @@
 #include "hw/acpi/memory_hotplug.h"
 #include "hw/mem/pc-dimm.h"
 #include "hw/core/boards.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "migration/vmstate.h"
 #include "trace.h"
 #include "qapi/error.h"

diff --git a/hw/arm/allwinner-h3.c b/hw/arm/allwinner-h3.c
index 6c4c369e991af16a47c66bfe8ba0d0563d7e4b2a..757c89ef39f27df8cf4f404afab2591f055eb527 100644 (file)
--- a/hw/arm/allwinner-h3.c
+++ b/hw/arm/allwinner-h3.c
@@ -22,7 +22,7 @@
 #include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "qemu/units.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "hw/sysbus.h"
 #include "hw/char/serial-mm.h"
 #include "hw/misc/unimp.h"

diff --git a/hw/arm/allwinner-r40.c b/hw/arm/allwinner-r40.c
index f6d4117a0685654419b641612a6f8aa5bbf04b36..396e886af47c5f22da13007bdedc35df301db546 100644 (file)
--- a/hw/arm/allwinner-r40.c
+++ b/hw/arm/allwinner-r40.c
@@ -23,7 +23,7 @@
 #include "qemu/module.h"
 #include "qemu/units.h"
 #include "hw/core/boards.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "hw/sysbus.h"
 #include "hw/char/serial-mm.h"
 #include "hw/misc/unimp.h"

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

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

diff --git a/hw/arm/realview.c b/hw/arm/realview.c
index 65506768e41f75f7644da10d689125be8a7857a0..d7f96b9d3e48847136b53a449d135ec115648096 100644 (file)
--- a/hw/arm/realview.c
+++ b/hw/arm/realview.c
@@ -18,7 +18,7 @@
 #include "hw/net/lan9118.h"
 #include "hw/net/smc91c111.h"
 #include "hw/pci/pci.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "net/net.h"
 #include "system/system.h"
 #include "hw/core/boards.h"

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

diff --git a/hw/audio/intel-hda.h b/hw/audio/intel-hda.h
index 8d710eee5d66dabe7d9bb1759ba05937ba5958b7..174cf694f4985bb0cc89f4b27c245ba038357166 100644 (file)
--- a/hw/audio/intel-hda.h
+++ b/hw/audio/intel-hda.h
@@ -1,7 +1,7 @@
 #ifndef HW_INTEL_HDA_H
 #define HW_INTEL_HDA_H
 
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "qom/object.h"
 
 /* --------------------------------------------------------------------- */

diff --git a/hw/audio/model.c b/hw/audio/model.c
index 40929c6e77a6dbed51914c7bcb522926215409f4..ff4e4b24528305ec403af60759790139ac4da364 100644 (file)
--- a/hw/audio/model.c
+++ b/hw/audio/model.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "monitor/qdev.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"

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

diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c
index ee430dd3d261eca51f63a09d78ecf177f5d33b1f..008a2ea2f04b537ebcb4831b90f4e557a22efdd0 100644 (file)
--- a/hw/char/sh_serial.c
+++ b/hw/char/sh_serial.c
@@ -28,7 +28,7 @@
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/core/irq.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/sh4/sh.h"

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

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

diff --git a/hw/core/gpio.c b/hw/core/gpio.c
index 11f26a2f2dd3e8b8243dd0ed518b0fc0dae86cb2..37cda5ce4d33f6071b8fc5fd65b1f2b94ff1049f 100644 (file)
--- a/hw/core/gpio.c
+++ b/hw/core/gpio.c
@@ -18,7 +18,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "hw/core/irq.h"
 #include "qapi/error.h"
 

diff --git a/hw/core/guest-loader.h b/hw/core/guest-loader.h
index 07f4b4884b8ab2cfeed9d99624ff8cc0814dc2ac..214ccf1ba5def35a43c35fa9f890e8a15840ca4e 100644 (file)
--- a/hw/core/guest-loader.h
+++ b/hw/core/guest-loader.h
@@ -14,7 +14,7 @@
 #ifndef GUEST_LOADER_H
 #define GUEST_LOADER_H
 
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "qom/object.h"
 
 struct GuestLoaderState {

diff --git a/hw/core/qdev-clock.c b/hw/core/qdev-clock.c
index b96525951cdafd3975e620e4ed72a508e27b5ee6..6e2967e433e4ce2d1d3fe8f5465fbd7d0540b3aa 100644 (file)
--- a/hw/core/qdev-clock.c
+++ b/hw/core/qdev-clock.c
@@ -14,7 +14,7 @@
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
 #include "hw/core/qdev-clock.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "qapi/error.h"
 
 /*

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

diff --git a/hw/core/qdev-hotplug.c b/hw/core/qdev-hotplug.c
index d2c39806c532ea12a36ad78745c76ecb1f405d80..1d547e0dbdfeef1247a7740a8305eef4bb5b2d2a 100644 (file)
--- a/hw/core/qdev-hotplug.c
+++ b/hw/core/qdev-hotplug.c
@@ -10,7 +10,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "hw/core/boards.h"
 #include "qapi/error.h"
 

diff --git a/hw/core/qdev-user.c b/hw/core/qdev-user.c
index 3d421d8f4e5aeebf07e5b3e92dc2a5529957a215..051f8fbd02d0d5f3ad01f6fefb67be767af3eb24 100644 (file)
--- a/hw/core/qdev-user.c
+++ b/hw/core/qdev-user.c
@@ -7,7 +7,7 @@
  */
 #include "qemu/osdep.h"
 #include "qom/object.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 
 void qdev_create_fake_machine(void)
 {

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

diff --git a/hw/display/artist.c b/hw/display/artist.c
index 5efa9e45ffd0ae70da3e50a51d1ee434ecad1593..e6fed03786e9a6753f99d9a8fc4e00e45915864e 100644 (file)
--- a/hw/display/artist.c
+++ b/hw/display/artist.c
@@ -16,7 +16,7 @@
 #include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "hw/core/loader.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "ui/console.h"

diff --git a/hw/fsi/aspeed_apb2opb.c b/hw/fsi/aspeed_apb2opb.c
index 172ba16b0c058865930dc3f8a69ac2e521d7fca3..b9d72f3ecf63f24092af3081ba8c7370f39cc6f2 100644 (file)
--- a/hw/fsi/aspeed_apb2opb.c
+++ b/hw/fsi/aspeed_apb2opb.c
@@ -13,7 +13,7 @@
 #include "trace.h"
 
 #include "hw/fsi/aspeed_apb2opb.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 
 #define TO_REG(x) (x >> 2)
 

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

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

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

diff --git a/hw/remote/machine.c b/hw/remote/machine.c
index e4b47838bad83c1d316c022737163826eb6ce4b9..ced782f6a9c15371d4baf8cbaefb0a3c12bd0f6f 100644 (file)
--- a/hw/remote/machine.c
+++ b/hw/remote/machine.c
@@ -21,7 +21,7 @@
 #include "hw/pci/pci_host.h"
 #include "hw/remote/iohub.h"
 #include "hw/remote/iommu.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "hw/remote/vfio-user-obj.h"
 #include "hw/pci/msi.h"
 

diff --git a/hw/remote/remote-obj.c b/hw/remote/remote-obj.c
index 3402068ab9e84db54eb91d0ee613403f11421abd..86192dc8dadc2be0c07e61f78ae0c3445f3eabf3 100644 (file)
--- a/hw/remote/remote-obj.c
+++ b/hw/remote/remote-obj.c
@@ -13,7 +13,7 @@
 #include "qemu/notify.h"
 #include "qom/object_interfaces.h"
 #include "io/channel.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "hw/remote/machine.h"
 #include "io/channel-util.h"
 #include "qapi/error.h"

diff --git a/hw/remote/vfio-user-obj.c b/hw/remote/vfio-user-obj.c
index 13cda2f4813845b6c00ccd7e976cc3acf662b5f9..4eb036a546982a4b70cff2ef45920b00b9cf7fca 100644 (file)
--- a/hw/remote/vfio-user-obj.c
+++ b/hw/remote/vfio-user-obj.c
@@ -54,7 +54,7 @@
 #include "qemu/main-loop.h"
 #include "system/system.h"
 #include "libvfio-user.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "hw/pci/pci.h"
 #include "qemu/timer.h"
 #include "system/memory.h"

diff --git a/hw/s390x/ccw-device.h b/hw/s390x/ccw-device.h
index 4439feb1403d68dd86f4ce46e4eff778959fca9b..15f64cfb63688644c75e08366193f2d2683d99ef 100644 (file)
--- a/hw/s390x/ccw-device.h
+++ b/hw/s390x/ccw-device.h
@@ -12,7 +12,7 @@
 #ifndef HW_S390X_CCW_DEVICE_H
 #define HW_S390X_CCW_DEVICE_H
 #include "qom/object.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "hw/s390x/css.h"
 #include "hw/s390x/css-bridge.h"
 

diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h
index 505cded490c5cf8dd69a453c47189793d0d7c5f2..086e57681c29604554129685f17f32c37e12b82e 100644 (file)
--- a/hw/s390x/ipl.h
+++ b/hw/s390x/ipl.h
@@ -17,7 +17,7 @@
 #include "exec/target_page.h"
 #include "system/address-spaces.h"
 #include "system/memory.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "hw/s390x/ipl/qipl.h"
 #include "qom/object.h"
 #include "target/s390x/kvm/pv.h"

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

diff --git a/hw/sd/core.c b/hw/sd/core.c
index d3c9017445e01c2885a115656ecf23dc336d3b0f..3568a81e809fe107cfd0b5cc33b8b5761b11ce04 100644 (file)
--- a/hw/sd/core.c
+++ b/hw/sd/core.c
@@ -20,7 +20,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "hw/sd/sd.h"
 #include "qemu/module.h"
 #include "qapi/error.h"

diff --git a/hw/tpm/tpm_ppi.c b/hw/tpm/tpm_ppi.c
index 984d3d10808d076475976e3d70dd63178af70d3e..f0c34291dc9c0ade18fac4becef830ec33ce516e 100644 (file)
--- a/hw/tpm/tpm_ppi.c
+++ b/hw/tpm/tpm_ppi.c
@@ -16,7 +16,7 @@
 #include "qapi/error.h"
 #include "system/memory_mapping.h"
 #include "migration/vmstate.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "hw/acpi/tpm.h"
 #include "tpm_ppi.h"
 #include "trace.h"

diff --git a/hw/usb/canokey.h b/hw/usb/canokey.h
index 1b60d73485097f3f06464da528918410cf94009e..3d489a36ce749981af7799bfa14e17f93bb59e0f 100644 (file)
--- a/hw/usb/canokey.h
+++ b/hw/usb/canokey.h
@@ -10,7 +10,7 @@
 #ifndef CANOKEY_H
 #define CANOKEY_H
 
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 
 #define TYPE_CANOKEY "canokey"
 #define CANOKEY(obj) \

diff --git a/hw/usb/ccid.h b/hw/usb/ccid.h
index 6b82a55bd4cca63b6f9ef27cfd13a8fc8cefebc5..4959f7ea0c135e389810d6b8bebf6e042767f595 100644 (file)
--- a/hw/usb/ccid.h
+++ b/hw/usb/ccid.h
@@ -10,7 +10,7 @@
 #ifndef CCID_H
 #define CCID_H
 
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "qom/object.h"
 
 typedef struct CCIDCardInfo CCIDCardInfo;

diff --git a/hw/usb/u2f.h b/hw/usb/u2f.h
index 8bff13141af1a0ea9b7904074eada18fae8c1753..85ff7d0ffabcb7ebda23a2d94c039c4c9d61fb81 100644 (file)
--- a/hw/usb/u2f.h
+++ b/hw/usb/u2f.h
@@ -26,7 +26,7 @@
 #ifndef U2F_H
 #define U2F_H
 
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 
 #define U2FHID_PACKET_SIZE 64
 #define U2FHID_PENDING_IN_NUM 32

diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c
index bb5775aa711a668b7927865d19c3a27499ef49c8..32e8615ad3b41bdbeb6426c2542f445d9f31f2f5 100644 (file)
--- a/hw/vfio/iommufd.c
+++ b/hw/vfio/iommufd.c
@@ -20,7 +20,7 @@
 #include "trace.h"
 #include "qapi/error.h"
 #include "system/iommufd.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "hw/vfio/vfio-cpr.h"
 #include "system/reset.h"
 #include "qemu/cutils.h"

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

diff --git a/hw/xen/xen_pvdev.c b/hw/xen/xen_pvdev.c
index fe95b62d13315693ad353747c7c93dd7397c530a..e36370e2ee97b7f5b92aa40f55bb3ab9d82bd678 100644 (file)
--- a/hw/xen/xen_pvdev.c
+++ b/hw/xen/xen_pvdev.c
@@ -20,7 +20,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "qemu/main-loop.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "hw/xen/xen-legacy-backend.h"
 #include "hw/xen/xen-bus-helper.h"
 #include "hw/xen/xen_pvdev.h"

diff --git a/include/block/aio.h b/include/block/aio.h
index 6049e6a0f4c5acaa643b6fb33ba9b68a54a71975..cc3d5f25a2416bee6e42cd4121bb2a4efa4e10db 100644 (file)
--- a/include/block/aio.h
+++ b/include/block/aio.h
@@ -24,7 +24,7 @@
 #include "qemu/thread.h"
 #include "qemu/timer.h"
 #include "block/graph-lock.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 
 
 typedef struct BlockAIOCB BlockAIOCB;

diff --git a/include/hw/acpi/acpi_aml_interface.h b/include/hw/acpi/acpi_aml_interface.h
index 11748a88664480d545332996674e576bcf97ae6b..4be1b4acda67d03f385ae9732e460facca9d3125 100644 (file)
--- a/include/hw/acpi/acpi_aml_interface.h
+++ b/include/hw/acpi/acpi_aml_interface.h
@@ -3,7 +3,7 @@
 
 #include "qom/object.h"
 #include "hw/acpi/aml-build.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 
 #define TYPE_ACPI_DEV_AML_IF "acpi-dev-aml-interface"
 typedef struct AcpiDevAmlIfClass AcpiDevAmlIfClass;

diff --git a/include/hw/acpi/acpi_dev_interface.h b/include/hw/acpi/acpi_dev_interface.h
index 8294f8f0ccca35221f860d66c2a4ac83c3ae87a1..5927e40eaff06dc8aa9b3f3a1f312d3f691b7b0c 100644 (file)
--- a/include/hw/acpi/acpi_dev_interface.h
+++ b/include/hw/acpi/acpi_dev_interface.h
@@ -3,7 +3,7 @@
 
 #include "qapi/qapi-types-acpi.h"
 #include "qom/object.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 
 /* These values are part of guest ABI, and can not be changed */
 typedef enum {

diff --git a/include/hw/acpi/cpu.h b/include/hw/acpi/cpu.h
index a64d19445cc57a5f719512d35dc538688b9a458d..557219d2c638c180e7fccea2daaac08a78f8a7af 100644 (file)
--- a/include/hw/acpi/cpu.h
+++ b/include/hw/acpi/cpu.h
@@ -13,7 +13,7 @@
 #define ACPI_CPU_H
 
 #include "qapi/qapi-types-acpi.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "hw/acpi/acpi.h"
 #include "hw/acpi/aml-build.h"
 #include "hw/core/boards.h"

diff --git a/include/hw/acpi/memory_hotplug.h b/include/hw/acpi/memory_hotplug.h
index 38841d7b06544f0dd2f522c24643f5ceaaaeaf3e..eb7f460afecde3f0a6075460b0e30e47703a7ab9 100644 (file)
--- a/include/hw/acpi/memory_hotplug.h
+++ b/include/hw/acpi/memory_hotplug.h
@@ -2,7 +2,7 @@
 #define QEMU_HW_ACPI_MEMORY_HOTPLUG_H
 
 #include "qapi/qapi-types-acpi.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "hw/acpi/acpi.h"
 #include "hw/acpi/aml-build.h"
 

diff --git a/include/hw/acpi/vmclock.h b/include/hw/acpi/vmclock.h
index 5605605812c1f3b4d1976cbf034bd2ce6736f4c7..d88176d1951db293aaa67d915a57fadb55416d6c 100644 (file)
--- a/include/hw/acpi/vmclock.h
+++ b/include/hw/acpi/vmclock.h
@@ -2,7 +2,7 @@
 #define ACPI_VMCLOCK_H
 
 #include "hw/acpi/bios-linker-loader.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "qemu/uuid.h"
 #include "qom/object.h"
 

diff --git a/include/hw/acpi/vmgenid.h b/include/hw/acpi/vmgenid.h
index fb135d5bcbeefa9858a1f6450631e734cb2f5b3c..10985412726a914490610e973f4ee6698bc1ba5f 100644 (file)
--- a/include/hw/acpi/vmgenid.h
+++ b/include/hw/acpi/vmgenid.h
@@ -2,7 +2,7 @@
 #define ACPI_VMGENID_H
 
 #include "hw/acpi/bios-linker-loader.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "qemu/uuid.h"
 #include "qom/object.h"
 

diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
index 9615051774d75df28da952efd401882c1ef821db..f6f17df9e6483d92d62cedfcbc5a9f76c79fdc2e 100644 (file)
--- a/include/hw/core/cpu.h
+++ b/include/hw/core/cpu.h
@@ -20,7 +20,7 @@
 #ifndef QEMU_CPU_H
 #define QEMU_CPU_H
 
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "disas/dis-asm.h"
 #include "exec/breakpoint.h"
 #include "exec/hwaddr.h"

diff --git a/include/hw/core/generic-loader.h b/include/hw/core/generic-loader.h
index 19d87b39c8b093a3e49a89edced20ab765bc5efc..ed6d3ba9309b3a2ec8de53d7b8161141da370855 100644 (file)
--- a/include/hw/core/generic-loader.h
+++ b/include/hw/core/generic-loader.h
@@ -19,7 +19,7 @@
 #define GENERIC_LOADER_H
 
 #include "elf.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "qom/object.h"
 
 struct GenericLoaderState {

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

diff --git a/include/hw/cpu/cluster.h b/include/hw/cpu/cluster.h
index 53fbf36af54202a1871177cf39726448f2f13575..b79de065ad17eda5fd7a01f9ca921fa63a3a9179 100644 (file)
--- a/include/hw/cpu/cluster.h
+++ b/include/hw/cpu/cluster.h
@@ -20,7 +20,7 @@
 #ifndef HW_CPU_CLUSTER_H
 #define HW_CPU_CLUSTER_H
 
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "qom/object.h"
 
 /*

diff --git a/include/hw/cpu/core.h b/include/hw/cpu/core.h
index 98ab91647eb25053602208cd350107cbce70c6b8..22c53ff288ae6b19e1022eceecf2fe46d4ef6e51 100644 (file)
--- a/include/hw/cpu/core.h
+++ b/include/hw/cpu/core.h
@@ -9,7 +9,7 @@
 #ifndef HW_CPU_CORE_H
 #define HW_CPU_CORE_H
 
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "qom/object.h"
 
 #define TYPE_CPU_CORE "cpu-core"

diff --git a/include/hw/display/dm163.h b/include/hw/display/dm163.h
index 4377f77bb75031587ab7a3b6c8c325e54410cf8f..e1d2e05abc0b795ea7d1902df3340ac0258ef305 100644 (file)
--- a/include/hw/display/dm163.h
+++ b/include/hw/display/dm163.h
@@ -13,7 +13,7 @@
 #define HW_DISPLAY_DM163_H
 
 #include "qom/object.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 
 #define TYPE_DM163 "dm163"
 OBJECT_DECLARE_SIMPLE_TYPE(DM163State, DM163);

diff --git a/include/hw/fsi/fsi-master.h b/include/hw/fsi/fsi-master.h
index b634ecd3938e5daa22a1fe52b61b3e50c8e26468..60ddaa994f7cf3519f39e980b214e48c1bef55ec 100644 (file)
--- a/include/hw/fsi/fsi-master.h
+++ b/include/hw/fsi/fsi-master.h
@@ -8,7 +8,7 @@
 #define FSI_FSI_MASTER_H
 
 #include "system/memory.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "hw/fsi/fsi.h"
 #include "hw/fsi/cfam.h"
 

diff --git a/include/hw/fsi/fsi.h b/include/hw/fsi/fsi.h
index f34765ed80beff4713103461869705a036ffc514..26d7e89c2281ea3c001f2b95b6494a1ce4d1340c 100644 (file)
--- a/include/hw/fsi/fsi.h
+++ b/include/hw/fsi/fsi.h
@@ -8,7 +8,7 @@
 #define FSI_FSI_H
 
 #include "system/memory.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "hw/fsi/lbus.h"
 #include "qemu/bitops.h"
 

diff --git a/include/hw/fsi/lbus.h b/include/hw/fsi/lbus.h
index 12519073cd3ffc605ed2ba89e6f8f1b303ffaae5..1b894509fe4c027cc6481a8880e1c57f3aa1d9ac 100644 (file)
--- a/include/hw/fsi/lbus.h
+++ b/include/hw/fsi/lbus.h
@@ -7,7 +7,7 @@
 #ifndef FSI_LBUS_H
 #define FSI_LBUS_H
 
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "qemu/units.h"
 #include "system/memory.h"
 

diff --git a/include/hw/hyperv/vmbus.h b/include/hw/hyperv/vmbus.h
index 06b948bbb08770d45071954d3e723653879e0474..e0ef2f2c02edeecbdc31c3e3a1d9d510a4e34bd0 100644 (file)
--- a/include/hw/hyperv/vmbus.h
+++ b/include/hw/hyperv/vmbus.h
@@ -12,7 +12,7 @@
 
 #include "system/system.h"
 #include "system/dma.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "migration/vmstate.h"
 #include "hw/hyperv/vmbus-proto.h"
 #include "qemu/uuid.h"

diff --git a/include/hw/i2c/i2c.h b/include/hw/i2c/i2c.h
index 2a3abacd1ba6cfe548f9f16cf549b08d334cab01..dd5930f4b5eeedc067a2cbdc0a9caf9e26ad4f7a 100644 (file)
--- a/include/hw/i2c/i2c.h
+++ b/include/hw/i2c/i2c.h
@@ -1,7 +1,7 @@
 #ifndef QEMU_I2C_H
 #define QEMU_I2C_H
 
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "qom/object.h"
 
 /* The QEMU I2C implementation only supports simple transfers that complete

diff --git a/include/hw/i386/sgx-epc.h b/include/hw/i386/sgx-epc.h
index 41d55da47999d82a369ec0bcc61b46b81b9f3da9..ba976611628eb18a4be0efc53910d77e782b8153 100644 (file)
--- a/include/hw/i386/sgx-epc.h
+++ b/include/hw/i386/sgx-epc.h
@@ -12,7 +12,7 @@
 #ifndef QEMU_SGX_EPC_H
 #define QEMU_SGX_EPC_H
 
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "hw/i386/hostmem-epc.h"
 
 #define TYPE_SGX_EPC "sgx-epc"

diff --git a/include/hw/input/adb.h b/include/hw/input/adb.h
index 20fced15f707491008e8038cd60294701d217426..10791958302530c554d2789493184be8e0229aa0 100644 (file)
--- a/include/hw/input/adb.h
+++ b/include/hw/input/adb.h
@@ -26,7 +26,7 @@
 #ifndef ADB_H
 #define ADB_H
 
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "qom/object.h"
 
 #define MAX_ADB_DEVICES 16

diff --git a/include/hw/ipack/ipack.h b/include/hw/ipack/ipack.h
index d86ef84233c2f9eca89449bfd85636c12aacc1ff..fdd6c069c5a1eeee45b13bcda778cd82e17ba39f 100644 (file)
--- a/include/hw/ipack/ipack.h
+++ b/include/hw/ipack/ipack.h
@@ -11,7 +11,7 @@
 #ifndef QEMU_IPACK_H
 #define QEMU_IPACK_H
 
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "hw/core/irq.h"
 #include "qom/object.h"
 

diff --git a/include/hw/ipmi/ipmi.h b/include/hw/ipmi/ipmi.h
index cd581aa1342b77651589b24d80b2c86ed9f55d18..dabbb9ec5d894966e965d48531181a0d4d63ee5b 100644 (file)
--- a/include/hw/ipmi/ipmi.h
+++ b/include/hw/ipmi/ipmi.h
@@ -26,7 +26,7 @@
 #define HW_IPMI_H
 
 #include "system/memory.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "qom/object.h"
 
 #define MAX_IPMI_MSG_SIZE 300

diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h
index a82c5f1004f3095bb2cc341fe75f11436f5819d6..94bff33fcc7769f259e68c86584b04dc87b64e5f 100644 (file)
--- a/include/hw/isa/isa.h
+++ b/include/hw/isa/isa.h
@@ -5,7 +5,7 @@
 
 #include "system/memory.h"
 #include "system/ioport.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "qom/object.h"
 
 #define ISA_NUM_IRQS 16

diff --git a/include/hw/mem/memory-device.h b/include/hw/mem/memory-device.h
index c0a58087ccc16df8f1df97bd6b61575371f59858..10adcd3b8c09217eea98f1fb6146f1448cbb6915 100644 (file)
--- a/include/hw/mem/memory-device.h
+++ b/include/hw/mem/memory-device.h
@@ -13,7 +13,7 @@
 #ifndef MEMORY_DEVICE_H
 #define MEMORY_DEVICE_H
 
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "qapi/qapi-types-machine.h"
 #include "qom/object.h"
 

diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h
index e0dbdd43dca296f8486bf8fd8569ddaeb7794386..f2df951bafd7d179853c1bd9e2e7d7626f319c9e 100644 (file)
--- a/include/hw/mem/pc-dimm.h
+++ b/include/hw/mem/pc-dimm.h
@@ -17,7 +17,7 @@
 #define QEMU_PC_DIMM_H
 
 #include "system/memory.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "qom/object.h"
 
 #define TYPE_PC_DIMM "pc-dimm"

diff --git a/include/hw/misc/auxbus.h b/include/hw/misc/auxbus.h
index 0051e039471211a2f2dc8547be4fedd1db6fdc69..5bfdd05e1529e8ce7c4e6758b02446fb4a2cf997 100644 (file)
--- a/include/hw/misc/auxbus.h
+++ b/include/hw/misc/auxbus.h
@@ -26,7 +26,7 @@
 #define HW_MISC_AUXBUS_H
 
 #include "system/memory.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "qom/object.h"
 
 typedef enum AUXCommand AUXCommand;

diff --git a/include/hw/misc/led.h b/include/hw/misc/led.h
index 29c087957080039f816e0d19b545e3252260da4d..4d077a7c43e01fa92a496d26a69502eae013e2d4 100644 (file)
--- a/include/hw/misc/led.h
+++ b/include/hw/misc/led.h
@@ -9,7 +9,7 @@
 #define HW_MISC_LED_H
 
 #include "qom/object.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 
 #define TYPE_LED "led"
 

diff --git a/include/hw/misc/vmcoreinfo.h b/include/hw/misc/vmcoreinfo.h
index 1aa4477163295a4028d85c6d00f7fcd5eee3a888..3cafc7d42e1aa2458dc35a977711c0a7381f767a 100644 (file)
--- a/include/hw/misc/vmcoreinfo.h
+++ b/include/hw/misc/vmcoreinfo.h
@@ -12,7 +12,7 @@
 #ifndef VMCOREINFO_H
 #define VMCOREINFO_H
 
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "standard-headers/linux/qemu_fw_cfg.h"
 #include "qom/object.h"
 

diff --git a/include/hw/nvram/xlnx-bbram.h b/include/hw/nvram/xlnx-bbram.h
index ad2e4a250f5e60cac558df3d7346997cc0b4dc86..63558dbc3294e55a4cbc0354382d0927416b6971 100644 (file)
--- a/include/hw/nvram/xlnx-bbram.h
+++ b/include/hw/nvram/xlnx-bbram.h
@@ -27,7 +27,7 @@
 #define XLNX_BBRAM_H
 
 #include "system/block-backend.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "hw/register.h"

diff --git a/include/hw/nvram/xlnx-efuse.h b/include/hw/nvram/xlnx-efuse.h
index ef14fb0528aca015f12ff6408dcab337f058bc5f..08a9ce790d7799b73a67501799f09d00f3bd248e 100644 (file)
--- a/include/hw/nvram/xlnx-efuse.h
+++ b/include/hw/nvram/xlnx-efuse.h
@@ -28,7 +28,7 @@
 #define XLNX_EFUSE_H
 
 #include "system/block-backend.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 
 #define TYPE_XLNX_EFUSE "xlnx-efuse"
 OBJECT_DECLARE_SIMPLE_TYPE(XlnxEFuse, XLNX_EFUSE);

diff --git a/include/hw/ppc/pnv_adu.h b/include/hw/ppc/pnv_adu.h
index f9dbd8c8b3724cf4459423b79bd434c26651e4f3..d3a935a46d6df248bebc7ae04dce45a2c3c32d58 100644 (file)
--- a/include/hw/ppc/pnv_adu.h
+++ b/include/hw/ppc/pnv_adu.h
@@ -11,7 +11,7 @@
 
 #include "hw/ppc/pnv.h"
 #include "hw/ppc/pnv_lpc.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 
 #define TYPE_PNV_ADU "pnv-adu"
 

diff --git a/include/hw/ppc/pnv_lpc.h b/include/hw/ppc/pnv_lpc.h
index 266d56214f8891137a80720fc5e646a63a3f41c8..c219f87b16962a542ff9361748be31c994ff4177 100644 (file)
--- a/include/hw/ppc/pnv_lpc.h
+++ b/include/hw/ppc/pnv_lpc.h
@@ -22,7 +22,7 @@
 
 #include "system/memory.h"
 #include "hw/ppc/pnv.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "hw/isa/isa.h" /* For ISA_NUM_IRQS */
 
 #define TYPE_PNV_LPC "pnv-lpc"

diff --git a/include/hw/ppc/pnv_occ.h b/include/hw/ppc/pnv_occ.h
index 013ea2e53e3366b134c5eeac143152a6f4e51df6..84bdf5004da3b896adf221c71189342bc9db730c 100644 (file)
--- a/include/hw/ppc/pnv_occ.h
+++ b/include/hw/ppc/pnv_occ.h
@@ -21,7 +21,7 @@
 #define PPC_PNV_OCC_H
 
 #include "system/memory.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 
 #define TYPE_PNV_OCC "pnv-occ"
 OBJECT_DECLARE_TYPE(PnvOCC, PnvOCCClass,

diff --git a/include/hw/ppc/pnv_psi.h b/include/hw/ppc/pnv_psi.h
index cf7f95a6b1f59e99558876e401e182b6a4a9b257..8a04860aa8b3638131a9752cbd9843a66d89eb28 100644 (file)
--- a/include/hw/ppc/pnv_psi.h
+++ b/include/hw/ppc/pnv_psi.h
@@ -23,7 +23,7 @@
 #include "hw/sysbus.h"
 #include "hw/ppc/xics.h"
 #include "hw/ppc/xive.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 
 #define TYPE_PNV_PSI "pnv-psi"
 OBJECT_DECLARE_TYPE(PnvPsi, PnvPsiClass,

diff --git a/include/hw/ppc/pnv_sbe.h b/include/hw/ppc/pnv_sbe.h
index 48a8b86a80b2ced14ab5725a954b2c0ade987e47..d5d76a4de166cf214f00e9de2d5103bc814bd7b7 100644 (file)
--- a/include/hw/ppc/pnv_sbe.h
+++ b/include/hw/ppc/pnv_sbe.h
@@ -21,7 +21,7 @@
 #define PPC_PNV_SBE_H
 
 #include "system/memory.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 
 #define TYPE_PNV_SBE "pnv-sbe"
 OBJECT_DECLARE_TYPE(PnvSBE, PnvSBEClass, PNV_SBE)

diff --git a/include/hw/ppc/spapr_cpu_core.h b/include/hw/ppc/spapr_cpu_core.h
index 68f7083483299eaa0948585c41edd2fa91593318..273bb3320207580662a8a39e52d1f3cdf5ffd855 100644 (file)
--- a/include/hw/ppc/spapr_cpu_core.h
+++ b/include/hw/ppc/spapr_cpu_core.h
@@ -10,7 +10,7 @@
 #define HW_SPAPR_CPU_CORE_H
 
 #include "hw/cpu/core.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "target/ppc/cpu-qom.h"
 #include "target/ppc/cpu.h"
 #include "qom/object.h"

diff --git a/include/hw/ppc/spapr_drc.h b/include/hw/ppc/spapr_drc.h
index 9ff42909c938e50563e7bbcc6b3b102a34d3e648..bb80f95d91ecc71b881da6d282173ce6f5233568 100644 (file)
--- a/include/hw/ppc/spapr_drc.h
+++ b/include/hw/ppc/spapr_drc.h
@@ -16,7 +16,7 @@
 #include <libfdt.h>
 #include "qom/object.h"
 #include "system/runstate.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "qapi/error.h"
 
 #define TYPE_SPAPR_DR_CONNECTOR "spapr-dr-connector"

diff --git a/include/hw/ppc/spapr_tpm_proxy.h b/include/hw/ppc/spapr_tpm_proxy.h
index 96d2a9697e50051f797d7ba0bac16cab66c64a6c..831d36a02ffe117c2d30741bad527e9dfc761e0c 100644 (file)
--- a/include/hw/ppc/spapr_tpm_proxy.h
+++ b/include/hw/ppc/spapr_tpm_proxy.h
@@ -14,7 +14,7 @@
 #define HW_SPAPR_TPM_PROXY_H
 
 #include "qom/object.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 
 #define TYPE_SPAPR_TPM_PROXY "spapr-tpm-proxy"
 OBJECT_DECLARE_SIMPLE_TYPE(SpaprTpmProxy, SPAPR_TPM_PROXY)

diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h
index 097fcdf00f9dd717078aec9301c4c1d4e2814166..3f78e3712210ffaef84007da16747142a2738ab6 100644 (file)
--- a/include/hw/ppc/xics.h
+++ b/include/hw/ppc/xics.h
@@ -29,7 +29,7 @@
 #define XICS_H
 
 #include "system/memory.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "qom/object.h"
 
 #define XICS_IPI        0x2

diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h
index 60b81330097dc18294e74b0c6772e05832a1fe57..d8745d4c65f1e3e45cd9a40f3a3d3e99cef22736 100644 (file)
--- a/include/hw/qdev-properties.h
+++ b/include/hw/qdev-properties.h
@@ -1,7 +1,7 @@
 #ifndef QEMU_QDEV_PROPERTIES_H
 #define QEMU_QDEV_PROPERTIES_H
 
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 
 /**
  * Property:

diff --git a/include/hw/register.h b/include/hw/register.h
index 7b0f4c8b7a66348f0c1d60caa4a4c456eb74c34a..b3d20fee7d3189fccec89a92806d2a65366ef509 100644 (file)
--- a/include/hw/register.h
+++ b/include/hw/register.h
@@ -11,7 +11,7 @@
 #ifndef REGISTER_H
 #define REGISTER_H
 
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "system/memory.h"
 #include "hw/registerfields.h"
 #include "qom/object.h"

diff --git a/include/hw/s390x/ap-device.h b/include/hw/s390x/ap-device.h
index e502745de5ea5045f4475a1f3962b77ff6a22415..f746addb4282eea9fddae0e207cf659c70544fde 100644 (file)
--- a/include/hw/s390x/ap-device.h
+++ b/include/hw/s390x/ap-device.h
@@ -11,7 +11,7 @@
 #ifndef HW_S390X_AP_DEVICE_H
 #define HW_S390X_AP_DEVICE_H
 
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "qom/object.h"
 
 #define TYPE_AP_DEVICE       "ap-device"

diff --git a/include/hw/s390x/event-facility.h b/include/hw/s390x/event-facility.h
index eac7a51100352537a0e290f206fd802a967d5feb..5c556f2b4d8c630ff10815d9c5adc3c204a34023 100644 (file)
--- a/include/hw/s390x/event-facility.h
+++ b/include/hw/s390x/event-facility.h
@@ -16,7 +16,7 @@
 #define HW_S390_SCLP_EVENT_FACILITY_H
 
 #include "qemu/thread.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "hw/s390x/sclp.h"
 #include "qom/object.h"
 

diff --git a/include/hw/s390x/storage-attributes.h b/include/hw/s390x/storage-attributes.h
index b5c6d8fa552e7749e7951424f070eff30a5e7064..66716a97c050409e508ac51218a736a5941940ac 100644 (file)
--- a/include/hw/s390x/storage-attributes.h
+++ b/include/hw/s390x/storage-attributes.h
@@ -12,7 +12,7 @@
 #ifndef S390_STORAGE_ATTRIBUTES_H
 #define S390_STORAGE_ATTRIBUTES_H
 
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "monitor/monitor.h"
 #include "qom/object.h"
 

diff --git a/include/hw/s390x/storage-keys.h b/include/hw/s390x/storage-keys.h
index ac303001f57f73ca6280ab2715c7fe07ed340eb7..2d02936c31cead7c9326b0e2078bcb4eaa0b8c11 100644 (file)
--- a/include/hw/s390x/storage-keys.h
+++ b/include/hw/s390x/storage-keys.h
@@ -12,7 +12,7 @@
 #ifndef S390_STORAGE_KEYS_H
 #define S390_STORAGE_KEYS_H
 
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "monitor/monitor.h"
 #include "qom/object.h"
 

diff --git a/include/hw/s390x/tod.h b/include/hw/s390x/tod.h
index 0935e850891014fa247c6788ea23908428ce31ac..bcb20994c8726d7e138f01d0b6f699dd3f767be6 100644 (file)
--- a/include/hw/s390x/tod.h
+++ b/include/hw/s390x/tod.h
@@ -11,7 +11,7 @@
 #ifndef HW_S390_TOD_H
 #define HW_S390_TOD_H
 
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "tcg/s390-tod.h"
 #include "qom/object.h"
 

diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h
index 044bd048b49d9a101f5487837a7887b6f5d033b3..83782339d4bd98121e77a173c7bc2978b26a351a 100644 (file)
--- a/include/hw/scsi/scsi.h
+++ b/include/hw/scsi/scsi.h
@@ -3,7 +3,7 @@
 
 #include "block/aio.h"
 #include "hw/block/block.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "scsi/utils.h"
 #include "qemu/notify.h"
 #include "qom/object.h"

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

diff --git a/include/hw/ssi/ssi.h b/include/hw/ssi/ssi.h
index 2ad8033d8f5b7fff9d1ace7b14092a8fd9e5a55a..6d6d8ccb3d416fb0a219846fd025108f60ce330f 100644 (file)
--- a/include/hw/ssi/ssi.h
+++ b/include/hw/ssi/ssi.h
@@ -13,7 +13,7 @@
 #ifndef QEMU_SSI_H
 #define QEMU_SSI_H
 
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "qom/object.h"
 
 typedef enum SSICSMode SSICSMode;

diff --git a/include/hw/sysbus.h b/include/hw/sysbus.h
index 69eb62e29c8554ba90402cfb154ab0123a5b2947..c0d18d9e00b735d440bff1be7fa70de5b07ad52e 100644 (file)
--- a/include/hw/sysbus.h
+++ b/include/hw/sysbus.h
@@ -3,7 +3,7 @@
 
 /* Devices attached directly to the main system bus.  */
 
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "system/memory.h"
 #include "qom/object.h"
 

diff --git a/include/hw/usb/usb.h b/include/hw/usb/usb.h
index 26a9f3ecdee842985804fcacd3621d0aedcd95ff..78e2ceedd7fd5e446317d774df1e45f56f9a6b14 100644 (file)
--- a/include/hw/usb/usb.h
+++ b/include/hw/usb/usb.h
@@ -26,7 +26,7 @@
  */
 
 #include "system/memory.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "qemu/iov.h"
 #include "qemu/queue.h"
 #include "qom/object.h"

diff --git a/include/hw/virtio/virtio-bus.h b/include/hw/virtio/virtio-bus.h
index 7ab8c9dab0577a979fa9742b1093915bd2f17195..1a2d3961565886132b4fe0a00fb32c9aeff51fd6 100644 (file)
--- a/include/hw/virtio/virtio-bus.h
+++ b/include/hw/virtio/virtio-bus.h
@@ -25,7 +25,7 @@
 #ifndef VIRTIO_BUS_H
 #define VIRTIO_BUS_H
 
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "hw/virtio/virtio.h"
 #include "qom/object.h"
 

diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index d97529c3f1eb371eb73866a46e590ce077dc1337..91ff2fa21a54ef713deb9f03541a4081bb25df28 100644 (file)
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -15,7 +15,7 @@
 #define QEMU_VIRTIO_H
 
 #include "system/memory.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "hw/virtio/virtio-features.h"
 #include "net/net.h"
 #include "migration/vmstate.h"

diff --git a/include/hw/watchdog/wdt_diag288.h b/include/hw/watchdog/wdt_diag288.h
index f72c1d3318d3bb9d3e9a316dcf5cbe583814174c..c76f7e5d36b9dea424c4e34245e531531646d773 100644 (file)
--- a/include/hw/watchdog/wdt_diag288.h
+++ b/include/hw/watchdog/wdt_diag288.h
@@ -1,7 +1,7 @@
 #ifndef WDT_DIAG288_H
 #define WDT_DIAG288_H
 
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "qom/object.h"
 
 #define TYPE_WDT_DIAG288 "diag288"

diff --git a/include/hw/xen/xen-bus.h b/include/hw/xen/xen-bus.h
index bdbf1ed6fd0cf68a8aeba14b365b1141e8bddba0..4416123f1f96ec51d99c13345b9581f6ad532e4f 100644 (file)
--- a/include/hw/xen/xen-bus.h
+++ b/include/hw/xen/xen-bus.h
@@ -8,7 +8,7 @@
 #ifndef HW_XEN_BUS_H
 #define HW_XEN_BUS_H
 
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "hw/xen/xen_backend_ops.h"
 #include "qemu/notify.h"
 #include "qemu/queue.h"

diff --git a/include/monitor/qdev.h b/include/monitor/qdev.h
index de33637869b7917124d053c1c1e891da30fd7fcd..f85f25738d58f479b6d1ce9ea49b4623e0652c87 100644 (file)
--- a/include/monitor/qdev.h
+++ b/include/monitor/qdev.h
@@ -1,7 +1,7 @@
 #ifndef MONITOR_QDEV_H
 #define MONITOR_QDEV_H
 
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 
 /*** monitor commands ***/
 

diff --git a/migration/migration.h b/migration/migration.h
index 213b33fe6e55abb47b152dd9db5aee8ef56d54e8..fbe02d5bb1a92074f04d1c6f130a8de3ef722322 100644 (file)
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -15,7 +15,7 @@
 #define QEMU_MIGRATION_H
 
 #include "exec/cpu-common.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "qapi/qapi-types-migration.h"
 #include "qobject/json-writer.h"
 #include "qemu/thread.h"

diff --git a/monitor/hmp.c b/monitor/hmp.c
index a3ee02e52cda530508b170c4c5e8357b304f7df6..4caafbc7146997ca8767c50310124412ff7844dd 100644 (file)
--- a/monitor/hmp.c
+++ b/monitor/hmp.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include <dirent.h>
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "monitor-internal.h"
 #include "monitor/hmp.h"
 #include "qobject/qdict.h"

diff --git a/qom/object.c b/qom/object.c
index 4f32c1aba7d7943ae59684d1c335f8d679fbbf09..ff8ede8a328e2bcb1c432b7a49ffda84153e9f15 100644 (file)
--- a/qom/object.c
+++ b/qom/object.c
@@ -11,7 +11,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "qapi/error.h"
 #include "qom/object.h"
 #include "qom/object_interfaces.h"

diff --git a/qom/qom-hmp-cmds.c b/qom/qom-hmp-cmds.c
index a00a564b1e220644ac8d0c307749c785babec1c5..32e40630c96a96c95edce97ce5433ec0defbc34d 100644 (file)
--- a/qom/qom-hmp-cmds.c
+++ b/qom/qom-hmp-cmds.c
@@ -6,7 +6,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "monitor/hmp.h"
 #include "monitor/monitor.h"
 #include "qapi/error.h"

diff --git a/qom/qom-qmp-cmds.c b/qom/qom-qmp-cmds.c
index 57f1898cf612dc948ef9dbbc0fac9800131dd346..48b38d2b7f733239cdf186f606f76f4a53293287 100644 (file)
--- a/qom/qom-qmp-cmds.c
+++ b/qom/qom-qmp-cmds.c
@@ -15,7 +15,7 @@
 
 #include "qemu/osdep.h"
 #include "block/qdict.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "qapi/error.h"
 #include "qapi/qapi-commands-qdev.h"
 #include "qapi/qapi-commands-qom.h"

diff --git a/stubs/hotplug-stubs.c b/stubs/hotplug-stubs.c
index 7aadaa29bd579764c6bf5437471cd8638decb8f3..23a1678dbbc80fe355cd2b753dcf9ae6a618b584 100644 (file)
--- a/stubs/hotplug-stubs.c
+++ b/stubs/hotplug-stubs.c
@@ -12,7 +12,7 @@
  * See the COPYING file in the top-level directory.
  */
 #include "qemu/osdep.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 
 HotplugHandler *qdev_get_hotplug_handler(DeviceState *dev)
 {

diff --git a/stubs/sysbus.c b/stubs/sysbus.c
index d8da90caae527457863c60cffec041f1e90d9aaa..68b771226fa451e56c79218b40900a08b7ac1ed1 100644 (file)
--- a/stubs/sysbus.c
+++ b/stubs/sysbus.c
@@ -1,5 +1,5 @@
 #include "qemu/osdep.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 
 BusState *sysbus_get_default(void)
 {

diff --git a/system/bootdevice.c b/system/bootdevice.c
index 8acdbfb0a574835457169e4bf58934c41752bd00..9538b08983f5f982b2064c5663db85323f474344 100644 (file)
--- a/system/bootdevice.c
+++ b/system/bootdevice.c
@@ -28,7 +28,7 @@
 #include "qapi/visitor.h"
 #include "qemu/error-report.h"
 #include "system/reset.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "hw/core/boards.h"
 
 typedef struct FWBootEntry FWBootEntry;

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

diff --git a/system/qtest.c b/system/qtest.c
index b0bb9bf9d440602f562fbbda6bd450bcb210beaf..e42b83ce67135593416915611a140a4fe31ea9fb 100644 (file)
--- a/system/qtest.c
+++ b/system/qtest.c
@@ -19,7 +19,7 @@
 #include "system/ioport.h"
 #include "system/memory.h"
 #include "exec/tswap.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "hw/core/irq.h"
 #include "hw/core/cpu.h"
 #include "qemu/accel.h"

diff --git a/tests/qtest/fuzz/generic_fuzz.c b/tests/qtest/fuzz/generic_fuzz.c
index c848eec3b9337d4707cb3da1724d6cc936d929d3..e8bb7bb0d5644ab68e6322e33f48b8e14f18a8a7 100644 (file)
--- a/tests/qtest/fuzz/generic_fuzz.c
+++ b/tests/qtest/fuzz/generic_fuzz.c
@@ -22,7 +22,7 @@
 #include "string.h"
 #include "system/memory.h"
 #include "system/ramblock.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_device.h"
 #include "hw/core/boards.h"

diff --git a/ui/console.c b/ui/console.c
index 2d00828c5382eac6b95650dcc412211cf7297a01..f445db11389fdb616bb0b895f3eeacf3c73b8cbe 100644 (file)
--- a/ui/console.c
+++ b/ui/console.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "ui/console.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "qapi/error.h"
 #include "qapi/qapi-commands-ui.h"
 #include "qapi/visitor.h"

diff --git a/ui/vdagent.c b/ui/vdagent.c
index 660686c9c0b86d022aa7c8c9c1c5f23e7f4dde33..142a3691ac9a45d3c8cb91de02ac30632ced1bcf 100644 (file)
--- a/ui/vdagent.c
+++ b/ui/vdagent.c
@@ -5,7 +5,7 @@
 #include "qemu/error-report.h"
 #include "qemu/option.h"
 #include "qemu/units.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "ui/clipboard.h"
 #include "ui/console.h"
 #include "ui/input.h"

diff --git a/ui/vnc.c b/ui/vnc.c
index e6bcf0e1cfdf22dac6df7564e1fb5d6a977c68dd..a61a4f937d6929d60c7256bc7e95989adc5cff4c 100644 (file)
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -28,7 +28,7 @@
 #include "vnc.h"
 #include "vnc-jobs.h"
 #include "trace.h"
-#include "hw/qdev-core.h"
+#include "hw/core/qdev.h"
 #include "system/system.h"
 #include "system/runstate.h"
 #include "qemu/error-report.h"