+2 -2

arch_init.c

··· 39 39 #include "hw/pci/pci.h" 40 40 #include "hw/audiodev.h" 41 41 #include "kvm.h" 42 42 - #include "migration.h" 42 42 + #include "migration/migration.h" 43 43 #include "exec/gdbstub.h" 44 44 #include "hw/smbios.h" 45 45 #include "exec/address-spaces.h" 46 46 #include "hw/pcspk.h" 47 47 - #include "qemu/page_cache.h" 47 47 + #include "migration/page_cache.h" 48 48 #include "qemu-config.h" 49 49 #include "qmp-commands.h" 50 50 #include "trace.h"

+2 -2

block-migration.c

··· 18 18 #include "hw/hw.h" 19 19 #include "qemu-queue.h" 20 20 #include "qemu-timer.h" 21 21 - #include "block-migration.h" 22 22 - #include "migration.h" 21 21 + #include "migration/block.h" 22 22 + #include "migration/migration.h" 23 23 #include "blockdev.h" 24 24 #include <assert.h> 25 25

block-migration.h include/migration/block.h

+1 -1

block/qcow.c

··· 26 26 #include "module.h" 27 27 #include <zlib.h> 28 28 #include "block/aes.h" 29 29 - #include "migration.h" 29 29 + #include "migration/migration.h" 30 30 31 31 /**************************************************************/ 32 32 /* QEMU COW block driver with compression and encryption support */

+1 -1

block/qed.c

··· 16 16 #include "trace.h" 17 17 #include "qed.h" 18 18 #include "qapi/qmp/qerror.h" 19 19 - #include "migration.h" 19 19 + #include "migration/migration.h" 20 20 21 21 static void qed_aio_cancel(BlockDriverAIOCB *blockacb) 22 22 {

+1 -1

block/vdi.c

··· 52 52 #include "qemu-common.h" 53 53 #include "block/block_int.h" 54 54 #include "module.h" 55 55 - #include "migration.h" 55 55 + #include "migration/migration.h" 56 56 57 57 #if defined(CONFIG_UUID) 58 58 #include <uuid/uuid.h>

+1 -1

block/vmdk.c

··· 26 26 #include "qemu-common.h" 27 27 #include "block/block_int.h" 28 28 #include "module.h" 29 29 - #include "migration.h" 29 29 + #include "migration/migration.h" 30 30 #include <zlib.h> 31 31 32 32 #define VMDK3_MAGIC (('C' << 24) | ('O' << 16) | ('W' << 8) | 'D')

+1 -1

block/vpc.c

··· 25 25 #include "qemu-common.h" 26 26 #include "block/block_int.h" 27 27 #include "module.h" 28 28 - #include "migration.h" 28 28 + #include "migration/migration.h" 29 29 #if defined(CONFIG_UUID) 30 30 #include <uuid/uuid.h> 31 31 #endif

+1 -1

block/vvfat.c

··· 27 27 #include "qemu-common.h" 28 28 #include "block/block_int.h" 29 29 #include "module.h" 30 30 - #include "migration.h" 30 30 + #include "migration/migration.h" 31 31 32 32 #ifndef S_IWGRP 33 33 #define S_IWGRP 0

+1 -1

buffered_file.h

··· 15 15 #define QEMU_BUFFERED_FILE_H 16 16 17 17 #include "hw/hw.h" 18 18 - #include "migration.h" 18 18 + #include "migration/migration.h" 19 19 20 20 QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state); 21 21

+1 -1

hw/9pfs/virtio-9p.c

··· 20 20 #include "virtio-9p-xattr.h" 21 21 #include "virtio-9p-coth.h" 22 22 #include "trace.h" 23 23 - #include "migration.h" 23 23 + #include "migration/migration.h" 24 24 25 25 int open_fd_hw; 26 26 int total_open_fd;

+1 -1

hw/hid.h

··· 1 1 #ifndef QEMU_HID_H 2 2 #define QEMU_HID_H 3 3 4 4 - #include "vmstate.h" 4 4 + #include "migration/vmstate.h" 5 5 6 6 #define HID_MOUSE 1 7 7 #define HID_TABLET 2

+2 -2

hw/hw.h

··· 11 11 #include "exec/ioport.h" 12 12 #include "irq.h" 13 13 #include "block/aio.h" 14 14 - #include "qemu-file.h" 15 15 - #include "vmstate.h" 14 14 + #include "migration/qemu-file.h" 15 15 + #include "migration/vmstate.h" 16 16 #include "qemu-log.h" 17 17 18 18 #ifdef NEED_CPU_H

+1 -1

hw/ivshmem.c

··· 21 21 #include "pci/pci.h" 22 22 #include "pci/msix.h" 23 23 #include "kvm.h" 24 24 - #include "migration.h" 24 24 + #include "migration/migration.h" 25 25 #include "qapi/qmp/qerror.h" 26 26 #include "event_notifier.h" 27 27 #include "qemu-char.h"

+1 -1

hw/pci/shpc.h

··· 3 3 4 4 #include "qemu-common.h" 5 5 #include "exec/memory.h" 6 6 - #include "vmstate.h" 6 6 + #include "migration/vmstate.h" 7 7 8 8 struct SHPCDevice { 9 9 /* Capability offset in device's config space */

+1 -1

hw/ptimer.h

··· 10 10 11 11 #include "qemu-common.h" 12 12 #include "qemu-timer.h" 13 13 - #include "vmstate.h" 13 13 + #include "migration/vmstate.h" 14 14 15 15 /* ptimer.c */ 16 16 typedef struct ptimer_state ptimer_state;

+1 -1

include/net/net.h

··· 6 6 #include "qapi/qmp/qdict.h" 7 7 #include "qemu-option.h" 8 8 #include "net/queue.h" 9 9 - #include "vmstate.h" 9 9 + #include "migration/vmstate.h" 10 10 #include "qapi-types.h" 11 11 12 12 struct MACAddr {

include/qemu/page_cache.h include/migration/page_cache.h

+1 -1

migration-exec.c

··· 17 17 18 18 #include "qemu-common.h" 19 19 #include "qemu_socket.h" 20 20 - #include "migration.h" 20 20 + #include "migration/migration.h" 21 21 #include "buffered_file.h" 22 22 #include "block/block.h" 23 23 #include <sys/types.h>

+1 -1

migration-fd.c

··· 15 15 16 16 #include "qemu-common.h" 17 17 #include "qemu_socket.h" 18 18 - #include "migration.h" 18 18 + #include "migration/migration.h" 19 19 #include "monitor/monitor.h" 20 20 #include "buffered_file.h" 21 21 #include "block/block.h"

+1 -1

migration-tcp.c

··· 15 15 16 16 #include "qemu-common.h" 17 17 #include "qemu_socket.h" 18 18 - #include "migration.h" 18 18 + #include "migration/migration.h" 19 19 #include "buffered_file.h" 20 20 #include "block/block.h" 21 21

+1 -1

migration-unix.c

··· 15 15 16 16 #include "qemu-common.h" 17 17 #include "qemu_socket.h" 18 18 - #include "migration.h" 18 18 + #include "migration/migration.h" 19 19 #include "buffered_file.h" 20 20 #include "block/block.h" 21 21

+2 -2

migration.c

··· 14 14 */ 15 15 16 16 #include "qemu-common.h" 17 17 - #include "migration.h" 17 17 + #include "migration/migration.h" 18 18 #include "monitor/monitor.h" 19 19 #include "buffered_file.h" 20 20 #include "sysemu.h" 21 21 #include "block/block.h" 22 22 #include "qemu_socket.h" 23 23 - #include "block-migration.h" 23 23 + #include "migration/block.h" 24 24 #include "qmp-commands.h" 25 25 26 26 //#define DEBUG_MIGRATION

+1 -1

migration.h include/migration/migration.h

··· 18 18 #include "qemu-common.h" 19 19 #include "notify.h" 20 20 #include "qapi/error.h" 21 21 - #include "vmstate.h" 21 21 + #include "migration/vmstate.h" 22 22 #include "qapi-types.h" 23 23 24 24 struct MigrationParams {

+1 -1

monitor.c

··· 44 44 #include "disas/disas.h" 45 45 #include "balloon.h" 46 46 #include "qemu-timer.h" 47 47 - #include "migration.h" 47 47 + #include "migration/migration.h" 48 48 #include "kvm.h" 49 49 #include "acl.h" 50 50 #include "qapi/qmp/qint.h"

+1 -1

page_cache.c

··· 24 24 #include <strings.h> 25 25 26 26 #include "qemu-common.h" 27 27 - #include "qemu/page_cache.h" 27 27 + #include "migration/page_cache.h" 28 28 29 29 #ifdef DEBUG_CACHE 30 30 #define DPRINTF(fmt, ...) \

qemu-file.h include/migration/qemu-file.h

+1 -1

qemu-tool.c

··· 17 17 #include "monitor/monitor.h" 18 18 #include "qemu-timer.h" 19 19 #include "qemu-log.h" 20 20 - #include "migration.h" 20 20 + #include "migration/migration.h" 21 21 #include "main-loop.h" 22 22 #include "sysemu.h" 23 23 #include "qemu_socket.h"

+1 -1

savevm.c

··· 77 77 #include "sysemu.h" 78 78 #include "qemu-timer.h" 79 79 #include "audio/audio.h" 80 80 - #include "migration.h" 80 80 + #include "migration/migration.h" 81 81 #include "qemu_socket.h" 82 82 #include "qemu-queue.h" 83 83 #include "qemu-timer.h"

+1 -1

ui/spice-core.c

··· 34 34 #include "qapi/qmp/qstring.h" 35 35 #include "qapi/qmp/qjson.h" 36 36 #include "notify.h" 37 37 - #include "migration.h" 37 37 + #include "migration/migration.h" 38 38 #include "monitor/monitor.h" 39 39 #include "hw/hw.h" 40 40 #include "ui/spice-display.h"

+2 -2

vl.c

··· 138 138 #include "cache-utils.h" 139 139 #include "blockdev.h" 140 140 #include "hw/block-common.h" 141 141 - #include "block-migration.h" 141 141 + #include "migration/block.h" 142 142 #include "dma.h" 143 143 #include "audio/audio.h" 144 144 - #include "migration.h" 144 144 + #include "migration/migration.h" 145 145 #include "kvm.h" 146 146 #include "qapi/qmp/qjson.h" 147 147 #include "qemu-option.h"

vmstate.h include/migration/vmstate.h