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/sd/milkymist-memcard.c | 1 - hw/sd/omap_mmc.c | 1 - hw/sd/pxa2xx_mmci.c | 1 - hw/sd/sd.c | 1 - hw/sd/sdhci-pci.c | 1 - hw/sd/sdhci.c | 1 - 6 files changed, 6 deletions(-) (limited to 'hw/sd') diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c index dcb7169..e3c7cf5 100644 --- a/hw/sd/milkymist-memcard.c +++ b/hw/sd/milkymist-memcard.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "qemu/module.h" -#include "hw/hw.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "sysemu/sysemu.h" diff --git a/hw/sd/omap_mmc.c b/hw/sd/omap_mmc.c index 15a0bbe..c6e516b 100644 --- a/hw/sd/omap_mmc.c +++ b/hw/sd/omap_mmc.c @@ -21,7 +21,6 @@ #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/arm/omap.h" #include "hw/sd/sd.h" diff --git a/hw/sd/pxa2xx_mmci.c b/hw/sd/pxa2xx_mmci.c index 020cd54..db2f2ad 100644 --- a/hw/sd/pxa2xx_mmci.c +++ b/hw/sd/pxa2xx_mmci.c @@ -12,7 +12,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 0292432..3f26b38 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -33,7 +33,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "hw/qdev.h" -#include "hw/hw.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 9370181..438cb30 100644 --- a/hw/sd/sdhci-pci.c +++ b/hw/sd/sdhci-pci.c @@ -18,7 +18,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/module.h" -#include "hw/hw.h" #include "hw/sd/sdhci.h" #include "sdhci-internal.h" diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index f9db39c..1adc16e 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -26,7 +26,6 @@ #include "qemu/units.h" #include "qemu/error-report.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/irq.h" #include "sysemu/dma.h" #include "qemu/timer.h" -- cgit v1.1