diff options
| author | Zhang Chen <chen.zhang@intel.com> | 2019-03-03 22:50:17 +0800 |
|---|---|---|
| committer | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2019-03-06 10:49:18 +0000 |
| commit | db00972922c875ce354a102c94699fe40612c90d (patch) | |
| tree | 3a7c52f44b053338b5b900e17ca69537dda7fdd5 | |
| parent | b8b5734b092baf3c53f3f117595704ffe9469a75 (diff) | |
Migration/colo.c: Make COLO node running after failover
Delay to close COLO for auto start VM after failover.
Signed-off-by: Zhang Chen <chen.zhang@intel.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20190303145021.2962-4-chen.zhang@intel.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
| -rw-r--r-- | migration/colo.c | 1 | ||||
| -rw-r--r-- | migration/migration.c | 3 |
2 files changed, 3 insertions, 1 deletions
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 952d29243e..df6fd8e0e5 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -417,6 +417,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()); } |