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/i386/intel_iommu.c | 1 + hw/i386/kvm/clock.c | 1 + hw/i386/kvm/ioapic.c | 1 + hw/i386/pc_q35.c | 1 + hw/i386/pc_sysfw.c | 1 + hw/i386/vmmouse.c | 2 +- hw/i386/vmport.c | 1 - hw/i386/x86-iommu.c | 1 + hw/i386/xen/xen_pvdevice.c | 1 + 9 files changed, 8 insertions(+), 2 deletions(-) (limited to 'hw/i386') diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 50fe5cc1a9..75ca6f9c70 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -28,6 +28,7 @@ #include "intel_iommu_internal.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h" +#include "hw/qdev-properties.h" #include "hw/i386/pc.h" #include "hw/i386/apic-msidef.h" #include "hw/boards.h" diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c index d98cf9d5d1..d6a5325f0b 100644 --- a/hw/i386/kvm/clock.c +++ b/hw/i386/kvm/clock.c @@ -24,6 +24,7 @@ #include "migration/vmstate.h" #include "hw/sysbus.h" #include "hw/kvm/clock.h" +#include "hw/qdev-properties.h" #include "qapi/error.h" #include diff --git a/hw/i386/kvm/ioapic.c b/hw/i386/kvm/ioapic.c index 99ef530967..f94729c565 100644 --- a/hw/i386/kvm/ioapic.c +++ b/hw/i386/kvm/ioapic.c @@ -14,6 +14,7 @@ #include "monitor/monitor.h" #include "hw/i386/pc.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/i386/ioapic_internal.h" #include "hw/i386/apic_internal.h" #include "sysemu/kvm.h" diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 060b47f845..8777c9618b 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -40,6 +40,7 @@ #include "kvm_i386.h" #include "hw/kvm/clock.h" #include "hw/pci-host/q35.h" +#include "hw/qdev-properties.h" #include "exec/address-spaces.h" #include "hw/i386/pc.h" #include "hw/i386/ich9.h" diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c index defea37fe4..235928452b 100644 --- a/hw/i386/pc_sysfw.c +++ b/hw/i386/pc_sysfw.c @@ -34,6 +34,7 @@ #include "hw/i386/pc.h" #include "hw/boards.h" #include "hw/loader.h" +#include "hw/qdev-properties.h" #include "sysemu/sysemu.h" #include "hw/block/flash.h" #include "sysemu/kvm.h" diff --git a/hw/i386/vmmouse.c b/hw/i386/vmmouse.c index 4f81504577..012ab90396 100644 --- a/hw/i386/vmmouse.c +++ b/hw/i386/vmmouse.c @@ -26,7 +26,7 @@ #include "ui/console.h" #include "hw/i386/pc.h" #include "hw/input/i8042.h" -#include "hw/qdev.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" /* debug only vmmouse */ diff --git a/hw/i386/vmport.c b/hw/i386/vmport.c index 26fcbe3827..1f31e27c8a 100644 --- a/hw/i386/vmport.c +++ b/hw/i386/vmport.c @@ -26,7 +26,6 @@ #include "hw/i386/pc.h" #include "hw/input/i8042.h" #include "sysemu/hw_accel.h" -#include "hw/qdev.h" #include "qemu/log.h" #include "trace.h" diff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c index d1534c1ae0..1eaf2dd1bc 100644 --- a/hw/i386/x86-iommu.c +++ b/hw/i386/x86-iommu.c @@ -21,6 +21,7 @@ #include "hw/sysbus.h" #include "hw/boards.h" #include "hw/i386/x86-iommu.h" +#include "hw/qdev-properties.h" #include "hw/i386/pc.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/hw/i386/xen/xen_pvdevice.c b/hw/i386/xen/xen_pvdevice.c index 10c89cda41..27f646da06 100644 --- a/hw/i386/xen/xen_pvdevice.c +++ b/hw/i386/xen/xen_pvdevice.c @@ -33,6 +33,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "trace.h" -- cgit v1.2.3