From d6454270575da1f16a8923c7cb240e46ef243f72 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 12 Aug 2019 07:23:45 +0200 Subject: Include migration/vmstate.h less MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In my "build everything" tree, changing migration/vmstate.h triggers a recompile of some 2700 out of 6600 objects (not counting tests and objects that don't depend on qemu/osdep.h). hw/hw.h supposedly includes it for convenience. Several other headers include it just to get VMStateDescription. The previous commit made that unnecessary. Include migration/vmstate.h only where it's still needed. Touching it now recompiles only some 1600 objects. Signed-off-by: Markus Armbruster Reviewed-by: Alistair Francis Message-Id: <20190812052359.30071-16-armbru@redhat.com> Tested-by: Philippe Mathieu-Daudé --- hw/isa/apm.c | 1 + hw/isa/i82378.c | 1 + hw/isa/lpc_ich9.c | 1 + hw/isa/pc87312.c | 1 + hw/isa/piix4.c | 1 + hw/isa/vt82c686.c | 1 + 6 files changed, 6 insertions(+) (limited to 'hw/isa') diff --git a/hw/isa/apm.c b/hw/isa/apm.c index c3101ef52f..f22b2d78a4 100644 --- a/hw/isa/apm.c +++ b/hw/isa/apm.c @@ -24,6 +24,7 @@ #include "hw/isa/apm.h" #include "hw/hw.h" #include "hw/pci/pci.h" +#include "migration/vmstate.h" //#define DEBUG diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c index 90ebba59b7..de276cdf10 100644 --- a/hw/isa/i82378.c +++ b/hw/isa/i82378.c @@ -22,6 +22,7 @@ #include "hw/i386/pc.h" #include "hw/irq.h" #include "hw/timer/i8254.h" +#include "migration/vmstate.h" #include "hw/audio/pcspk.h" #define TYPE_I82378 "i82378" diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index 42a1232787..79d44c1b41 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -35,6 +35,7 @@ #include "qemu/range.h" #include "hw/isa/isa.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/i386/pc.h" #include "hw/irq.h" #include "hw/isa/apm.h" diff --git a/hw/isa/pc87312.c b/hw/isa/pc87312.c index 85dbc94439..60845f3ff0 100644 --- a/hw/isa/pc87312.c +++ b/hw/isa/pc87312.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/isa/pc87312.h" +#include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index 3677976ef7..8abd5daaae 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -28,6 +28,7 @@ #include "hw/pci/pci.h" #include "hw/isa/isa.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "sysemu/reset.h" PCIDevice *piix4_dev; diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 81bffb1fb9..d98b94ab05 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -18,6 +18,7 @@ #include "hw/isa/isa.h" #include "hw/isa/superio.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/mips/mips.h" #include "hw/isa/apm.h" #include "hw/acpi/acpi.h" -- cgit v1.2.3