migration: fix exec/fd migrations

Commit:

commit 36c2f8be2c4eb0003ac77a14910842b7ddd7337e
Author: Juan Quintela <[email protected]>
Date:   Wed Mar 7 08:40:52 2018 +0100

    migration: Delay start of migration main routines

Missed tcp and fd transports.  This fix its.

Reported-by: Kevin Wolf <[email protected]>
Signed-off-by: Juan Quintela <[email protected]>
Tested-by: Kevin Wolf <[email protected]>
Message-Id: <20180523091411[email protected]>
Signed-off-by: Juan Quintela <[email protected]>

diff --git a/migration/exec.c b/migration/exec.c
index 9d0f82f1f074fc0c4cf6e201fbfdf281805fad2e..0bbeb63c97e548c4d1fa541dac37c57c34df6493 100644 (file)
--- a/migration/exec.c
+++ b/migration/exec.c
@@ -20,6 +20,7 @@
 #include "qemu/osdep.h"
 #include "channel.h"
 #include "exec.h"
+#include "migration.h"
 #include "io/channel-command.h"
 #include "trace.h"
 
@@ -48,6 +49,9 @@ static gboolean exec_accept_incoming_migration(QIOChannel *ioc,
 {
     migration_channel_process_incoming(ioc);
     object_unref(OBJECT(ioc));
+    if (!migrate_use_multifd()) {
+        migration_incoming_process();
+    }
     return G_SOURCE_REMOVE;
 }
 

diff --git a/migration/fd.c b/migration/fd.c
index 9a380bbbc4f146bb6992d0e8f2978eb71fbe7d8d..fee34ffdc0a3ccba08d0d280852d556e17594d29 100644 (file)
--- a/migration/fd.c
+++ b/migration/fd.c
@@ -17,6 +17,7 @@
 #include "qemu/osdep.h"
 #include "channel.h"
 #include "fd.h"
+#include "migration.h"
 #include "monitor/monitor.h"
 #include "io/channel-util.h"
 #include "trace.h"
@@ -48,6 +49,9 @@ static gboolean fd_accept_incoming_migration(QIOChannel *ioc,
 {
     migration_channel_process_incoming(ioc);
     object_unref(OBJECT(ioc));
+    if (!migrate_use_multifd()) {
+        migration_incoming_process();
+    }
     return G_SOURCE_REMOVE;
 }