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/sd | |
| 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/sd')
| -rw-r--r-- | hw/sd/milkymist-memcard.c | 1 | ||||
| -rw-r--r-- | hw/sd/pxa2xx_mmci.c | 1 | ||||
| -rw-r--r-- | hw/sd/sd.c | 1 | ||||
| -rw-r--r-- | hw/sd/sdhci-pci.c | 1 | ||||
| -rw-r--r-- | hw/sd/sdhci.c | 1 | ||||
| -rw-r--r-- | hw/sd/ssi-sd.c | 1 |
6 files changed, 4 insertions, 2 deletions
diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c index e3c7cf5..79a9a5c 100644 --- a/hw/sd/milkymist-memcard.c +++ b/hw/sd/milkymist-memcard.c @@ -31,6 +31,7 @@ #include "qapi/error.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" +#include "hw/qdev-properties.h" #include "hw/sd/sd.h" enum { diff --git a/hw/sd/pxa2xx_mmci.c b/hw/sd/pxa2xx_mmci.c index db2f2ad..8f9ab0e 100644 --- a/hw/sd/pxa2xx_mmci.c +++ b/hw/sd/pxa2xx_mmci.c @@ -17,7 +17,6 @@ #include "migration/vmstate.h" #include "hw/arm/pxa.h" #include "hw/sd/sd.h" -#include "hw/qdev.h" #include "hw/qdev-properties.h" #include "qemu/error-report.h" #include "qemu/log.h" @@ -32,7 +32,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/qdev.h" #include "hw/irq.h" #include "hw/registerfields.h" #include "sysemu/block-backend.h" diff --git a/hw/sd/sdhci-pci.c b/hw/sd/sdhci-pci.c index 438cb30..2c8d8f5 100644 --- a/hw/sd/sdhci-pci.c +++ b/hw/sd/sdhci-pci.c @@ -18,6 +18,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/module.h" +#include "hw/qdev-properties.h" #include "hw/sd/sdhci.h" #include "sdhci-internal.h" diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 1adc16e..e08ec3e 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -27,6 +27,7 @@ #include "qemu/error-report.h" #include "qapi/error.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "sysemu/dma.h" #include "qemu/timer.h" #include "qemu/bitops.h" diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c index 571aabe..91db069 100644 --- a/hw/sd/ssi-sd.c +++ b/hw/sd/ssi-sd.c @@ -14,6 +14,7 @@ #include "sysemu/blockdev.h" #include "hw/ssi/ssi.h" #include "migration/vmstate.h" +#include "hw/qdev-properties.h" #include "hw/sd/sd.h" #include "qapi/error.h" #include "qemu/module.h" |