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/scsi/lsi53c895a.c | 1 - hw/scsi/megasas.c | 1 - hw/scsi/mptconfig.c | 1 - hw/scsi/mptendian.c | 1 - hw/scsi/mptsas.c | 1 - hw/scsi/scsi-bus.c | 1 - hw/scsi/spapr_vscsi.c | 1 - 7 files changed, 7 deletions(-) (limited to 'hw/scsi') diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c index 175eb79260..222a286d44 100644 --- a/hw/scsi/lsi53c895a.c +++ b/hw/scsi/lsi53c895a.c @@ -15,7 +15,6 @@ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/pci/pci.h" #include "hw/scsi/scsi.h" diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index 970b10048f..3706294a85 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "qemu-common.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "sysemu/dma.h" #include "sysemu/block-backend.h" diff --git a/hw/scsi/mptconfig.c b/hw/scsi/mptconfig.c index 87a416a5cb..3b2a857b5c 100644 --- a/hw/scsi/mptconfig.c +++ b/hw/scsi/mptconfig.c @@ -16,7 +16,6 @@ * Lesser General Public License for more details. */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "hw/scsi/scsi.h" diff --git a/hw/scsi/mptendian.c b/hw/scsi/mptendian.c index 79f99734d2..313f40edf9 100644 --- a/hw/scsi/mptendian.c +++ b/hw/scsi/mptendian.c @@ -21,7 +21,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "sysemu/dma.h" #include "hw/pci/msi.h" diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c index 79501777d4..b32f4c0ca9 100644 --- a/hw/scsi/mptsas.c +++ b/hw/scsi/mptsas.c @@ -23,7 +23,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "sysemu/dma.h" #include "hw/pci/msi.h" diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 42928a6aec..1f9914739a 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -1,5 +1,4 @@ #include "qemu/osdep.h" -#include "hw/hw.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/hw/scsi/spapr_vscsi.c b/hw/scsi/spapr_vscsi.c index 5290f7569a..fedeec676d 100644 --- a/hw/scsi/spapr_vscsi.c +++ b/hw/scsi/spapr_vscsi.c @@ -35,7 +35,6 @@ #include "qemu/osdep.h" #include "qemu/module.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/scsi/scsi.h" #include "migration/vmstate.h" #include "scsi/constants.h" -- cgit v1.2.3