summary refs log tree commit diff stats
path: root/migration/exec.c
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2018-05-23 11:14:11 +0200
committerJuan Quintela <quintela@redhat.com>2018-05-25 15:29:47 +0200
commit0efc91423a77ba6dc4a2f6d96a1ae1f5d3d958a8 (patch)
tree3aa13f76b50207b9a9a699b68b55200008a67a14 /migration/exec.c
parent5a5c383b1373aeb6c87a0d6060f6c3dc7c53082b (diff)
downloadfocaccia-qemu-0efc91423a77ba6dc4a2f6d96a1ae1f5d3d958a8.tar.gz
focaccia-qemu-0efc91423a77ba6dc4a2f6d96a1ae1f5d3d958a8.zip
migration: fix exec/fd migrations
Commit:

commit 36c2f8be2c4eb0003ac77a14910842b7ddd7337e
Author: Juan Quintela <quintela@redhat.com>
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 <kwolf@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Tested-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20180523091411.1073-1-quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Diffstat (limited to 'migration/exec.c')
-rw-r--r--migration/exec.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/migration/exec.c b/migration/exec.c
index 9d0f82f1f0..0bbeb63c97 100644
--- 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;
 }