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>

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>

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"

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

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"

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"

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"

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"

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"

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"

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"

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"

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"
 
 /* --------------------------------------------------------------------- */

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"

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"

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"

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"

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"

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"
 

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 {

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"
 
 /*

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)
 {

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"
 

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)
 {

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)

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"

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)
 

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"

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"

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"

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"
 

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"

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"

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"
 

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"

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"

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"

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"

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) \

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;

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

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"

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"

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"

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;

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;

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 {

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"

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"
 

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"
 

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"
 

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"

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 {

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"
 
 /*

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"

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);

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"
 

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"
 

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"
 

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"

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

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"

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

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"
 

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

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

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"
 

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"

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;

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"
 

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"
 

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"

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);

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"
 

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"

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,

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,

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)

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"

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"

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)

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

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:

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"

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"

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"
 

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"
 

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"
 

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"
 

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"

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)

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;

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"
 

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"

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"
 

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"

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"

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"

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 ***/
 

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"