migration: move include files to include/migration/

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch_init.c b/arch_init.c
index 93d1e52f4a9fa02f4c1599cb65d37fb7720f331e..f627253a205818f8ab069618661f3073f05fc8ae 100644 (file)
--- a/arch_init.c
+++ b/arch_init.c
@@ -39,12 +39,12 @@
 #include "hw/pci/pci.h"
 #include "hw/audiodev.h"
 #include "kvm.h"
-#include "migration.h"
+#include "migration/migration.h"
 #include "exec/gdbstub.h"
 #include "hw/smbios.h"
 #include "exec/address-spaces.h"
 #include "hw/pcspk.h"
-#include "qemu/page_cache.h"
+#include "migration/page_cache.h"
 #include "qemu-config.h"
 #include "qmp-commands.h"
 #include "trace.h"

diff --git a/block-migration.c b/block-migration.c
index c15de9f7503f4d28d306c82b0e59075f8a9a3891..2d2dcbda946d48883cebd8fa9a6bf9b4a003c0c0 100644 (file)
--- a/block-migration.c
+++ b/block-migration.c
@@ -18,8 +18,8 @@
 #include "hw/hw.h"
 #include "qemu-queue.h"
 #include "qemu-timer.h"
-#include "block-migration.h"
-#include "migration.h"
+#include "migration/block.h"
+#include "migration/migration.h"
 #include "blockdev.h"
 #include <assert.h>
 

diff --git a/block/qcow.c b/block/qcow.c
index d13bd400f0886c8c35611c5bee1a6c5802d824d2..f36671196ef7b0f4037a7f0f1f890de9ab3cf728 100644 (file)
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -26,7 +26,7 @@
 #include "module.h"
 #include <zlib.h>
 #include "block/aes.h"
-#include "migration.h"
+#include "migration/migration.h"
 
 /**************************************************************/
 /* QEMU COW block driver with compression and encryption support */

diff --git a/block/qed.c b/block/qed.c
index ca1fafb47e80f641aff6d43b5da4d91cfc145cf6..10d08274825df931803238566b073de390bc381b 100644 (file)
--- a/block/qed.c
+++ b/block/qed.c
@@ -16,7 +16,7 @@
 #include "trace.h"
 #include "qed.h"
 #include "qapi/qmp/qerror.h"
-#include "migration.h"
+#include "migration/migration.h"
 
 static void qed_aio_cancel(BlockDriverAIOCB *blockacb)
 {

diff --git a/block/vdi.c b/block/vdi.c
index dab9cac76e26d25b6a393c5d2b92e32a36153759..b1d199a2e54779180c7d1d530363434cf9618b18 100644 (file)
--- a/block/vdi.c
+++ b/block/vdi.c
@@ -52,7 +52,7 @@
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "module.h"
-#include "migration.h"
+#include "migration/migration.h"
 
 #if defined(CONFIG_UUID)
 #include <uuid/uuid.h>

diff --git a/block/vmdk.c b/block/vmdk.c
index 68e50e1a3e692d6cf4cd4ed21bdcd92bc081ef27..77a1a67c61fb97b8a1bd9c20746d4f1545b61c1e 100644 (file)
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -26,7 +26,7 @@
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "module.h"
-#include "migration.h"
+#include "migration/migration.h"
 #include <zlib.h>
 
 #define VMDK3_MAGIC (('C' << 24) | ('O' << 16) | ('W' << 8) | 'D')

diff --git a/block/vpc.c b/block/vpc.c
index aabd71201c2ee5edd6f1cda1e984e3cebe8b3944..47b5518aee1a66ce0de951eb8c3a6ca3bbf2b84f 100644 (file)
--- a/block/vpc.c
+++ b/block/vpc.c
@@ -25,7 +25,7 @@
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "module.h"
-#include "migration.h"
+#include "migration/migration.h"
 #if defined(CONFIG_UUID)
 #include <uuid/uuid.h>
 #endif

diff --git a/block/vvfat.c b/block/vvfat.c
index fbabafca7605af609bd60eed17ef1b0a1936579f..a63c3ea7cde33b47016cc39602890afe71794cff 100644 (file)
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -27,7 +27,7 @@
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "module.h"
-#include "migration.h"
+#include "migration/migration.h"
 
 #ifndef S_IWGRP
 #define S_IWGRP 0

diff --git a/buffered_file.h b/buffered_file.h
index ef010febfee83387fbe61a544b8eb18e1a5b5972..86a707524650c2a0d06c13c0775c8429b8cac29d 100644 (file)
--- a/buffered_file.h
+++ b/buffered_file.h
@@ -15,7 +15,7 @@
 #define QEMU_BUFFERED_FILE_H
 
 #include "hw/hw.h"
-#include "migration.h"
+#include "migration/migration.h"
 
 QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state);
 

diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c
index 8b9cdc96ed5ccb2360f1f646551c2715d8f1684f..ede20ce80e7fd6c3775694e67aaa32313c7f1c1f 100644 (file)
--- a/hw/9pfs/virtio-9p.c
+++ b/hw/9pfs/virtio-9p.c
@@ -20,7 +20,7 @@
 #include "virtio-9p-xattr.h"
 #include "virtio-9p-coth.h"
 #include "trace.h"
-#include "migration.h"
+#include "migration/migration.h"
 
 int open_fd_hw;
 int total_open_fd;

diff --git a/hw/hid.h b/hw/hid.h
index 5315cf7a31fa4fb2e553b02e0c935a707d48d71a..100b1216638375cbbbf716347e030127af44fdf9 100644 (file)
--- a/hw/hid.h
+++ b/hw/hid.h
@@ -1,7 +1,7 @@
 #ifndef QEMU_HID_H
 #define QEMU_HID_H
 
-#include "vmstate.h"
+#include "migration/vmstate.h"
 
 #define HID_MOUSE     1
 #define HID_TABLET    2

diff --git a/hw/hw.h b/hw/hw.h
index 7368470bb1356fe8f269771aedd5e09adf867bbb..883ddb60f9ae0b45289e4562b39ea3274db489b8 100644 (file)
--- a/hw/hw.h
+++ b/hw/hw.h
@@ -11,8 +11,8 @@
 #include "exec/ioport.h"
 #include "irq.h"
 #include "block/aio.h"
-#include "qemu-file.h"
-#include "vmstate.h"
+#include "migration/qemu-file.h"
+#include "migration/vmstate.h"
 #include "qemu-log.h"
 
 #ifdef NEED_CPU_H

diff --git a/hw/ivshmem.c b/hw/ivshmem.c
index d15760b3147b22d0d7aa1439b94c0003ff7ebf12..d5b91dd24ecc331c449a53f666f498a68d672170 100644 (file)
--- a/hw/ivshmem.c
+++ b/hw/ivshmem.c
@@ -21,7 +21,7 @@
 #include "pci/pci.h"
 #include "pci/msix.h"
 #include "kvm.h"
-#include "migration.h"
+#include "migration/migration.h"
 #include "qapi/qmp/qerror.h"
 #include "event_notifier.h"
 #include "qemu-char.h"

diff --git a/hw/pci/shpc.h b/hw/pci/shpc.h
index 6374e68bdb04d271bae151fe9910e7670da87069..467911a558d46bfeaf8d8302cd59d3bb1e616728 100644 (file)
--- a/hw/pci/shpc.h
+++ b/hw/pci/shpc.h
@@ -3,7 +3,7 @@
 
 #include "qemu-common.h"
 #include "exec/memory.h"
-#include "vmstate.h"
+#include "migration/vmstate.h"
 
 struct SHPCDevice {
     /* Capability offset in device's config space */

diff --git a/hw/ptimer.h b/hw/ptimer.h
index 6638f613222704eff29526c6c89714172df84b1b..9d172f77641303f768d6f4b475611e4d4f6154bb 100644 (file)
--- a/hw/ptimer.h
+++ b/hw/ptimer.h
@@ -10,7 +10,7 @@
 
 #include "qemu-common.h"
 #include "qemu-timer.h"
-#include "vmstate.h"
+#include "migration/vmstate.h"
 
 /* ptimer.c */
 typedef struct ptimer_state ptimer_state;

diff --git a/block-migration.h b/include/migration/block.h
similarity index 100%
rename from block-migration.h
rename to include/migration/block.h

diff --git a/migration.h b/include/migration/migration.h
similarity index 99%
rename from migration.h
rename to include/migration/migration.h
index af444d444b8f03705b9f09790e52071bfbb013d1..a95f761e4c9db81b60bdc6dabc87137aa1dd479e 100644 (file)
--- a/migration.h
+++ b/include/migration/migration.h
@@ -18,7 +18,7 @@
 #include "qemu-common.h"
 #include "notify.h"
 #include "qapi/error.h"
-#include "vmstate.h"
+#include "migration/vmstate.h"
 #include "qapi-types.h"
 
 struct MigrationParams {

diff --git a/include/qemu/page_cache.h b/include/migration/page_cache.h
similarity index 100%
rename from include/qemu/page_cache.h
rename to include/migration/page_cache.h

diff --git a/qemu-file.h b/include/migration/qemu-file.h
similarity index 100%
rename from qemu-file.h
rename to include/migration/qemu-file.h

diff --git a/vmstate.h b/include/migration/vmstate.h
similarity index 100%
rename from vmstate.h
rename to include/migration/vmstate.h

diff --git a/include/net/net.h b/include/net/net.h
index 26dd0cf29cd3023c8a457bf7b71e0b088c8c9d31..41d3729867eb84fa1e8465e4a3da0f36f58babf8 100644 (file)
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -6,7 +6,7 @@
 #include "qapi/qmp/qdict.h"
 #include "qemu-option.h"
 #include "net/queue.h"
-#include "vmstate.h"
+#include "migration/vmstate.h"
 #include "qapi-types.h"
 
 struct MACAddr {

diff --git a/migration-exec.c b/migration-exec.c
index 3e55b7792da3368ca834c331225acbd379777ac0..784486d2fcd853f2ec140b5be5450394c3d9d7ed 100644 (file)
--- a/migration-exec.c
+++ b/migration-exec.c
@@ -17,7 +17,7 @@
 
 #include "qemu-common.h"
 #include "qemu_socket.h"
-#include "migration.h"
+#include "migration/migration.h"
 #include "buffered_file.h"
 #include "block/block.h"
 #include <sys/types.h>

diff --git a/migration-fd.c b/migration-fd.c
index 73a1dfcc937a092041d3c6b0a93b633d7f68dd9a..ab5abe2aa5659444854e3b8bef64647df219db31 100644 (file)
--- a/migration-fd.c
+++ b/migration-fd.c
@@ -15,7 +15,7 @@
 
 #include "qemu-common.h"
 #include "qemu_socket.h"
-#include "migration.h"
+#include "migration/migration.h"
 #include "monitor/monitor.h"
 #include "buffered_file.h"
 #include "block/block.h"

diff --git a/migration-tcp.c b/migration-tcp.c
index 07f51f2aef0bcffbf191f6be71c2e46f38af78e3..a36e637ffdc7a461830c48f701f0fc9d041ff342 100644 (file)
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -15,7 +15,7 @@
 
 #include "qemu-common.h"
 #include "qemu_socket.h"
-#include "migration.h"
+#include "migration/migration.h"
 #include "buffered_file.h"
 #include "block/block.h"
 

diff --git a/migration-unix.c b/migration-unix.c
index 1b9c461083535deee577afa9b09d18b37e188904..9debc952daeefd360608383754daf557f48a4b15 100644 (file)
--- a/migration-unix.c
+++ b/migration-unix.c
@@ -15,7 +15,7 @@
 
 #include "qemu-common.h"
 #include "qemu_socket.h"
-#include "migration.h"
+#include "migration/migration.h"
 #include "buffered_file.h"
 #include "block/block.h"
 

diff --git a/migration.c b/migration.c
index 27a272eace3a13e1cceb053a3ba0e9b9c0fc0813..0456983bad094aa6de9693de9e56cce8d70b95a9 100644 (file)
--- a/migration.c
+++ b/migration.c
@@ -14,13 +14,13 @@
  */
 
 #include "qemu-common.h"
-#include "migration.h"
+#include "migration/migration.h"
 #include "monitor/monitor.h"
 #include "buffered_file.h"
 #include "sysemu.h"
 #include "block/block.h"
 #include "qemu_socket.h"
-#include "block-migration.h"
+#include "migration/block.h"
 #include "qmp-commands.h"
 
 //#define DEBUG_MIGRATION

diff --git a/monitor.c b/monitor.c
index 94c6bb6672db0c55f0e9bea56b579b485057747c..46fdc008f46380b77795043f8c44a73f44f7d76a 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -44,7 +44,7 @@
 #include "disas/disas.h"
 #include "balloon.h"
 #include "qemu-timer.h"
-#include "migration.h"
+#include "migration/migration.h"
 #include "kvm.h"
 #include "acl.h"
 #include "qapi/qmp/qint.h"

diff --git a/page_cache.c b/page_cache.c
index 0294f7e9f611aeff3449eb0355595b6f556124f7..ba5640bd73120314f81f2014de5ffb8247cdb0cc 100644 (file)
--- a/page_cache.c
+++ b/page_cache.c
@@ -24,7 +24,7 @@
 #include <strings.h>
 
 #include "qemu-common.h"
-#include "qemu/page_cache.h"
+#include "migration/page_cache.h"
 
 #ifdef DEBUG_CACHE
 #define DPRINTF(fmt, ...) \

diff --git a/qemu-tool.c b/qemu-tool.c
index 40453fdd991c907fc7258f5c5facc8813f2205f0..d1f46222eea7ea5ce8cbc03cee413d6f0ed50f2a 100644 (file)
--- a/qemu-tool.c
+++ b/qemu-tool.c
@@ -17,7 +17,7 @@
 #include "monitor/monitor.h"
 #include "qemu-timer.h"
 #include "qemu-log.h"
-#include "migration.h"
+#include "migration/migration.h"
 #include "main-loop.h"
 #include "sysemu.h"
 #include "qemu_socket.h"

diff --git a/savevm.c b/savevm.c
index bf341bb25f41236be1cb0a2457b6780f17fec9a4..a5205a09c3a437f75fdab5f4ee367821f7d4182e 100644 (file)
--- a/savevm.c
+++ b/savevm.c
@@ -77,7 +77,7 @@
 #include "sysemu.h"
 #include "qemu-timer.h"
 #include "audio/audio.h"
-#include "migration.h"
+#include "migration/migration.h"
 #include "qemu_socket.h"
 #include "qemu-queue.h"
 #include "qemu-timer.h"

diff --git a/ui/spice-core.c b/ui/spice-core.c
index 379677554e17f1336249b20717d00e104846b290..962475de6b260ad8dd9fa7446df468229c28190c 100644 (file)
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -34,7 +34,7 @@
 #include "qapi/qmp/qstring.h"
 #include "qapi/qmp/qjson.h"
 #include "notify.h"
-#include "migration.h"
+#include "migration/migration.h"
 #include "monitor/monitor.h"
 #include "hw/hw.h"
 #include "ui/spice-display.h"

diff --git a/vl.c b/vl.c
index 9adaf28e64948819bdbcab8f04949c9fc78fd31a..2debde0a4ab5d4e2bdc3cdceba271b460ae7a93b 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -138,10 +138,10 @@ int main(int argc, char **argv)
 #include "cache-utils.h"
 #include "blockdev.h"
 #include "hw/block-common.h"
-#include "block-migration.h"
+#include "migration/block.h"
 #include "dma.h"
 #include "audio/audio.h"
-#include "migration.h"
+#include "migration/migration.h"
 #include "kvm.h"
 #include "qapi/qmp/qjson.h"
 #include "qemu-option.h"