ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Zhang Chen 2019-03-03 22:50:17 +08:00 committed by Dr. David Alan Gilbert
parent b8b5734b09
commit db00972922
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
migration/colo.c
View File

@ -874,7 +874,6 @@ out:
qemu_fclose(mis->to_src_file); qemu_fclose(mis->to_src_file);
mis->to_src_file = NULL; mis->to_src_file = NULL;
} }
migration_incoming_disable_colo();
rcu_unregister_thread(); rcu_unregister_thread();
return NULL; return NULL;

3
migration/migration.c
View File

@ -417,6 +417,9 @@ static void process_incoming_migration_bh(void *opaque)
} else { } else {
runstate_set(RUN_STATE_PAUSED); runstate_set(RUN_STATE_PAUSED);
} }
} else if (migration_incoming_colo_enabled()) {
migration_incoming_disable_colo();
vm_start();
} else { } else {
runstate_set(global_state_get_runstate()); runstate_set(global_state_get_runstate());
} }