From a27bd6c779badb8d76e4430d810ef710a1b98f4e Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 12 Aug 2019 07:23:51 +0200 Subject: Include hw/qdev-properties.h less MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Cc: "Daniel P. Berrangé" Cc: Eduardo Habkost Signed-off-by: Markus Armbruster Reviewed-by: Eduardo Habkost Message-Id: <20190812052359.30071-22-armbru@redhat.com> --- hw/input/adb.c | 1 + hw/input/milkymist-softusb.c | 1 + hw/input/vhost-user-input.c | 1 - hw/input/virtio-input-hid.c | 2 +- hw/input/virtio-input-host.c | 2 +- hw/input/virtio-input.c | 2 +- 6 files changed, 5 insertions(+), 4 deletions(-) (limited to 'hw/input') diff --git a/hw/input/adb.c b/hw/input/adb.c index 80ba125..478a90f 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 8f6fdf2..67fcb35 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 6da497b..544452a 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 f15a063..386a363 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 a54c31e..1c3b12b 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 diff --git a/hw/input/virtio-input.c b/hw/input/virtio-input.c index 9946394..51617a5 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" -- cgit v1.1