From 62c1e0ca739008aaec6d3a18456f479bed61713b Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Mon, 19 Feb 2018 18:59:02 +0100 Subject: [PATCH] migration: Be sure all recv channels are created MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We need them before we start migration. Signed-off-by: Juan Quintela Reviewed-by: Daniel P. Berrangé --- migration/migration.c | 6 +++++- migration/ram.c | 11 +++++++++++ migration/ram.h | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/migration/migration.c b/migration/migration.c index 4a7959c111..8e5b421b97 100644 --- 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 1aa661e6ab..d5335c10b6 100644 --- 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 06dbddc2a2..3f4b7daee8 100644 --- 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);