From: Zhang Chen <chen.zh...@intel.com> Delay to close COLO for auto start VM after failover.
Signed-off-by: Zhang Chen <chen.zh...@intel.com> Reviewed-by: Dr. David Alan Gilbert <dgilb...@redhat.com> Message-Id: <20190303145021.2962-4-chen.zh...@intel.com> Signed-off-by: Dr. David Alan Gilbert <dgilb...@redhat.com> --- migration/colo.c | 1 - migration/migration.c | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/migration/colo.c b/migration/colo.c index a916dc178c..5ba610dc01 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -874,7 +874,6 @@ out: qemu_fclose(mis->to_src_file); mis->to_src_file = NULL; } - migration_incoming_disable_colo(); rcu_unregister_thread(); return NULL; diff --git a/migration/migration.c b/migration/migration.c index 501319aa14..b6f5de198b 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -411,6 +411,9 @@ static void process_incoming_migration_bh(void *opaque) } else { runstate_set(RUN_STATE_PAUSED); } + } else if (migration_incoming_colo_enabled()) { + migration_incoming_disable_colo(); + vm_start(); } else { runstate_set(global_state_get_runstate()); } -- 2.20.1