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 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/dma/i8257.c | 1 - hw/dma/pl080.c | 1 + hw/dma/puv3_dma.c | 1 - hw/dma/rc4030.c | 1 - hw/dma/sparc32_dma.c | 1 - hw/dma/xilinx_axidma.c | 1 + 6 files changed, 2 insertions(+), 4 deletions(-) (limited to 'hw/dma') diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c index b7404cff60..c626bd958a 100644 --- a/hw/dma/i8257.c +++ b/hw/dma/i8257.c @@ -23,7 +23,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/isa/isa.h" #include "migration/vmstate.h" #include "hw/dma/i8257.h" diff --git a/hw/dma/pl080.c b/hw/dma/pl080.c index 59bc929363..3713d5dadd 100644 --- a/hw/dma/pl080.c +++ b/hw/dma/pl080.c @@ -14,6 +14,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/dma/pl080.h" +#include "hw/hw.h" #include "hw/irq.h" #include "qapi/error.h" diff --git a/hw/dma/puv3_dma.c b/hw/dma/puv3_dma.c index 122f87aff1..5488d388a9 100644 --- a/hw/dma/puv3_dma.c +++ b/hw/dma/puv3_dma.c @@ -10,7 +10,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/sysbus.h" #undef DEBUG_PUV3 diff --git a/hw/dma/rc4030.c b/hw/dma/rc4030.c index d35fb59eee..d54e296d3a 100644 --- a/hw/dma/rc4030.c +++ b/hw/dma/rc4030.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/mips/mips.h" #include "hw/sysbus.h" diff --git a/hw/dma/sparc32_dma.c b/hw/dma/sparc32_dma.c index 8955fe262e..16d53b92dd 100644 --- a/hw/dma/sparc32_dma.c +++ b/hw/dma/sparc32_dma.c @@ -26,7 +26,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/sparc/sparc32_dma.h" #include "hw/sparc/sun4m_iommu.h" diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c index 83b52e4ac7..2c2d567a95 100644 --- a/hw/dma/xilinx_axidma.c +++ b/hw/dma/xilinx_axidma.c @@ -26,6 +26,7 @@ #include "hw/sysbus.h" #include "qapi/error.h" #include "qemu/timer.h" +#include "hw/hw.h" #include "hw/irq.h" #include "hw/ptimer.h" #include "qemu/log.h" -- cgit v1.2.3-55-g7522