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/intc/etraxfs_pic.c | 1 - hw/intc/exynos4210_combiner.c | 1 + hw/intc/heathrow_pic.c | 1 - hw/intc/i8259.c | 1 - hw/intc/ioapic.c | 1 - hw/intc/lm32_pic.c | 1 - hw/intc/mips_gic.c | 1 - hw/intc/omap_intc.c | 1 - hw/intc/ompic.c | 1 - hw/intc/openpic.c | 1 - hw/intc/openpic_kvm.c | 1 - hw/intc/sh_intc.c | 1 - hw/intc/xics.c | 1 - hw/intc/xics_kvm.c | 1 - hw/intc/xics_spapr.c | 1 - hw/intc/xilinx_intc.c | 1 - 16 files changed, 1 insertion(+), 15 deletions(-) (limited to 'hw/intc') diff --git a/hw/intc/etraxfs_pic.c b/hw/intc/etraxfs_pic.c index dc72dd5..88d3b0c 100644 --- a/hw/intc/etraxfs_pic.c +++ b/hw/intc/etraxfs_pic.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "qemu/module.h" -#include "hw/hw.h" #include "hw/irq.h" //#include "pc.h" //#include "etraxfs.h" diff --git a/hw/intc/exynos4210_combiner.c b/hw/intc/exynos4210_combiner.c index 3b49ce4..833e164 100644 --- a/hw/intc/exynos4210_combiner.c +++ b/hw/intc/exynos4210_combiner.c @@ -33,6 +33,7 @@ #include "qemu/module.h" #include "hw/arm/exynos4210.h" +#include "hw/hw.h" #include "hw/irq.h" //#define DEBUG_COMBINER diff --git a/hw/intc/heathrow_pic.c b/hw/intc/heathrow_pic.c index 572e911..cb97c31 100644 --- a/hw/intc/heathrow_pic.c +++ b/hw/intc/heathrow_pic.c @@ -24,7 +24,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/ppc/mac.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/intc/i8259.c b/hw/intc/i8259.c index e581e6b..211a989 100644 --- a/hw/intc/i8259.c +++ b/hw/intc/i8259.c @@ -23,7 +23,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/i386/pc.h" #include "hw/irq.h" #include "hw/isa/isa.h" diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c index e99c37c..c346f50 100644 --- a/hw/intc/ioapic.c +++ b/hw/intc/ioapic.c @@ -23,7 +23,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "monitor/monitor.h" -#include "hw/hw.h" #include "hw/i386/pc.h" #include "hw/i386/apic.h" #include "hw/i386/ioapic.h" diff --git a/hw/intc/lm32_pic.c b/hw/intc/lm32_pic.c index 4df4eef..36de670 100644 --- a/hw/intc/lm32_pic.c +++ b/hw/intc/lm32_pic.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" -#include "hw/hw.h" #include "migration/vmstate.h" #include "monitor/monitor.h" #include "qemu/module.h" diff --git a/hw/intc/mips_gic.c b/hw/intc/mips_gic.c index 166eb6e..6b4322b 100644 --- a/hw/intc/mips_gic.c +++ b/hw/intc/mips_gic.c @@ -13,7 +13,6 @@ #include "qemu/log.h" #include "qemu/module.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/sysbus.h" #include "exec/memory.h" #include "sysemu/sysemu.h" diff --git a/hw/intc/omap_intc.c b/hw/intc/omap_intc.c index 4b3ddc0..f740578 100644 --- a/hw/intc/omap_intc.c +++ b/hw/intc/omap_intc.c @@ -19,7 +19,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/arm/omap.h" #include "hw/sysbus.h" diff --git a/hw/intc/ompic.c b/hw/intc/ompic.c index 77591f8..8a4a422 100644 --- a/hw/intc/ompic.c +++ b/hw/intc/ompic.c @@ -10,7 +10,6 @@ #include "qemu/log.h" #include "qemu/module.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/intc/openpic.c b/hw/intc/openpic.c index bb869ca..312ac54 100644 --- a/hw/intc/openpic.c +++ b/hw/intc/openpic.c @@ -35,7 +35,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/ppc/mac.h" #include "hw/pci/pci.h" diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c index 49fc6fa..e91910b 100644 --- a/hw/intc/openpic_kvm.c +++ b/hw/intc/openpic_kvm.c @@ -27,7 +27,6 @@ #include "cpu.h" #include #include "exec/address-spaces.h" -#include "hw/hw.h" #include "hw/ppc/openpic.h" #include "hw/ppc/openpic_kvm.h" #include "hw/pci/msi.h" diff --git a/hw/intc/sh_intc.c b/hw/intc/sh_intc.c index 6252150..72a55e3 100644 --- a/hw/intc/sh_intc.c +++ b/hw/intc/sh_intc.c @@ -11,7 +11,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "hw/sh4/sh_intc.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/sh4/sh.h" diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 41da9b3..88709d4 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -28,7 +28,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "cpu.h" -#include "hw/hw.h" #include "trace.h" #include "qemu/timer.h" #include "hw/ppc/xics.h" diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c index 65c35f9..a4d2e87 100644 --- a/hw/intc/xics_kvm.c +++ b/hw/intc/xics_kvm.c @@ -29,7 +29,6 @@ #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" -#include "hw/hw.h" #include "trace.h" #include "sysemu/kvm.h" #include "hw/ppc/spapr.h" diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c index 7cd3c93..6577be0 100644 --- a/hw/intc/xics_spapr.c +++ b/hw/intc/xics_spapr.c @@ -27,7 +27,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "hw/hw.h" #include "trace.h" #include "qemu/timer.h" #include "hw/ppc/spapr.h" diff --git a/hw/intc/xilinx_intc.c b/hw/intc/xilinx_intc.c index baf5353..3a5c7f8 100644 --- a/hw/intc/xilinx_intc.c +++ b/hw/intc/xilinx_intc.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "qemu/module.h" -#include "hw/hw.h" #include "hw/irq.h" #define D(x) -- cgit v1.1