Include hw/qdev-properties.h less

In my "build everything" tree, changing hw/qdev-properties.h triggers a recompile of some 2700 out of 6600 objects (not counting tests and objects that don't depend on qemu/osdep.h). Many places including hw/qdev-properties.h (directly or via hw/qdev.h) actually need only hw/qdev-core.h. Include hw/qdev-core.h there instead. hw/qdev.h is actually pointless: all it does is include hw/qdev-core.h and hw/qdev-properties.h, which in turn includes hw/qdev-core.h. Replace the remaining uses of hw/qdev.h by hw/qdev-properties.h. While there, delete a few superfluous inclusions of hw/qdev-core.h. Touching hw/qdev-properties.h now recompiles some 1200 objects. Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: "Daniel P. Berrangé" <berrange@redhat.com> Cc: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> Message-Id: <20190812052359.30071-22-armbru@redhat.com>
2019-08-12 07:23:51 +02:00 · 2019-08-12 07:23:51 +02:00 · a27bd6c779
commit a27bd6c779
parent db72581598
497 changed files with 461 additions and 117 deletions
--- a/include/hw/acpi/acpi_dev_interface.h
+++ b/include/hw/acpi/acpi_dev_interface.h
@ -4,6 +4,7 @@
 #include "qapi/qapi-types-misc.h"
 #include "qom/object.h"
 #include "hw/boards.h"
+#include "hw/qdev-core.h"

 /* These values are part of guest ABI, and can not be changed */
 typedef enum {
--- a/include/hw/acpi/vmgenid.h
+++ b/include/hw/acpi/vmgenid.h
@ -2,7 +2,7 @@
 #define ACPI_VMGENID_H

 #include "hw/acpi/bios-linker-loader.h"
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 #include "qemu/uuid.h"

 #define VMGENID_DEVICE           "vmgenid"
--- a/include/hw/audio/pcspk.h
+++ b/include/hw/audio/pcspk.h
@ -26,6 +26,7 @@
 #define HW_PCSPK_H

 #include "hw/isa/isa.h"
+#include "hw/qdev-properties.h"

 #define TYPE_PC_SPEAKER "isa-pcspk"

--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@ -6,7 +6,6 @@
 #include "exec/memory.h"
 #include "sysemu/blockdev.h"
 #include "sysemu/accel.h"
-#include "hw/qdev.h"
 #include "qapi/qapi-types-machine.h"
 #include "qemu/module.h"
 #include "qom/object.h"
--- a/include/hw/char/cadence_uart.h
+++ b/include/hw/char/cadence_uart.h
@ -19,6 +19,7 @@
 #ifndef CADENCE_UART_H
 #define CADENCE_UART_H

+#include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "chardev/char-fe.h"
 #include "qemu/timer.h"
--- a/include/hw/char/cmsdk-apb-uart.h
+++ b/include/hw/char/cmsdk-apb-uart.h
@ -12,6 +12,7 @@
 #ifndef CMSDK_APB_UART_H
 #define CMSDK_APB_UART_H

+#include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "chardev/char-fe.h"

--- a/include/hw/char/lm32_juart.h
+++ b/include/hw/char/lm32_juart.h
@ -1,7 +1,7 @@
 #ifndef QEMU_HW_CHAR_LM32_JUART_H
 #define QEMU_HW_CHAR_LM32_JUART_H

-#include "hw/qdev.h"
+#include "hw/qdev-core.h"

 #define TYPE_LM32_JUART "lm32-juart"

--- a/include/hw/char/pl011.h
+++ b/include/hw/char/pl011.h
@ -15,6 +15,7 @@
 #ifndef HW_PL011_H
 #define HW_PL011_H

+#include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "chardev/char-fe.h"

--- a/include/hw/char/xilinx_uartlite.h
+++ b/include/hw/char/xilinx_uartlite.h
@ -15,6 +15,7 @@
 #ifndef XILINX_UARTLITE_H
 #define XILINX_UARTLITE_H

+#include "hw/qdev-properties.h"
 #include "hw/sysbus.h"

 static inline DeviceState *xilinx_uartlite_create(hwaddr addr,
--- a/include/hw/cpu/cluster.h
+++ b/include/hw/cpu/cluster.h
@ -20,7 +20,7 @@
 #ifndef HW_CPU_CLUSTER_H
 #define HW_CPU_CLUSTER_H

-#include "hw/qdev.h"
+#include "hw/qdev-core.h"

 /*
 * CPU Cluster type
--- a/include/hw/cpu/core.h
+++ b/include/hw/cpu/core.h
@ -9,7 +9,7 @@
 #ifndef HW_CPU_CORE_H
 #define HW_CPU_CORE_H

-#include "hw/qdev.h"
+#include "hw/qdev-core.h"

 #define TYPE_CPU_CORE "cpu-core"

--- a/include/hw/cris/etraxfs.h
+++ b/include/hw/cris/etraxfs.h
@ -27,6 +27,7 @@

 #include "net/net.h"
 #include "hw/cris/etraxfs_dma.h"
+#include "hw/qdev-properties.h"
 #include "hw/sysbus.h"

 /* Instantiate an ETRAXFS Ethernet MAC.  */
--- a/include/hw/display/milkymist_tmu2.h
+++ b/include/hw/display/milkymist_tmu2.h
@ -28,7 +28,7 @@
 #define HW_DISPLAY_MILKYMIST_TMU2_H

 #include "exec/hwaddr.h"
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"

 #if defined(CONFIG_X11) && defined(CONFIG_OPENGL)
 DeviceState *milkymist_tmu2_create(hwaddr base, qemu_irq irq);
--- a/include/hw/i2c/i2c.h
+++ b/include/hw/i2c/i2c.h
@ -1,7 +1,7 @@
 #ifndef QEMU_I2C_H
 #define QEMU_I2C_H

-#include "hw/qdev.h"
+#include "hw/qdev-core.h"

 /* The QEMU I2C implementation only supports simple transfers that complete
   immediately.  It does not support slave devices that need to be able to
--- a/include/hw/i386/intel_iommu.h
+++ b/include/hw/i386/intel_iommu.h
@ -21,7 +21,7 @@

 #ifndef INTEL_IOMMU_H
 #define INTEL_IOMMU_H
-#include "hw/qdev.h"
+
 #include "sysemu/dma.h"
 #include "hw/i386/x86-iommu.h"
 #include "hw/i386/ioapic.h"
--- a/include/hw/input/adb.h
+++ b/include/hw/input/adb.h
@ -26,7 +26,7 @@
 #ifndef ADB_H
 #define ADB_H

-#include "hw/qdev.h"
+#include "hw/qdev-core.h"

 #define MAX_ADB_DEVICES 16

--- a/include/hw/ipack/ipack.h
+++ b/include/hw/ipack/ipack.h
@ -11,7 +11,7 @@
 #ifndef QEMU_IPACK_H
 #define QEMU_IPACK_H

-#include "hw/qdev.h"
+#include "hw/qdev-core.h"

 typedef struct IPackBus IPackBus;

--- a/include/hw/ipmi/ipmi.h
+++ b/include/hw/ipmi/ipmi.h
@ -26,7 +26,7 @@
 #define HW_IPMI_H

 #include "exec/memory.h"
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"

 #define MAX_IPMI_MSG_SIZE 300

--- a/include/hw/isa/isa.h
+++ b/include/hw/isa/isa.h
@ -5,7 +5,7 @@

 #include "exec/memory.h"
 #include "exec/ioport.h"
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"

 #define ISA_NUM_IRQS 16

--- a/include/hw/mem/memory-device.h
+++ b/include/hw/mem/memory-device.h
@ -13,9 +13,9 @@
 #ifndef MEMORY_DEVICE_H
 #define MEMORY_DEVICE_H

+#include "hw/qdev-core.h"
 #include "qapi/qapi-types-misc.h"
 #include "qom/object.h"
-#include "hw/qdev.h"

 #define TYPE_MEMORY_DEVICE "memory-device"

--- a/include/hw/mem/pc-dimm.h
+++ b/include/hw/mem/pc-dimm.h
@ -18,7 +18,7 @@

 #include "exec/memory.h"
 #include "sysemu/hostmem.h"
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 #include "hw/boards.h"

 #define TYPE_PC_DIMM "pc-dimm"
--- a/include/hw/misc/auxbus.h
+++ b/include/hw/misc/auxbus.h
@ -26,7 +26,7 @@
 #define HW_MISC_AUXBUS_H

 #include "exec/memory.h"
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"

 typedef struct AUXBus AUXBus;
 typedef struct AUXSlave AUXSlave;
--- a/include/hw/misc/unimp.h
+++ b/include/hw/misc/unimp.h
@ -8,6 +8,7 @@
 #ifndef HW_MISC_UNIMP_H
 #define HW_MISC_UNIMP_H

+#include "hw/qdev-properties.h"
 #include "hw/sysbus.h"

 #define TYPE_UNIMPLEMENTED_DEVICE "unimplemented-device"
--- a/include/hw/misc/vmcoreinfo.h
+++ b/include/hw/misc/vmcoreinfo.h
@ -12,7 +12,7 @@
 #ifndef VMCOREINFO_H
 #define VMCOREINFO_H

-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 #include "standard-headers/linux/qemu_fw_cfg.h"

 #define VMCOREINFO_DEVICE "vmcoreinfo"
--- a/include/hw/net/ne2000-isa.h
+++ b/include/hw/net/ne2000-isa.h
@ -10,8 +10,8 @@
 #ifndef HW_NET_NE2000_ISA_H
 #define HW_NET_NE2000_ISA_H

-#include "hw/qdev.h"
 #include "hw/isa/isa.h"
+#include "hw/qdev-properties.h"
 #include "net/net.h"

 #define TYPE_ISA_NE2000 "ne2k_isa"
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@ -1,7 +1,6 @@
 #ifndef QEMU_PCI_H
 #define QEMU_PCI_H

-#include "hw/qdev.h"
 #include "exec/memory.h"
 #include "sysemu/dma.h"

--- a/include/hw/pcmcia.h
+++ b/include/hw/pcmcia.h
@ -3,7 +3,7 @@

 /* PCMCIA/Cardbus */

-#include "hw/qdev.h"
+#include "hw/qdev-core.h"

 typedef struct PCMCIASocket {
    qemu_irq irq;
--- a/include/hw/ppc/openpic.h
+++ b/include/hw/ppc/openpic.h
@ -2,7 +2,6 @@
 #define OPENPIC_H

 #include "hw/sysbus.h"
-#include "hw/qdev-core.h"
 #include "qom/cpu.h"

 #define MAX_CPU     32
--- a/include/hw/ppc/spapr_cpu_core.h
+++ b/include/hw/ppc/spapr_cpu_core.h
@ -9,8 +9,8 @@
 #ifndef HW_SPAPR_CPU_CORE_H
 #define HW_SPAPR_CPU_CORE_H

-#include "hw/qdev.h"
 #include "hw/cpu/core.h"
+#include "hw/qdev-core.h"
 #include "target/ppc/cpu-qom.h"
 #include "target/ppc/cpu.h"

--- a/include/hw/ppc/spapr_drc.h
+++ b/include/hw/ppc/spapr_drc.h
@ -16,7 +16,7 @@
 #include <libfdt.h>
 #include "qom/object.h"
 #include "sysemu/sysemu.h"
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 #include "qapi/error.h"

 #define TYPE_SPAPR_DR_CONNECTOR "spapr-dr-connector"
--- a/include/hw/ppc/xics.h
+++ b/include/hw/ppc/xics.h
@ -29,7 +29,7 @@
 #define XICS_H

 #include "exec/memory.h"
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"

 #define XICS_IPI        0x2
 #define XICS_BUID       0x1
--- a/include/hw/ppc/xive.h
+++ b/include/hw/ppc/xive.h
@ -141,7 +141,6 @@
 #define PPC_XIVE_H

 #include "sysemu/kvm.h"
-#include "hw/qdev-core.h"
 #include "hw/sysbus.h"
 #include "hw/ppc/xive_regs.h"

--- a/include/hw/qdev.h
+++ b/include/hw/qdev.h
@ -1,7 +0,0 @@
-#ifndef QDEV_H
-#define QDEV_H
-
-#include "hw/qdev-core.h"
-#include "hw/qdev-properties.h"
-
-#endif
--- a/include/hw/s390x/event-facility.h
+++ b/include/hw/s390x/event-facility.h
@ -15,8 +15,8 @@
 #ifndef HW_S390_SCLP_EVENT_FACILITY_H
 #define HW_S390_SCLP_EVENT_FACILITY_H

-#include "hw/qdev.h"
 #include "qemu/thread.h"
+#include "hw/qdev-core.h"
 #include "hw/s390x/sclp.h"

 /* SCLP event types */
--- a/include/hw/s390x/sclp.h
+++ b/include/hw/s390x/sclp.h
@ -15,7 +15,6 @@
 #define HW_S390_SCLP_H

 #include "hw/sysbus.h"
-#include "hw/qdev.h"
 #include "target/s390x/cpu-qom.h"

 #define SCLP_CMD_CODE_MASK                      0xffff00ff
--- a/include/hw/s390x/storage-attributes.h
+++ b/include/hw/s390x/storage-attributes.h
@ -12,7 +12,7 @@
 #ifndef S390_STORAGE_ATTRIBUTES_H
 #define S390_STORAGE_ATTRIBUTES_H

-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 #include "monitor/monitor.h"

 #define TYPE_S390_STATTRIB "s390-storage_attributes"
--- a/include/hw/s390x/storage-keys.h
+++ b/include/hw/s390x/storage-keys.h
@ -12,7 +12,7 @@
 #ifndef S390_STORAGE_KEYS_H
 #define S390_STORAGE_KEYS_H

-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 #include "monitor/monitor.h"

 #define TYPE_S390_SKEYS "s390-skeys"
--- a/include/hw/s390x/tod.h
+++ b/include/hw/s390x/tod.h
@ -11,7 +11,7 @@
 #ifndef HW_S390_TOD_H
 #define HW_S390_TOD_H

-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 #include "target/s390x/s390-tod.h"

 typedef struct S390TOD {
--- a/include/hw/scsi/scsi.h
+++ b/include/hw/scsi/scsi.h
@ -1,9 +1,9 @@
 #ifndef QEMU_HW_SCSI_H
 #define QEMU_HW_SCSI_H

-#include "hw/qdev.h"
 #include "block/aio.h"
 #include "hw/block/block.h"
+#include "hw/qdev-core.h"
 #include "sysemu/sysemu.h"
 #include "scsi/utils.h"
 #include "qemu/notify.h"
--- a/include/hw/sd/sd.h
+++ b/include/hw/sd/sd.h
@ -30,7 +30,7 @@
 #ifndef HW_SD_H
 #define HW_SD_H

-#include "hw/qdev.h"
+#include "hw/qdev-core.h"

 #define OUT_OF_RANGE		(1 << 31)
 #define ADDRESS_ERROR		(1 << 30)
--- a/include/hw/sparc/grlib.h
+++ b/include/hw/sparc/grlib.h
@ -25,7 +25,6 @@
 #ifndef GRLIB_H
 #define GRLIB_H

-#include "hw/qdev.h"
 #include "hw/sysbus.h"

 /* Emulation of GrLib device is base on the GRLIB IP Core User's Manual:
--- a/include/hw/ssi/ssi.h
+++ b/include/hw/ssi/ssi.h
@ -11,7 +11,7 @@
 #ifndef QEMU_SSI_H
 #define QEMU_SSI_H

-#include "hw/qdev.h"
+#include "hw/qdev-core.h"

 typedef struct SSISlave SSISlave;
 typedef struct SSISlaveClass SSISlaveClass;
--- a/include/hw/sysbus.h
+++ b/include/hw/sysbus.h
@ -3,7 +3,7 @@

 /* Devices attached directly to the main system bus.  */

-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 #include "exec/memory.h"

 #define QDEV_MAX_MMIO 32
--- a/include/hw/timer/cmsdk-apb-timer.h
+++ b/include/hw/timer/cmsdk-apb-timer.h
@ -12,6 +12,7 @@
 #ifndef CMSDK_APB_TIMER_H
 #define CMSDK_APB_TIMER_H

+#include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "hw/ptimer.h"

--- a/include/hw/timer/i8254.h
+++ b/include/hw/timer/i8254.h
@ -25,7 +25,7 @@
 #ifndef HW_I8254_H
 #define HW_I8254_H

-#include "hw/qdev.h"
+#include "hw/qdev-properties.h"
 #include "hw/isa/isa.h"

 #define PIT_FREQ 1193182
--- a/include/hw/usb.h
+++ b/include/hw/usb.h
@ -26,7 +26,7 @@
 */

 #include "exec/memory.h"
-#include "hw/qdev.h"
+#include "hw/qdev-core.h"
 #include "qemu/iov.h"
 #include "qemu/queue.h"

--- a/include/hw/virtio/vhost-scsi-common.h
+++ b/include/hw/virtio/vhost-scsi-common.h
@ -14,7 +14,6 @@
 #ifndef VHOST_SCSI_COMMON_H
 #define VHOST_SCSI_COMMON_H

-#include "hw/qdev.h"
 #include "hw/virtio/virtio-scsi.h"
 #include "hw/virtio/vhost.h"
 #include "hw/fw-path-provider.h"
--- a/include/hw/virtio/vhost-scsi.h
+++ b/include/hw/virtio/vhost-scsi.h
@ -14,7 +14,6 @@
 #ifndef VHOST_SCSI_H
 #define VHOST_SCSI_H

-#include "hw/qdev.h"
 #include "hw/virtio/virtio-scsi.h"
 #include "hw/virtio/vhost.h"
 #include "hw/virtio/vhost-scsi-common.h"
--- a/include/hw/virtio/vhost-user-blk.h
+++ b/include/hw/virtio/vhost-user-blk.h
@ -16,7 +16,6 @@
 #define VHOST_USER_BLK_H

 #include "standard-headers/linux/virtio_blk.h"
-#include "hw/qdev.h"
 #include "hw/block/block.h"
 #include "chardev/char-fe.h"
 #include "hw/virtio/vhost.h"
--- a/include/hw/virtio/vhost-user-scsi.h
+++ b/include/hw/virtio/vhost-user-scsi.h
@ -17,7 +17,6 @@
 #ifndef VHOST_USER_SCSI_H
 #define VHOST_USER_SCSI_H

-#include "hw/qdev.h"
 #include "hw/virtio/virtio-scsi.h"
 #include "hw/virtio/vhost.h"
 #include "hw/virtio/vhost-user.h"
--- a/include/hw/virtio/virtio-bus.h
+++ b/include/hw/virtio/virtio-bus.h
@ -25,8 +25,8 @@
 #ifndef VIRTIO_BUS_H
 #define VIRTIO_BUS_H

-#include "hw/qdev.h"
 #include "sysemu/sysemu.h"
+#include "hw/qdev-core.h"
 #include "hw/virtio/virtio.h"

 #define TYPE_VIRTIO_BUS "virtio-bus"
--- a/include/hw/virtio/virtio-serial.h
+++ b/include/hw/virtio/virtio-serial.h
@ -17,7 +17,6 @@
 #define QEMU_VIRTIO_SERIAL_H

 #include "standard-headers/linux/virtio_console.h"
-#include "hw/qdev.h"
 #include "hw/virtio/virtio.h"

 struct virtio_serial_conf {
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@ -15,8 +15,8 @@
 #define QEMU_VIRTIO_H

 #include "exec/memory.h"
+#include "hw/qdev-core.h"
 #include "net/net.h"
-#include "hw/qdev.h"
 #include "sysemu/sysemu.h"
 #include "migration/vmstate.h"
 #include "qemu/event_notifier.h"
--- a/include/hw/watchdog/wdt_diag288.h
+++ b/include/hw/watchdog/wdt_diag288.h
@ -1,7 +1,7 @@
 #ifndef WDT_DIAG288_H
 #define WDT_DIAG288_H

-#include "hw/qdev.h"
+#include "hw/qdev-core.h"

 #define TYPE_WDT_DIAG288 "diag288"
 #define DIAG288(obj) \
--- a/include/monitor/qdev.h
+++ b/include/monitor/qdev.h
@ -1,8 +1,6 @@
 #ifndef MONITOR_QDEV_H
 #define MONITOR_QDEV_H

-#include "hw/qdev-core.h"
-
 /*** monitor commands ***/

 void hmp_info_qtree(Monitor *mon, const QDict *qdict);
--- a/include/sysemu/accel.h
+++ b/include/sysemu/accel.h
@ -24,7 +24,6 @@
 #define HW_ACCEL_H

 #include "qom/object.h"
-#include "hw/qdev-properties.h"
 #include "exec/hwaddr.h"

 typedef struct AccelState {