From 650d103d3ea959212f826acb9d3fe80cf30e347b Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 12 Aug 2019 07:23:48 +0200 Subject: Include hw/hw.h exactly where needed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In my "build everything" tree, changing hw/hw.h triggers a recompile of some 2600 out of 6600 objects (not counting tests and objects that don't depend on qemu/osdep.h). The previous commits have left only the declaration of hw_error() in hw/hw.h. This permits dropping most of its inclusions. Touching it now recompiles less than 200 objects. Signed-off-by: Markus Armbruster Reviewed-by: Alistair Francis Message-Id: <20190812052359.30071-19-armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- hw/pci-host/bonito.c | 1 - hw/pci-host/gpex.c | 1 - hw/pci-host/piix.c | 1 - hw/pci-host/ppce500.c | 1 - hw/pci-host/prep.c | 1 - hw/pci-host/q35.c | 1 - hw/pci-host/uninorth.c | 1 - 7 files changed, 7 deletions(-) (limited to 'hw/pci-host') diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index 58870e0..30e0787 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -39,7 +39,6 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "hw/i386/pc.h" #include "hw/irq.h" diff --git a/hw/pci-host/gpex.c b/hw/pci-host/gpex.c index 1a45c30..93f28ef 100644 --- a/hw/pci-host/gpex.c +++ b/hw/pci-host/gpex.c @@ -31,7 +31,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/pci-host/gpex.h" #include "migration/vmstate.h" diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index 9e8c854..bc97260 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -23,7 +23,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/i386/pc.h" #include "hw/irq.h" #include "hw/pci/pci.h" diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c index 840869f..241e7e7 100644 --- a/hw/pci-host/ppce500.c +++ b/hw/pci-host/ppce500.c @@ -15,7 +15,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/ppc/e500-ccsr.h" #include "migration/vmstate.h" diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c index 34a3681..588c7dc 100644 --- a/hw/pci-host/prep.c +++ b/hw/pci-host/prep.c @@ -27,7 +27,6 @@ #include "qemu-common.h" #include "qemu/units.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h" #include "hw/pci/pci_host.h" diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 25335a8..1688a89 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -29,7 +29,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/pci-host/q35.h" #include "migration/vmstate.h" #include "qapi/error.h" diff --git a/hw/pci-host/uninorth.c b/hw/pci-host/uninorth.c index 4ffb2d0..76293ab 100644 --- a/hw/pci-host/uninorth.c +++ b/hw/pci-host/uninorth.c @@ -23,7 +23,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/ppc/mac.h" #include "qemu/module.h" -- cgit v1.1