diff options
| author | Peter Xu <peterx@redhat.com> | 2018-06-27 21:22:46 +0800 |
|---|---|---|
| committer | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2018-07-10 12:48:53 +0100 |
| commit | a429e7f4887313370ed2d0d3607b7e6bdcfb0e1b (patch) | |
| tree | a12f56f4d054d7a2d1677a39099137f863d6c170 /migration/exec.c | |
| parent | 884835fa1e38066e2596224375bb35ac6686be4d (diff) | |
| download | focaccia-qemu-a429e7f4887313370ed2d0d3607b7e6bdcfb0e1b.tar.gz focaccia-qemu-a429e7f4887313370ed2d0d3607b7e6bdcfb0e1b.zip | |
migration: unify incoming processing
This is the 2nd patch to unbreak postcopy recovery.
Let's unify the migration_incoming_process() call at a single place
rather than calling it in connection setup codes. This fixes a problem
that we will go into incoming migration procedure even if we are trying
to recovery from a paused postcopy migration.
Fixes: 36c2f8be2c ("migration: Delay start of migration main routines")
Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <20180627132246.5576-5-peterx@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Diffstat (limited to 'migration/exec.c')
| -rw-r--r-- | migration/exec.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/migration/exec.c b/migration/exec.c index 0bbeb63c97..375d2e1b54 100644 --- a/migration/exec.c +++ b/migration/exec.c @@ -49,9 +49,6 @@ 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; } |