@@ -40,6 +40,7 @@
#include "hw/acpi/memory_hotplug.h"
#include "hw/acpi/acpi_dev_interface.h"
#include "hw/xen/xen.h"
+#include "migration/qemu-file-types.h"
#include "qom/cpu.h"
#include "trace.h"
@@ -26,6 +26,7 @@
# include <scsi/sg.h>
#endif
#include "hw/virtio/virtio-bus.h"
+#include "migration/qemu-file-types.h"
#include "hw/virtio/virtio-access.h"
/* Config size before the discard support (hide associated config fields) */
@@ -22,6 +22,7 @@
#include "qapi/error.h"
#include "qemu/iov.h"
#include "qemu/module.h"
+#include "migration/qemu-file-types.h"
#include "monitor/monitor.h"
#include "qemu/error-report.h"
#include "qemu/queue.h"
@@ -18,6 +18,7 @@
#include "trace.h"
#include "sysemu/dma.h"
#include "hw/virtio/virtio.h"
+#include "migration/qemu-file-types.h"
#include "hw/virtio/virtio-gpu.h"
#include "hw/virtio/virtio-gpu-bswap.h"
#include "hw/virtio/virtio-gpu-pixman.h"
@@ -31,6 +31,7 @@
#include "sysemu/kvm.h"
#include "hw/qdev.h"
#include "hw/sysbus.h"
+#include "migration/qemu-file-types.h"
static int apic_irq_delivered;
bool apic_report_tpr_access;
@@ -38,6 +38,7 @@
#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/nvram/eeprom93xx.h"
+#include "migration/qemu-file-types.h"
/* Debug EEPROM emulation. */
//~ #define DEBUG_EEPROM
@@ -31,6 +31,7 @@
#include "hw/boards.h"
#include "hw/nvram/fw_cfg.h"
#include "hw/sysbus.h"
+#include "migration/qemu-file-types.h"
#include "trace.h"
#include "qemu/error-report.h"
#include "qemu/option.h"
@@ -32,6 +32,7 @@
#include "qapi/error.h"
#include "qemu/range.h"
#include "hw/xen/xen.h"
+#include "migration/qemu-file-types.h"
#include "hw/pci-host/pam.h"
#include "sysemu/reset.h"
#include "sysemu/sysemu.h"
@@ -20,6 +20,7 @@
#include "hw/pci/msix.h"
#include "hw/pci/pci.h"
#include "hw/xen/xen.h"
+#include "migration/qemu-file-types.h"
#include "qemu/range.h"
#include "qapi/error.h"
#include "trace.h"
@@ -29,6 +29,7 @@
#include "hw/pci/pci_bridge.h"
#include "hw/pci/pci_bus.h"
#include "hw/pci/pci_host.h"
+#include "migration/qemu-file-types.h"
#include "monitor/monitor.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
@@ -4,6 +4,7 @@
#include "qemu/range.h"
#include "qemu/error-report.h"
#include "hw/pci/shpc.h"
+#include "migration/qemu-file-types.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_bus.h"
#include "hw/pci/msi.h"
@@ -42,6 +42,7 @@
#include "sysemu/hw_accel.h"
#include "kvm_ppc.h"
#include "migration/misc.h"
+#include "migration/qemu-file-types.h"
#include "migration/global_state.h"
#include "migration/register.h"
#include "mmu-hash64.h"
@@ -18,6 +18,7 @@
#include "qapi/qmp/qdict.h"
#include "qemu/error-report.h"
#include "sysemu/kvm.h"
+#include "migration/qemu-file-types.h"
#include "migration/register.h"
#define S390_SKEYS_BUFFER_SIZE (128 * KiB) /* Room for 128k storage keys */
@@ -14,6 +14,7 @@
#include "qemu/error-report.h"
#include "qemu/module.h"
#include "sysemu/kvm.h"
+#include "migration/qemu-file-types.h"
#include "migration/register.h"
void s390_init_tod(void)
@@ -17,6 +17,7 @@
#include "sysemu/kvm.h"
#include "net/net.h"
#include "hw/virtio/virtio.h"
+#include "migration/qemu-file-types.h"
#include "hw/virtio/virtio-net.h"
#include "hw/sysbus.h"
#include "qemu/bitops.h"
@@ -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
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -30,6 +30,7 @@
#include "qemu/timer.h"
#include "hw/timer/i8254.h"
#include "hw/timer/i8254_internal.h"
+#include "migration/qemu-file-types.h"
/* val must be 0 or 1 */
void pit_set_gate(ISADevice *dev, int channel, int val)
@@ -24,6 +24,7 @@
#include "hw/hw.h"
#include "qemu/timer.h"
#include "hw/i2c/i2c.h"
+#include "migration/qemu-file-types.h"
#include "sysemu/sysemu.h"
#include "ui/console.h"
#include "qemu/bcd.h"
@@ -41,6 +41,7 @@
#include <usbredirfilter.h>
#include "hw/usb.h"
+#include "migration/qemu-file-types.h"
/* ERROR is defined below. Remove any previous definition. */
#undef ERROR
@@ -26,6 +26,7 @@
#include "hw/virtio/virtio-bus.h"
#include "hw/virtio/virtio-access.h"
#include "migration/blocker.h"
+#include "migration/qemu-file-types.h"
#include "sysemu/dma.h"
#include "trace.h"
@@ -23,6 +23,7 @@
#include "standard-headers/linux/virtio_mmio.h"
#include "hw/sysbus.h"
#include "hw/virtio/virtio.h"
+#include "migration/qemu-file-types.h"
#include "qemu/host-utils.h"
#include "qemu/module.h"
#include "sysemu/kvm.h"
@@ -19,6 +19,7 @@
#include "standard-headers/linux/virtio_pci.h"
#include "hw/virtio/virtio.h"
+#include "migration/qemu-file-types.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_bus.h"
#include "qapi/error.h"
@@ -19,6 +19,7 @@
#include "qemu/error-report.h"
#include "qemu/module.h"
#include "hw/virtio/virtio.h"
+#include "migration/qemu-file-types.h"
#include "qemu/atomic.h"
#include "hw/virtio/virtio-bus.h"
#include "hw/virtio/virtio-access.h"
@@ -11,7 +11,6 @@
#include "exec/memory.h"
#include "hw/irq.h"
#include "migration/vmstate.h"
-#include "migration/qemu-file-types.h"
void QEMU_NORETURN hw_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
@@ -3,6 +3,7 @@
#define MIGRATION_CPU_H
#include "exec/cpu-defs.h"
+#include "migration/qemu-file-types.h"
#if TARGET_LONG_BITS == 64
#define qemu_put_betl qemu_put_be64
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 <armbru@redhat.com> --- hw/acpi/piix4.c | 1 + hw/block/virtio-blk.c | 1 + hw/char/virtio-serial-bus.c | 1 + hw/display/virtio-gpu.c | 1 + hw/intc/apic_common.c | 1 + hw/nvram/eeprom93xx.c | 1 + hw/nvram/fw_cfg.c | 1 + hw/pci-host/piix.c | 1 + hw/pci/msix.c | 1 + hw/pci/pci.c | 1 + hw/pci/shpc.c | 1 + hw/ppc/spapr.c | 1 + hw/s390x/s390-skeys.c | 1 + hw/s390x/tod.c | 1 + hw/s390x/virtio-ccw.c | 1 + 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 + hw/timer/i8254_common.c | 1 + hw/timer/twl92230.c | 1 + hw/usb/redirect.c | 1 + hw/virtio/vhost.c | 1 + hw/virtio/virtio-mmio.c | 1 + hw/virtio/virtio-pci.c | 1 + hw/virtio/virtio.c | 1 + include/hw/hw.h | 1 - include/migration/cpu.h | 1 + 29 files changed, 28 insertions(+), 1 deletion(-)