david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

migration: fix exec/fd migrations

Browse Source 
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>
This commit is contained in:
Juan Quintela 2018-05-23 11:14:11 +02:00
parent 5a5c383b13
commit 0efc91423a
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
migration/exec.c
View File

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

4
migration/fd.c
View File

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