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/arm/boot.c | 1 - hw/arm/collie.c | 1 - hw/arm/gumstix.c | 1 - hw/arm/integratorcp.c | 1 + hw/arm/mainstone.c | 1 - hw/arm/musicpal.c | 1 + hw/arm/omap2.c | 1 - hw/arm/omap_sx1.c | 1 - hw/arm/palm.c | 1 - hw/arm/pxa2xx_pic.c | 1 - hw/arm/spitz.c | 1 - hw/arm/tosa.c | 1 - hw/arm/virt-acpi-build.c | 1 - hw/arm/z2.c | 1 - 14 files changed, 2 insertions(+), 12 deletions(-) (limited to 'hw/arm') diff --git a/hw/arm/boot.c b/hw/arm/boot.c index d082daf..8563672 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -12,7 +12,6 @@ #include "qemu/error-report.h" #include "qapi/error.h" #include -#include "hw/hw.h" #include "hw/arm/boot.h" #include "hw/arm/linux-boot-if.h" #include "sysemu/kvm.h" diff --git a/hw/arm/collie.c b/hw/arm/collie.c index 3db3c56..219643c 100644 --- a/hw/arm/collie.c +++ b/hw/arm/collie.c @@ -10,7 +10,6 @@ */ #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/hw.h" #include "hw/sysbus.h" #include "hw/boards.h" #include "strongarm.h" diff --git a/hw/arm/gumstix.c b/hw/arm/gumstix.c index 343cbfd..f26a0e8 100644 --- a/hw/arm/gumstix.c +++ b/hw/arm/gumstix.c @@ -36,7 +36,6 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" -#include "hw/hw.h" #include "hw/arm/pxa.h" #include "net/net.h" #include "hw/block/flash.h" diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index f8fbe40..ecccb41 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -21,6 +21,7 @@ #include "sysemu/sysemu.h" #include "qemu/error-report.h" #include "hw/char/pl011.h" +#include "hw/hw.h" #include "hw/irq.h" #define TYPE_INTEGRATOR_CM "integrator_core" diff --git a/hw/arm/mainstone.c b/hw/arm/mainstone.c index cd1f904..1bad1ae 100644 --- a/hw/arm/mainstone.c +++ b/hw/arm/mainstone.c @@ -14,7 +14,6 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/arm/pxa.h" #include "hw/arm/boot.h" #include "net/net.h" diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index 72e522a..a3cfdc3 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -19,6 +19,7 @@ #include "sysemu/sysemu.h" #include "hw/boards.h" #include "hw/char/serial.h" +#include "hw/hw.h" #include "qemu/timer.h" #include "hw/ptimer.h" #include "hw/block/flash.h" diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c index 397630e..af5e3d0 100644 --- a/hw/arm/omap2.c +++ b/hw/arm/omap2.c @@ -25,7 +25,6 @@ #include "sysemu/qtest.h" #include "sysemu/reset.h" #include "hw/boards.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/arm/boot.h" #include "hw/arm/omap.h" diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c index cae78d0..75a05c3 100644 --- a/hw/arm/omap_sx1.c +++ b/hw/arm/omap_sx1.c @@ -27,7 +27,6 @@ */ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/hw.h" #include "ui/console.h" #include "hw/arm/omap.h" #include "hw/boards.h" diff --git a/hw/arm/palm.c b/hw/arm/palm.c index a5eccb7..bea47b9 100644 --- a/hw/arm/palm.c +++ b/hw/arm/palm.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/hw.h" #include "audio/audio.h" #include "sysemu/sysemu.h" #include "sysemu/qtest.h" diff --git a/hw/arm/pxa2xx_pic.c b/hw/arm/pxa2xx_pic.c index c8bd497..203d4d2 100644 --- a/hw/arm/pxa2xx_pic.c +++ b/hw/arm/pxa2xx_pic.c @@ -11,7 +11,6 @@ #include "qemu/osdep.h" #include "qemu/module.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/arm/pxa.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c index 003929b..2eabb9c 100644 --- a/hw/arm/spitz.c +++ b/hw/arm/spitz.c @@ -12,7 +12,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/arm/pxa.h" #include "hw/arm/boot.h" #include "sysemu/sysemu.h" diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c index 80c61ae..7f136bf 100644 --- a/hw/arm/tosa.c +++ b/hw/arm/tosa.c @@ -13,7 +13,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/arm/pxa.h" #include "hw/arm/boot.h" #include "hw/arm/sharpsl.h" diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 4f85eb5..fa9afd2 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -36,7 +36,6 @@ #include "hw/acpi/acpi.h" #include "hw/nvram/fw_cfg.h" #include "hw/acpi/bios-linker-loader.h" -#include "hw/hw.h" #include "hw/acpi/aml-build.h" #include "hw/acpi/utils.h" #include "hw/acpi/pci.h" diff --git a/hw/arm/z2.c b/hw/arm/z2.c index 810922d..1e3db42 100644 --- a/hw/arm/z2.c +++ b/hw/arm/z2.c @@ -12,7 +12,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/arm/pxa.h" #include "hw/arm/boot.h" #include "hw/i2c/i2c.h" -- cgit v1.1