summaryrefslogtreecommitdiffstats
path: root/migration/migration.c
diff options
context:
space:
mode:
authorPeter Xu2018-06-27 15:22:44 +0200
committerDr. David Alan Gilbert2018-07-10 13:48:53 +0200
commit81e620531fa842f760086964ca1b8657ae6c07ba (patch)
tree9e2422bf4269d3a9fb40bc9906b2545478dbc31b /migration/migration.c
parentmigration: delay postcopy paused state (diff)
downloadqemu-81e620531fa842f760086964ca1b8657ae6c07ba.tar.gz
qemu-81e620531fa842f760086964ca1b8657ae6c07ba.tar.xz
qemu-81e620531fa842f760086964ca1b8657ae6c07ba.zip
migration: move income process out of multifd
Move the call to migration_incoming_process() out of multifd code. It's a bit strange that we can migration generic calls in multifd code. Instead, let multifd_recv_new_channel() return a boolean showing whether it's ready to continue the incoming migration. Signed-off-by: Peter Xu <peterx@redhat.com> Message-Id: <20180627132246.5576-3-peterx@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Diffstat (limited to 'migration/migration.c')
-rw-r--r--migration/migration.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/migration/migration.c b/migration/migration.c
index 94d71f8b24..aea6fb7444 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -507,7 +507,10 @@ void migration_ioc_process_incoming(QIOChannel *ioc)
migration_incoming_setup(f);
return;
}
- multifd_recv_new_channel(ioc);
+
+ if (multifd_recv_new_channel(ioc)) {
+ migration_incoming_process();
+ }
}
/**