From ca77ee28e03fb5052be01b9237b0a7cef5d90d4a Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 12 Aug 2019 07:23:39 +0200 Subject: Include migration/qemu-file-types.h a lot less MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In my "build everything" tree, changing migration/qemu-file-types.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 culprit is again hw/hw.h, which supposedly includes it for convenience. Include migration/qemu-file-types.h only where it's needed. Touching it now recompiles less than 200 objects. Signed-off-by: Markus Armbruster Message-Id: <20190812052359.30071-10-armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- hw/scsi/mptsas.c | 1 + hw/scsi/scsi-bus.c | 1 + hw/scsi/scsi-disk.c | 1 + hw/scsi/scsi-generic.c | 1 + hw/scsi/virtio-scsi.c | 1 + 5 files changed, 5 insertions(+) (limited to 'hw/scsi') diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c index 3f94d5ab55..6d2c15a2bc 100644 --- a/hw/scsi/mptsas.c +++ b/hw/scsi/mptsas.c @@ -34,6 +34,7 @@ #include "trace.h" #include "qapi/error.h" #include "mptsas.h" +#include "migration/qemu-file-types.h" #include "mpi.h" #define NAA_LOCALLY_ASSIGNED_ID 0x3ULL diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index fdc3a0e4e0..81fe7c3301 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -5,6 +5,7 @@ #include "qemu/module.h" #include "qemu/option.h" #include "hw/scsi/scsi.h" +#include "migration/qemu-file-types.h" #include "scsi/constants.h" #include "hw/qdev.h" #include "sysemu/block-backend.h" diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index af3e622dc5..558fa11511 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -25,6 +25,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "hw/scsi/scsi.h" +#include "migration/qemu-file-types.h" #include "hw/scsi/emulation.h" #include "scsi/constants.h" #include "sysemu/sysemu.h" diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c index c11a0c9a84..44430b6ea6 100644 --- a/hw/scsi/scsi-generic.c +++ b/hw/scsi/scsi-generic.c @@ -17,6 +17,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "hw/scsi/scsi.h" +#include "migration/qemu-file-types.h" #include "hw/scsi/emulation.h" #include "sysemu/block-backend.h" #include "trace.h" diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index 8b9e5e2b49..a6d61aacdb 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -17,6 +17,7 @@ #include "qapi/error.h" #include "standard-headers/linux/virtio_ids.h" #include "hw/virtio/virtio-scsi.h" +#include "migration/qemu-file-types.h" #include "qemu/error-report.h" #include "qemu/iov.h" #include "qemu/module.h" -- cgit v1.2.3