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/ide/ahci.c | 1 + hw/ide/cmd646.c | 1 + hw/ide/isa.c | 1 + hw/ide/macio.c | 1 + hw/ide/mmio.c | 1 + hw/ide/qdev.c | 1 + 6 files changed, 6 insertions(+) (limited to 'hw/ide') diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 378c1f3..d72da85 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/pci/msi.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/error-report.h" diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index c2ee427..3fbfc5e 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "hw/isa/isa.h" diff --git a/hw/ide/isa.c b/hw/ide/isa.c index 939b473..7b6e283 100644 --- a/hw/ide/isa.c +++ b/hw/ide/isa.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/isa/isa.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "sysemu/dma.h" diff --git a/hw/ide/macio.c b/hw/ide/macio.c index 44f2ff9..79f787c 100644 --- a/hw/ide/macio.c +++ b/hw/ide/macio.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "hw/ppc/mac.h" #include "hw/ppc/mac_dbdma.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "hw/misc/macio/macio.h" diff --git a/hw/ide/mmio.c b/hw/ide/mmio.c index d2a377f..7149a9c 100644 --- a/hw/ide/mmio.c +++ b/hw/ide/mmio.c @@ -30,6 +30,7 @@ #include "sysemu/dma.h" #include "hw/ide/internal.h" +#include "hw/qdev-properties.h" /***********************************************************/ /* MMIO based ide port diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index d30bdd7..39957dd 100644 --- a/hw/ide/qdev.c +++ b/hw/ide/qdev.c @@ -25,6 +25,7 @@ #include "qemu/main-loop.h" #include "qemu/module.h" #include "hw/ide/internal.h" +#include "hw/qdev-properties.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" #include "hw/block/block.h" -- cgit v1.1