migration: Move migration.h to migration/

Nothing uses it outside of migration.h

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>

diff --git a/include/migration/migration.h b/include/migration/migration.h
deleted file mode 100644 (file)
index 601e4ab..0000000
--- a/include/migration/migration.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * QEMU live migration
- *
- * Copyright IBM, Corp. 2008
- *
- * Authors:
- *  Anthony Liguori   <aliguori@us.ibm.com>
- *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
- * the COPYING file in the top-level directory.
- *
- */
-
-#ifndef QEMU_MIGRATION_H
-#define QEMU_MIGRATION_H
-
-#include "qapi/qmp/qdict.h"
-#include "qemu-common.h"
-#include "qemu/thread.h"
-#include "qemu/notify.h"
-#include "qapi-types.h"
-#include "exec/cpu-common.h"
-#include "qemu/coroutine_int.h"
-
-/* State for the incoming migration */
-struct MigrationIncomingState {
-    QEMUFile *from_src_file;
-
-    /*
-     * Free at the start of the main state load, set as the main thread finishes
-     * loading state.
-     */
-    QemuEvent main_thread_load_event;
-
-    size_t         largest_page_size;
-    bool           have_fault_thread;
-    QemuThread     fault_thread;
-    QemuSemaphore  fault_thread_sem;
-
-    bool           have_listen_thread;
-    QemuThread     listen_thread;
-    QemuSemaphore  listen_thread_sem;
-
-    /* For the kernel to send us notifications */
-    int       userfault_fd;
-    /* To tell the fault_thread to quit */
-    int       userfault_quit_fd;
-    QEMUFile *to_src_file;
-    QemuMutex rp_mutex;    /* We send replies from multiple threads */
-    void     *postcopy_tmp_page;
-    void     *postcopy_tmp_zero_page;
-
-    QEMUBH *bh;
-
-    int state;
-
-    bool have_colo_incoming_thread;
-    QemuThread colo_incoming_thread;
-    /* The coroutine we should enter (back) after failover */
-    Coroutine *migration_incoming_co;
-    QemuSemaphore colo_incoming_sem;
-};
-
-MigrationIncomingState *migration_incoming_get_current(void);
-void migration_incoming_state_destroy(void);
-
-struct MigrationState
-{
-    size_t bytes_xfer;
-    size_t xfer_limit;
-    QemuThread thread;
-    QEMUBH *cleanup_bh;
-    QEMUFile *to_dst_file;
-
-    /* params from 'migrate-set-parameters' */
-    MigrationParameters parameters;
-
-    int state;
-
-    /* State related to return path */
-    struct {
-        QEMUFile     *from_dst_file;
-        QemuThread    rp_thread;
-        bool          error;
-    } rp_state;
-
-    double mbps;
-    int64_t total_time;
-    int64_t downtime;
-    int64_t expected_downtime;
-    bool enabled_capabilities[MIGRATION_CAPABILITY__MAX];
-    int64_t xbzrle_cache_size;
-    int64_t setup_time;
-
-    /* Flag set once the migration has been asked to enter postcopy */
-    bool start_postcopy;
-    /* Flag set after postcopy has sent the device state */
-    bool postcopy_after_devices;
-
-    /* Flag set once the migration thread is running (and needs joining) */
-    bool migration_thread_running;
-
-    /* Flag set once the migration thread called bdrv_inactivate_all */
-    bool block_inactive;
-
-    /* The semaphore is used to notify COLO thread that failover is finished */
-    QemuSemaphore colo_exit_sem;
-
-    /* The semaphore is used to notify COLO thread to do checkpoint */
-    QemuSemaphore colo_checkpoint_sem;
-    int64_t colo_checkpoint_time;
-    QEMUTimer *colo_delay_timer;
-
-    /* The last error that occurred */
-    Error *error;
-    /* Do we have to clean up -b/-i from old migrate parameters */
-    /* This feature is deprecated and will be removed */
-    bool must_remove_block_options;
-};
-
-void migrate_set_state(int *state, int old_state, int new_state);
-
-void migration_fd_process_incoming(QEMUFile *f);
-
-uint64_t migrate_max_downtime(void);
-
-void migrate_fd_error(MigrationState *s, const Error *error);
-
-void migrate_fd_connect(MigrationState *s);
-
-MigrationState *migrate_init(void);
-bool migration_is_blocked(Error **errp);
-/* True if outgoing migration has entered postcopy phase */
-bool migration_in_postcopy(void);
-MigrationState *migrate_get_current(void);
-
-bool migrate_release_ram(void);
-bool migrate_postcopy_ram(void);
-bool migrate_zero_blocks(void);
-
-bool migrate_auto_converge(void);
-
-int migrate_use_xbzrle(void);
-int64_t migrate_xbzrle_cache_size(void);
-bool migrate_colo_enabled(void);
-
-bool migrate_use_block(void);
-bool migrate_use_block_incremental(void);
-
-bool migrate_use_compression(void);
-int migrate_compress_level(void);
-int migrate_compress_threads(void);
-int migrate_decompress_threads(void);
-bool migrate_use_events(void);
-
-/* Sending on the return path - generic and then for each message type */
-void migrate_send_rp_shut(MigrationIncomingState *mis,
-                          uint32_t value);
-void migrate_send_rp_pong(MigrationIncomingState *mis,
-                          uint32_t value);
-void migrate_send_rp_req_pages(MigrationIncomingState *mis, const char* rbname,
-                              ram_addr_t start, size_t len);
-
-#endif

diff --git a/migration/block.c b/migration/block.c
index 223ecaa20fe0aeed935e5dfbacb72be1721488b1..ae06975199870ff1a1f52a213ab1a7f0b0d3e776 100644 (file)
--- a/migration/block.c
+++ b/migration/block.c
@@ -25,7 +25,7 @@
 #include "qemu/timer.h"
 #include "block.h"
 #include "migration/misc.h"
-#include "migration/migration.h"
+#include "migration.h"
 #include "migration/register.h"
 #include "sysemu/blockdev.h"
 #include "qemu-file.h"

diff --git a/migration/channel.c b/migration/channel.c
index 92f6f996a534dd901591cb872e2decd9d11810fc..3b7252f5a2ef644e99c99999aea73bafb736f518 100644 (file)
--- a/migration/channel.c
+++ b/migration/channel.c
@@ -13,7 +13,7 @@
 #include "qemu/osdep.h"
 #include "channel.h"
 #include "tls.h"
-#include "migration/migration.h"
+#include "migration.h"
 #include "qemu-file-channel.h"
 #include "trace.h"
 #include "qapi/error.h"

diff --git a/migration/colo-comm.c b/migration/colo-comm.c
index 8bfdf6825a065abae513ac33525433542bd64ac9..b61aa19a3837011eba28915ed1209ab3c9c72f8d 100644 (file)
--- a/migration/colo-comm.c
+++ b/migration/colo-comm.c
@@ -12,7 +12,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "migration/migration.h"
+#include "migration.h"
 #include "migration/colo.h"
 #include "migration/vmstate.h"
 #include "trace.h"

diff --git a/migration/colo.c b/migration/colo.c
index 111b715546828696c0d6108d6f4f59c3930bcddf..45e9b46289475f57ddb35aa508dd436d6a8e36aa 100644 (file)
--- a/migration/colo.c
+++ b/migration/colo.c
@@ -14,7 +14,7 @@
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
 #include "qemu-file-channel.h"
-#include "migration/migration.h"
+#include "migration.h"
 #include "qemu-file.h"
 #include "savevm.h"
 #include "migration/colo.h"

diff --git a/migration/exec.c b/migration/exec.c
index fc78eeba69fc64a3bbc897e74997419493158e7e..b1de44543ad91cbfbad424ba0700a64239b641b7 100644 (file)
--- a/migration/exec.c
+++ b/migration/exec.c
@@ -22,7 +22,7 @@
 #include "qemu-common.h"
 #include "channel.h"
 #include "exec.h"
-#include "migration/migration.h"
+#include "migration.h"
 #include "io/channel-command.h"
 #include "trace.h"
 

diff --git a/migration/fd.c b/migration/fd.c
index 8a04dcd38c101fea78169a047a26567a7035b66c..b2384bf133804b870536d84e68fc1e616edf2e38 100644 (file)
--- a/migration/fd.c
+++ b/migration/fd.c
@@ -19,7 +19,7 @@
 #include "qemu-common.h"
 #include "channel.h"
 #include "fd.h"
-#include "migration/migration.h"
+#include "migration.h"
 #include "monitor/monitor.h"
 #include "io/channel-util.h"
 #include "trace.h"

diff --git a/migration/migration.c b/migration/migration.c
index e824c5f8eef84b59189a7cf51eff15ced6e0bdc7..8ef6d6c4120b5998b2999b2ab9c2c68b1eb4e5ed 100644 (file)
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -25,7 +25,7 @@
 #include "ram.h"
 #include "migration/global_state.h"
 #include "migration/misc.h"
-#include "migration/migration.h"
+#include "migration.h"
 #include "savevm.h"
 #include "qemu-file-channel.h"
 #include "qemu-file.h"

diff --git a/migration/migration.h b/migration/migration.h
new file mode 100644 (file)
index 0000000..601e4ab
--- /dev/null
+++ b/migration/migration.h
@@ -0,0 +1,164 @@
+/*
+ * QEMU live migration
+ *
+ * Copyright IBM, Corp. 2008
+ *
+ * Authors:
+ *  Anthony Liguori   <aliguori@us.ibm.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2.  See
+ * the COPYING file in the top-level directory.
+ *
+ */
+
+#ifndef QEMU_MIGRATION_H
+#define QEMU_MIGRATION_H
+
+#include "qapi/qmp/qdict.h"
+#include "qemu-common.h"
+#include "qemu/thread.h"
+#include "qemu/notify.h"
+#include "qapi-types.h"
+#include "exec/cpu-common.h"
+#include "qemu/coroutine_int.h"
+
+/* State for the incoming migration */
+struct MigrationIncomingState {
+    QEMUFile *from_src_file;
+
+    /*
+     * Free at the start of the main state load, set as the main thread finishes
+     * loading state.
+     */
+    QemuEvent main_thread_load_event;
+
+    size_t         largest_page_size;
+    bool           have_fault_thread;
+    QemuThread     fault_thread;
+    QemuSemaphore  fault_thread_sem;
+
+    bool           have_listen_thread;
+    QemuThread     listen_thread;
+    QemuSemaphore  listen_thread_sem;
+
+    /* For the kernel to send us notifications */
+    int       userfault_fd;
+    /* To tell the fault_thread to quit */
+    int       userfault_quit_fd;
+    QEMUFile *to_src_file;
+    QemuMutex rp_mutex;    /* We send replies from multiple threads */
+    void     *postcopy_tmp_page;
+    void     *postcopy_tmp_zero_page;
+
+    QEMUBH *bh;
+
+    int state;
+
+    bool have_colo_incoming_thread;
+    QemuThread colo_incoming_thread;
+    /* The coroutine we should enter (back) after failover */
+    Coroutine *migration_incoming_co;
+    QemuSemaphore colo_incoming_sem;
+};
+
+MigrationIncomingState *migration_incoming_get_current(void);
+void migration_incoming_state_destroy(void);
+
+struct MigrationState
+{
+    size_t bytes_xfer;
+    size_t xfer_limit;
+    QemuThread thread;
+    QEMUBH *cleanup_bh;
+    QEMUFile *to_dst_file;
+
+    /* params from 'migrate-set-parameters' */
+    MigrationParameters parameters;
+
+    int state;
+
+    /* State related to return path */
+    struct {
+        QEMUFile     *from_dst_file;
+        QemuThread    rp_thread;
+        bool          error;
+    } rp_state;
+
+    double mbps;
+    int64_t total_time;
+    int64_t downtime;
+    int64_t expected_downtime;
+    bool enabled_capabilities[MIGRATION_CAPABILITY__MAX];
+    int64_t xbzrle_cache_size;
+    int64_t setup_time;
+
+    /* Flag set once the migration has been asked to enter postcopy */
+    bool start_postcopy;
+    /* Flag set after postcopy has sent the device state */
+    bool postcopy_after_devices;
+
+    /* Flag set once the migration thread is running (and needs joining) */
+    bool migration_thread_running;
+
+    /* Flag set once the migration thread called bdrv_inactivate_all */
+    bool block_inactive;
+
+    /* The semaphore is used to notify COLO thread that failover is finished */
+    QemuSemaphore colo_exit_sem;
+
+    /* The semaphore is used to notify COLO thread to do checkpoint */
+    QemuSemaphore colo_checkpoint_sem;
+    int64_t colo_checkpoint_time;
+    QEMUTimer *colo_delay_timer;
+
+    /* The last error that occurred */
+    Error *error;
+    /* Do we have to clean up -b/-i from old migrate parameters */
+    /* This feature is deprecated and will be removed */
+    bool must_remove_block_options;
+};
+
+void migrate_set_state(int *state, int old_state, int new_state);
+
+void migration_fd_process_incoming(QEMUFile *f);
+
+uint64_t migrate_max_downtime(void);
+
+void migrate_fd_error(MigrationState *s, const Error *error);
+
+void migrate_fd_connect(MigrationState *s);
+
+MigrationState *migrate_init(void);
+bool migration_is_blocked(Error **errp);
+/* True if outgoing migration has entered postcopy phase */
+bool migration_in_postcopy(void);
+MigrationState *migrate_get_current(void);
+
+bool migrate_release_ram(void);
+bool migrate_postcopy_ram(void);
+bool migrate_zero_blocks(void);
+
+bool migrate_auto_converge(void);
+
+int migrate_use_xbzrle(void);
+int64_t migrate_xbzrle_cache_size(void);
+bool migrate_colo_enabled(void);
+
+bool migrate_use_block(void);
+bool migrate_use_block_incremental(void);
+
+bool migrate_use_compression(void);
+int migrate_compress_level(void);
+int migrate_compress_threads(void);
+int migrate_decompress_threads(void);
+bool migrate_use_events(void);
+
+/* Sending on the return path - generic and then for each message type */
+void migrate_send_rp_shut(MigrationIncomingState *mis,
+                          uint32_t value);
+void migrate_send_rp_pong(MigrationIncomingState *mis,
+                          uint32_t value);
+void migrate_send_rp_req_pages(MigrationIncomingState *mis, const char* rbname,
+                              ram_addr_t start, size_t len);
+
+#endif

diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
index 9c4188724ebb246522eace6968f2a167972d2520..c8c4500cc468d163970978b4f4de6c1b6e43ef7d 100644 (file)
--- a/migration/postcopy-ram.c
+++ b/migration/postcopy-ram.c
@@ -20,7 +20,7 @@
 
 #include "qemu-common.h"
 #include "exec/target_page.h"
-#include "migration/migration.h"
+#include "migration.h"
 #include "qemu-file.h"
 #include "savevm.h"
 #include "postcopy-ram.h"

diff --git a/migration/qemu-file.c b/migration/qemu-file.c
index ab26f4eea9cc630594d9620bf491f552220f1991..e65c373341b47369b92fa00afe1b6fbfc1aebbff 100644 (file)
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -28,7 +28,7 @@
 #include "qemu/iov.h"
 #include "qemu/sockets.h"
 #include "qemu/coroutine.h"
-#include "migration/migration.h"
+#include "migration.h"
 #include "qemu-file.h"
 #include "trace.h"
 

diff --git a/migration/ram.c b/migration/ram.c
index d8b6713c4ad99199a516c53eefded6a3f04e5d75..c1b4f4abf36fc1dc5ad49a1c4c1aa5c5e9cc2b25 100644 (file)
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -37,7 +37,7 @@
 #include "qemu/main-loop.h"
 #include "xbzrle.h"
 #include "ram.h"
-#include "migration/migration.h"
+#include "migration.h"
 #include "migration/register.h"
 #include "migration/misc.h"
 #include "qemu-file.h"

diff --git a/migration/rdma.c b/migration/rdma.c
index e446c6fd6abe4ab58959666a1cb119e67798e655..c6bc607a03b2d9ed38b3943d7c43299f9909a1b4 100644 (file)
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -18,7 +18,7 @@
 #include "qemu-common.h"
 #include "qemu/cutils.h"
 #include "rdma.h"
-#include "migration/migration.h"
+#include "migration.h"
 #include "qemu-file.h"
 #include "ram.h"
 #include "qemu-file-channel.h"

diff --git a/migration/savevm.c b/migration/savevm.c
index 28d00caa375c2f322d62bd06a6222807320873ce..30cda2cb469ba4bd65d656b587c4d8af28e68191 100644 (file)
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -34,7 +34,7 @@
 #include "net/net.h"
 #include "sysemu/sysemu.h"
 #include "qemu/timer.h"
-#include "migration/migration.h"
+#include "migration.h"
 #include "migration/snapshot.h"
 #include "migration/misc.h"
 #include "migration/register.h"

diff --git a/migration/socket.c b/migration/socket.c
index 50dc8d8ebca4c63a8b3798008cdfdd8e0e25d651..757d3821a1f9ec6a57c61269c6f2042e62441812 100644 (file)
--- a/migration/socket.c
+++ b/migration/socket.c
@@ -21,7 +21,7 @@
 #include "qapi/error.h"
 #include "channel.h"
 #include "socket.h"
-#include "migration/migration.h"
+#include "migration.h"
 #include "qemu-file.h"
 #include "io/channel-socket.h"
 #include "trace.h"

diff --git a/migration/tls.c b/migration/tls.c
index d3abd6e131230b9cac693d3704f9dcd9861a531c..596e8790bdf8d129426865c83a322f1cdd6946c3 100644 (file)
--- a/migration/tls.c
+++ b/migration/tls.c
@@ -20,7 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "channel.h"
-#include "migration/migration.h"
+#include "migration.h"
 #include "tls.h"
 #include "io/channel-tls.h"
 #include "crypto/tlscreds.h"

diff --git a/migration/vmstate-types.c b/migration/vmstate-types.c
index 7287c6baa6a5d4bba431f3b826ccd6731776cc16..02f05a3359f06a331cc2caeff7cf50016f3b66c2 100644 (file)
--- a/migration/vmstate-types.c
+++ b/migration/vmstate-types.c
@@ -14,7 +14,7 @@
 #include "qemu-common.h"
 #include "exec/cpu-common.h"
 #include "qemu-file.h"
-#include "migration/migration.h"
+#include "migration.h"
 #include "migration/vmstate.h"
 #include "qemu/error-report.h"
 #include "qemu/queue.h"

diff --git a/migration/vmstate.c b/migration/vmstate.c
index 377d9515f361eaf0a397690532e114b9cdb83459..3226e8eb453c9dbd89dd57bc6cc896e626f40f5b 100644 (file)
--- a/migration/vmstate.c
+++ b/migration/vmstate.c
@@ -12,7 +12,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu-common.h"
-#include "migration/migration.h"
+#include "migration.h"
 #include "migration/vmstate.h"
 #include "migration/savevm.h"
 #include "qemu-file.h"

diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c
index f30433a88a3f35acad60bf471d387c3aba6138ab..ee292c7bee8fe776e7252e3debca8bb0dad6a97f 100644 (file)
--- a/tests/test-vmstate.c
+++ b/tests/test-vmstate.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 
 #include "qemu-common.h"
-#include "migration/migration.h"
+#include "../migration/migration.h"
 #include "migration/vmstate.h"
 #include "migration/qemu-file-types.h"
 #include "../migration/qemu-file.h"