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/input | |
| parent | db725815985654007ade0fd53590d613fd657208 (diff) | |
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/input')
| -rw-r--r-- | hw/input/adb.c | 1 | ||||
| -rw-r--r-- | hw/input/milkymist-softusb.c | 1 | ||||
| -rw-r--r-- | hw/input/vhost-user-input.c | 1 | ||||
| -rw-r--r-- | hw/input/virtio-input-hid.c | 2 | ||||
| -rw-r--r-- | hw/input/virtio-input-host.c | 2 | ||||
| -rw-r--r-- | hw/input/virtio-input.c | 2 |
6 files changed, 5 insertions, 4 deletions
diff --git a/hw/input/adb.c b/hw/input/adb.c index 80ba1259bf..478a90fae2 100644 --- a/hw/input/adb.c +++ b/hw/input/adb.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/input/adb.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "adb-internal.h" diff --git a/hw/input/milkymist-softusb.c b/hw/input/milkymist-softusb.c index 8f6fdf2d97..67fcb3595f 100644 --- a/hw/input/milkymist-softusb.c +++ b/hw/input/milkymist-softusb.c @@ -29,6 +29,7 @@ #include "ui/console.h" #include "hw/input/hid.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/hw/input/vhost-user-input.c b/hw/input/vhost-user-input.c index 6da497b1a8..544452a234 100644 --- a/hw/input/vhost-user-input.c +++ b/hw/input/vhost-user-input.c @@ -9,7 +9,6 @@ #include "qapi/error.h" #include "qemu-common.h" -#include "hw/qdev.h" #include "hw/virtio/virtio-input.h" static int vhost_input_config_change(struct vhost_dev *dev) diff --git a/hw/input/virtio-input-hid.c b/hw/input/virtio-input-hid.c index f15a063fac..386a363a17 100644 --- a/hw/input/virtio-input-hid.c +++ b/hw/input/virtio-input-hid.c @@ -8,8 +8,8 @@ #include "qemu/iov.h" #include "qemu/module.h" -#include "hw/qdev.h" #include "hw/virtio/virtio.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio-input.h" #undef CONFIG_CURSES diff --git a/hw/input/virtio-input-host.c b/hw/input/virtio-input-host.c index a54c31eb09..1c3b12ba32 100644 --- a/hw/input/virtio-input-host.c +++ b/hw/input/virtio-input-host.c @@ -9,8 +9,8 @@ #include "qemu/module.h" #include "qemu/sockets.h" -#include "hw/qdev.h" #include "hw/virtio/virtio.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio-input.h" #include <sys/ioctl.h> diff --git a/hw/input/virtio-input.c b/hw/input/virtio-input.c index 9946394cf4..51617a5885 100644 --- a/hw/input/virtio-input.c +++ b/hw/input/virtio-input.c @@ -10,8 +10,8 @@ #include "qemu/module.h" #include "trace.h" -#include "hw/qdev.h" #include "hw/virtio/virtio.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio-input.h" #include "standard-headers/linux/input.h" |