mirror of https://github.com/proxmox/mirror_qemu
migration: qemu_savevm_state_cleanup() in cleanup
Moving existing callers all into migrate_fd_cleanup(). It simplifies migration_thread() a bit. Reviewed-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Peter Xu <peterx@redhat.com> Signed-off-by: Juan Quintela <quintela@redhat.com>master
parent
0d649a0e95
commit
0ceccd858a
|
@ -1107,6 +1107,8 @@ static void migrate_fd_cleanup(void *opaque)
|
||||||
qemu_bh_delete(s->cleanup_bh);
|
qemu_bh_delete(s->cleanup_bh);
|
||||||
s->cleanup_bh = NULL;
|
s->cleanup_bh = NULL;
|
||||||
|
|
||||||
|
qemu_savevm_state_cleanup();
|
||||||
|
|
||||||
if (s->to_dst_file) {
|
if (s->to_dst_file) {
|
||||||
Error *local_err = NULL;
|
Error *local_err = NULL;
|
||||||
|
|
||||||
|
@ -2329,13 +2331,6 @@ static void *migration_thread(void *opaque)
|
||||||
end_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
|
end_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
|
||||||
|
|
||||||
qemu_mutex_lock_iothread();
|
qemu_mutex_lock_iothread();
|
||||||
/*
|
|
||||||
* The resource has been allocated by migration will be reused in COLO
|
|
||||||
* process, so don't release them.
|
|
||||||
*/
|
|
||||||
if (!enable_colo) {
|
|
||||||
qemu_savevm_state_cleanup();
|
|
||||||
}
|
|
||||||
if (s->state == MIGRATION_STATUS_COMPLETED) {
|
if (s->state == MIGRATION_STATUS_COMPLETED) {
|
||||||
uint64_t transferred_bytes = qemu_ftell(s->to_dst_file);
|
uint64_t transferred_bytes = qemu_ftell(s->to_dst_file);
|
||||||
s->total_time = end_time - s->total_time;
|
s->total_time = end_time - s->total_time;
|
||||||
|
@ -2358,7 +2353,6 @@ static void *migration_thread(void *opaque)
|
||||||
"COLO enabled", __func__);
|
"COLO enabled", __func__);
|
||||||
}
|
}
|
||||||
migrate_start_colo_process(s);
|
migrate_start_colo_process(s);
|
||||||
qemu_savevm_state_cleanup();
|
|
||||||
/*
|
/*
|
||||||
* Fixme: we will run VM in COLO no matter its old running state.
|
* Fixme: we will run VM in COLO no matter its old running state.
|
||||||
* After exited COLO, we will keep running.
|
* After exited COLO, we will keep running.
|
||||||
|
|
Loading…
Reference in New Issue