diff options
author | Markus Armbruster <armbru@redhat.com> | 2019-08-12 07:23:51 +0200 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2019-08-16 13:31:53 +0200 |
commit | a27bd6c779badb8d76e4430d810ef710a1b98f4e (patch) | |
tree | b7631b26b400537ff383b13e9e9deb299cef85b4 /hw/s390x | |
parent | db725815985654007ade0fd53590d613fd657208 (diff) | |
download | qemu-a27bd6c779badb8d76e4430d810ef710a1b98f4e.zip qemu-a27bd6c779badb8d76e4430d810ef710a1b98f4e.tar.gz qemu-a27bd6c779badb8d76e4430d810ef710a1b98f4e.tar.bz2 |
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>
Diffstat (limited to 'hw/s390x')
-rw-r--r-- | hw/s390x/3270-ccw.c | 2 | ||||
-rw-r--r-- | hw/s390x/ap-device.c | 1 | ||||
-rw-r--r-- | hw/s390x/ccw-device.c | 1 | ||||
-rw-r--r-- | hw/s390x/css-bridge.c | 1 | ||||
-rw-r--r-- | hw/s390x/css.c | 2 | ||||
-rw-r--r-- | hw/s390x/ipl.c | 1 | ||||
-rw-r--r-- | hw/s390x/ipl.h | 2 | ||||
-rw-r--r-- | hw/s390x/s390-pci-bus.c | 1 | ||||
-rw-r--r-- | hw/s390x/s390-virtio-ccw.c | 1 | ||||
-rw-r--r-- | hw/s390x/sclpquiesce.c | 1 | ||||
-rw-r--r-- | hw/s390x/vhost-vsock-ccw.c | 1 | ||||
-rw-r--r-- | hw/s390x/virtio-ccw-9p.c | 1 | ||||
-rw-r--r-- | hw/s390x/virtio-ccw-balloon.c | 1 | ||||
-rw-r--r-- | hw/s390x/virtio-ccw-blk.c | 1 | ||||
-rw-r--r-- | hw/s390x/virtio-ccw-crypto.c | 1 | ||||
-rw-r--r-- | hw/s390x/virtio-ccw-gpu.c | 1 | ||||
-rw-r--r-- | hw/s390x/virtio-ccw-input.c | 1 | ||||
-rw-r--r-- | hw/s390x/virtio-ccw-net.c | 1 | ||||
-rw-r--r-- | hw/s390x/virtio-ccw-rng.c | 1 | ||||
-rw-r--r-- | hw/s390x/virtio-ccw-scsi.c | 1 | ||||
-rw-r--r-- | hw/s390x/virtio-ccw-serial.c | 1 |
21 files changed, 20 insertions, 4 deletions
diff --git a/hw/s390x/3270-ccw.c b/hw/s390x/3270-ccw.c index 1488224..c19a75b 100644 --- a/hw/s390x/3270-ccw.c +++ b/hw/s390x/3270-ccw.c @@ -9,12 +9,14 @@ * your option) any later version. See the COPYING file in the top-level * directory. */ + #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/module.h" #include "cpu.h" #include "hw/s390x/css.h" #include "hw/s390x/css-bridge.h" +#include "hw/qdev-properties.h" #include "hw/s390x/3270-ccw.h" /* Handle READ ccw commands from guest */ diff --git a/hw/s390x/ap-device.c b/hw/s390x/ap-device.c index f5ac8db..fc0b41e 100644 --- a/hw/s390x/ap-device.c +++ b/hw/s390x/ap-device.c @@ -10,7 +10,6 @@ #include "qemu/osdep.h" #include "qemu/module.h" #include "qapi/error.h" -#include "hw/qdev.h" #include "hw/s390x/ap-device.h" static void ap_class_init(ObjectClass *klass, void *data) diff --git a/hw/s390x/ccw-device.c b/hw/s390x/ccw-device.c index 24f17bb..4d222ad 100644 --- a/hw/s390x/ccw-device.c +++ b/hw/s390x/ccw-device.c @@ -11,6 +11,7 @@ #include "qemu/osdep.h" #include "ccw-device.h" +#include "hw/qdev-properties.h" #include "qemu/module.h" static void ccw_device_refill_ids(CcwDevice *dev) diff --git a/hw/s390x/css-bridge.c b/hw/s390x/css-bridge.c index 4e9ff48..15a8ed9 100644 --- a/hw/s390x/css-bridge.c +++ b/hw/s390x/css-bridge.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/hotplug.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "qemu/bitops.h" #include "qemu/module.h" diff --git a/hw/s390x/css.c b/hw/s390x/css.c index b92395f..844caab 100644 --- a/hw/s390x/css.c +++ b/hw/s390x/css.c @@ -12,12 +12,12 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qapi/visitor.h" -#include "hw/qdev.h" #include "qemu/bitops.h" #include "qemu/error-report.h" #include "exec/address-spaces.h" #include "cpu.h" #include "hw/s390x/ioinst.h" +#include "hw/qdev-properties.h" #include "hw/s390x/css.h" #include "trace.h" #include "hw/s390x/s390_flic.h" diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index 2e5ce11..304063c 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -20,6 +20,7 @@ #include "cpu.h" #include "elf.h" #include "hw/loader.h" +#include "hw/qdev-properties.h" #include "hw/boards.h" #include "hw/s390x/virtio-ccw.h" #include "hw/s390x/vfio-ccw.h" diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h index b3a07a1..d481310 100644 --- a/hw/s390x/ipl.h +++ b/hw/s390x/ipl.h @@ -12,8 +12,8 @@ #ifndef HW_S390_IPL_H #define HW_S390_IPL_H -#include "hw/qdev.h" #include "cpu.h" +#include "hw/qdev-core.h" struct IplBlockCcw { uint8_t reserved0[85]; diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index 2c6e084..963a41c 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -18,6 +18,7 @@ #include "s390-pci-bus.h" #include "s390-pci-inst.h" #include "hw/pci/pci_bus.h" +#include "hw/qdev-properties.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/msi.h" #include "qemu/error-report.h" diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 4ffdd53..a543b64 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -38,6 +38,7 @@ #include "migration/register.h" #include "cpu_models.h" #include "hw/nmi.h" +#include "hw/qdev-properties.h" #include "hw/s390x/tod.h" S390CPU *s390_cpu_addr2state(uint16_t cpu_addr) diff --git a/hw/s390x/sclpquiesce.c b/hw/s390x/sclpquiesce.c index 6dfb087..f56273c 100644 --- a/hw/s390x/sclpquiesce.c +++ b/hw/s390x/sclpquiesce.c @@ -13,7 +13,6 @@ */ #include "qemu/osdep.h" -#include "hw/qdev.h" #include "sysemu/sysemu.h" #include "hw/s390x/sclp.h" #include "migration/vmstate.h" diff --git a/hw/s390x/vhost-vsock-ccw.c b/hw/s390x/vhost-vsock-ccw.c index 076f733..1835812 100644 --- a/hw/s390x/vhost-vsock-ccw.c +++ b/hw/s390x/vhost-vsock-ccw.c @@ -7,6 +7,7 @@ */ #include "qemu/osdep.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-9p.c b/hw/s390x/virtio-ccw-9p.c index 67b2c53..5453a96 100644 --- a/hw/s390x/virtio-ccw-9p.c +++ b/hw/s390x/virtio-ccw-9p.c @@ -10,6 +10,7 @@ */ #include "qemu/osdep.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-balloon.c b/hw/s390x/virtio-ccw-balloon.c index 35e43e8..7088612 100644 --- a/hw/s390x/virtio-ccw-balloon.c +++ b/hw/s390x/virtio-ccw-balloon.c @@ -10,6 +10,7 @@ */ #include "qemu/osdep.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-blk.c b/hw/s390x/virtio-ccw-blk.c index 83636cb..1512af8 100644 --- a/hw/s390x/virtio-ccw-blk.c +++ b/hw/s390x/virtio-ccw-blk.c @@ -10,6 +10,7 @@ */ #include "qemu/osdep.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-crypto.c b/hw/s390x/virtio-ccw-crypto.c index 4569fe0..086b397 100644 --- a/hw/s390x/virtio-ccw-crypto.c +++ b/hw/s390x/virtio-ccw-crypto.c @@ -9,6 +9,7 @@ */ #include "qemu/osdep.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-gpu.c b/hw/s390x/virtio-ccw-gpu.c index 10ee4b8..be46ca7 100644 --- a/hw/s390x/virtio-ccw-gpu.c +++ b/hw/s390x/virtio-ccw-gpu.c @@ -9,6 +9,7 @@ */ #include "qemu/osdep.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-input.c b/hw/s390x/virtio-ccw-input.c index 075bb09..370b776 100644 --- a/hw/s390x/virtio-ccw-input.c +++ b/hw/s390x/virtio-ccw-input.c @@ -9,6 +9,7 @@ */ #include "qemu/osdep.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-net.c b/hw/s390x/virtio-ccw-net.c index 8ff1842..12c03d7 100644 --- a/hw/s390x/virtio-ccw-net.c +++ b/hw/s390x/virtio-ccw-net.c @@ -10,6 +10,7 @@ */ #include "qemu/osdep.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-rng.c b/hw/s390x/virtio-ccw-rng.c index dc60f08..854254d 100644 --- a/hw/s390x/virtio-ccw-rng.c +++ b/hw/s390x/virtio-ccw-rng.c @@ -10,6 +10,7 @@ */ #include "qemu/osdep.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-scsi.c b/hw/s390x/virtio-ccw-scsi.c index 26fa086..4662288 100644 --- a/hw/s390x/virtio-ccw-scsi.c +++ b/hw/s390x/virtio-ccw-scsi.c @@ -10,6 +10,7 @@ */ #include "qemu/osdep.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-serial.c b/hw/s390x/virtio-ccw-serial.c index 8cf5a52..eafb7d5 100644 --- a/hw/s390x/virtio-ccw-serial.c +++ b/hw/s390x/virtio-ccw-serial.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "hw/virtio/virtio.h" #include "qemu/module.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio-serial.h" #include "virtio-ccw.h" |