diff options
| author | Juan Quintela | 2018-05-23 11:14:11 +0200 |
|---|---|---|
| committer | Juan Quintela | 2018-05-25 15:29:47 +0200 |
| commit | 0efc91423a77ba6dc4a2f6d96a1ae1f5d3d958a8 (patch) | |
| tree | 3aa13f76b50207b9a9a699b68b55200008a67a14 /migration | |
| parent | Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-2.13-pull-r... (diff) | |
| download | qemu-0efc91423a77ba6dc4a2f6d96a1ae1f5d3d958a8.tar.gz qemu-0efc91423a77ba6dc4a2f6d96a1ae1f5d3d958a8.tar.xz 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')
| -rw-r--r-- | migration/exec.c | 4 | ||||
| -rw-r--r-- | migration/fd.c | 4 |
2 files changed, 8 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; } diff --git a/migration/fd.c b/migration/fd.c index 9a380bbbc4..fee34ffdc0 100644 --- 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; } |