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/block/dataplane/xen-block.c | 1 - hw/block/ecc.c | 1 - hw/block/fdc.c | 1 - hw/block/m25p80.c | 1 - hw/block/nvme.c | 1 - hw/block/pflash_cfi01.c | 1 - hw/block/pflash_cfi02.c | 1 - hw/block/tc58128.c | 1 - hw/block/xen-block.c | 1 - 9 files changed, 9 deletions(-) (limited to 'hw/block') diff --git a/hw/block/dataplane/xen-block.c b/hw/block/dataplane/xen-block.c index 0f200c5fb0..71c63330ac 100644 --- a/hw/block/dataplane/xen-block.c +++ b/hw/block/dataplane/xen-block.c @@ -21,7 +21,6 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/xen/xen_common.h" #include "hw/block/xen_blkif.h" #include "sysemu/block-backend.h" diff --git a/hw/block/ecc.c b/hw/block/ecc.c index f846ab3e01..1a182367ee 100644 --- a/hw/block/ecc.c +++ b/hw/block/ecc.c @@ -12,7 +12,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "migration/vmstate.h" #include "hw/block/flash.h" diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 88feb0f451..7542c8f273 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -28,7 +28,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/block/fdc.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 9d395169b2..c213e2ed7b 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -23,7 +23,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/hw.h" #include "sysemu/block-backend.h" #include "hw/ssi/ssi.h" #include "migration/vmstate.h" diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 079a8ffe80..e08853fe5e 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -28,7 +28,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "hw/block/block.h" -#include "hw/hw.h" #include "hw/pci/msix.h" #include "hw/pci/pci.h" #include "migration/vmstate.h" diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index 2d6f260491..7bfe9de2a3 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -37,7 +37,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/block/block.h" #include "hw/block/flash.h" #include "sysemu/block-backend.h" diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index b7070cd8ec..18ea50f4ba 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -33,7 +33,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/block/block.h" #include "hw/block/flash.h" #include "qapi/error.h" diff --git a/hw/block/tc58128.c b/hw/block/tc58128.c index d0fae248dc..9888f01ac6 100644 --- a/hw/block/tc58128.c +++ b/hw/block/tc58128.c @@ -1,6 +1,5 @@ #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/hw.h" #include "hw/sh4/sh.h" #include "hw/loader.h" #include "sysemu/qtest.h" diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c index 69d73196e2..848a0ad0ea 100644 --- a/hw/block/xen-block.c +++ b/hw/block/xen-block.c @@ -17,7 +17,6 @@ #include "qapi/visitor.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" -#include "hw/hw.h" #include "hw/xen/xen_common.h" #include "hw/block/xen_blkif.h" #include "hw/xen/xen-block.h" -- cgit v1.2.3