[Qemu-devel] [RFC PATCH 05/10] migration: inform the block layer of incoming live status

["Benoît Canet" <benoit.canet@gmail.com>]

Signed-off-by: Benoit Canet <benoit.canet@gmail.com>
---
 migration.c |    2 ++
 vl.c        |    5 +++++
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/migration.c b/migration.c
index 45af364..5ac31a3 100644
--- a/migration.c
+++ b/migration.c
@@ -76,6 +76,7 @@ int qemu_start_incoming_migration(const char *uri)
         ret = fd_start_incoming_migration(p);
 #endif
     else {
+        bdrv_clear_incoming_migration_all();
         fprintf(stderr, "unknown migration protocol: %s\n", uri);
         ret = -EPROTONOSUPPORT;
     }
@@ -91,6 +92,7 @@ void process_incoming_migration(QEMUFile *f)
     qemu_announce_self();
     DPRINTF("successfully loaded vm state\n");
 
+    bdrv_clear_incoming_migration_all();
     /* Execute post incoming migration operations :
      * for qcow2 make sure to flush mutable metadata
      **/
diff --git a/vl.c b/vl.c
index 97ab2b9..b1d3dd2 100644
--- a/vl.c
+++ b/vl.c
@@ -3389,6 +3389,11 @@ int main(int argc, char **argv, char **envp)
 
     blk_mig_init();
 
+    /* make the block layer ready for incoming live migration */
+    if (incoming) {
+        bdrv_set_incoming_migration();
+    }
+
     /* open the virtual block devices */
     if (snapshot)
         qemu_opts_foreach(qemu_find_opts("drive"), drive_enable_snapshot, NULL, 0);
-- 
1.7.7.6