migration: Be sure all recv channels are created

We need them before we start migration.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/migration/migration.c b/migration/migration.c
index 4a7959c111790efeea022a20e68217ec027f0e6a..8e5b421b97fb02b7a34e4d289e033c0d7d8ba396 100644 (file)
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -462,7 +462,11 @@ void migration_ioc_process_incoming(QIOChannel *ioc)
  */
 bool migration_has_all_channels(void)
 {
-    return true;
+    bool all_channels;
+
+    all_channels = multifd_recv_all_channels_created();
+
+    return all_channels;
 }
 
 /*

diff --git a/migration/ram.c b/migration/ram.c
index 1aa661e6ab691d5588c9ecefabe3430c34f4147e..d5335c10b6e74dac40534fb413944f1e5d22449e 100644 (file)
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -671,6 +671,17 @@ int multifd_load_setup(void)
     return 0;
 }
 
+bool multifd_recv_all_channels_created(void)
+{
+    int thread_count = migrate_multifd_channels();
+
+    if (!migrate_use_multifd()) {
+        return true;
+    }
+
+    return thread_count == atomic_read(&multifd_recv_state->count);
+}
+
 void multifd_recv_new_channel(QIOChannel *ioc)
 {
     /* nothing to do yet */

diff --git a/migration/ram.h b/migration/ram.h
index 06dbddc2a230b1c51a92dd80dacde931a192386a..3f4b7daee8fa05f7e6a738b14b339b11f3268c11 100644 (file)
--- a/migration/ram.h
+++ b/migration/ram.h
@@ -45,6 +45,7 @@ int multifd_save_setup(void);
 int multifd_save_cleanup(Error **errp);
 int multifd_load_setup(void);
 int multifd_load_cleanup(Error **errp);
+bool multifd_recv_all_channels_created(void);
 void multifd_recv_new_channel(QIOChannel *ioc);
 
 uint64_t ram_pagesize_summary(void);