diff options
| author | Peter Xu <peterx@redhat.com> | 2018-01-03 20:20:06 +0800 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2018-01-15 12:48:06 +0100 |
| commit | 0ceccd858a8d2d462109c2e0e0ca51861eebdd80 (patch) | |
| tree | d7bc222997dad95b71abc2e828a29539ada87afe /migration/migration.c | |
| parent | 0d649a0e95b46fab94090f852a43c72d2621ebb9 (diff) | |
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>
Diffstat (limited to 'migration/migration.c')
| -rw-r--r-- | migration/migration.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/migration/migration.c b/migration/migration.c index f579752d21..02d8bc07b1 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1107,6 +1107,8 @@ static void migrate_fd_cleanup(void *opaque) qemu_bh_delete(s->cleanup_bh); s->cleanup_bh = NULL; + qemu_savevm_state_cleanup(); + if (s->to_dst_file) { Error *local_err = NULL; @@ -2329,13 +2331,6 @@ static void *migration_thread(void *opaque) end_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME); 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) { uint64_t transferred_bytes = qemu_ftell(s->to_dst_file); s->total_time = end_time - s->total_time; @@ -2358,7 +2353,6 @@ static void *migration_thread(void *opaque) "COLO enabled", __func__); } migrate_start_colo_process(s); - qemu_savevm_state_cleanup(); /* * Fixme: we will run VM in COLO no matter its old running state. * After exited COLO, we will keep running. |