[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 16/27] migration: qemu_savevm_state_cleanup() in clea
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 16/27] migration: qemu_savevm_state_cleanup() in cleanup |
Date: |
Mon, 15 Jan 2018 12:52:58 +0100 |
From: Peter Xu <address@hidden>
Moving existing callers all into migrate_fd_cleanup(). It simplifies
migration_thread() a bit.
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
migration/migration.c | 10 ++--------
1 file 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.
--
2.14.3
- [Qemu-devel] [PULL 04/27] docs: Convert migration.txt to rst, (continued)
- [Qemu-devel] [PULL 04/27] docs: Convert migration.txt to rst, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 06/27] migration: fix analyze-migration.py script with radix table, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 07/27] migration: introduce postcopy-blocktime capability, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 08/27] migration: add postcopy blocktime ctx into MigrationIncomingState, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 09/27] migration: calculate vCPU blocktime on dst side, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 10/27] migration: postcopy_blocktime documentation, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 11/27] migration: add blocktime calculation into migration-test, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 12/27] migration: add postcopy total blocktime into query-migrate, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 13/27] migration: Guard ram_bytes_remaining against early call, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 14/27] migration: finalize current_migration object, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 16/27] migration: qemu_savevm_state_cleanup() in cleanup,
Juan Quintela <=
- [Qemu-devel] [PULL 15/27] migration: assert colo instead of check, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 17/27] migration: remove "enable_colo" var, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 18/27] migration: split use of MigrationState.total_time, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 19/27] migration: move vm_old_running into global state, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 20/27] migration: introduce downtime_start, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 21/27] migration: introduce migrate_calculate_complete, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 23/27] migration: cleanup stats update into function, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 22/27] migration: use switch at the end of migration, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 24/27] migration: major cleanup for migrate iterations, Juan Quintela, 2018/01/15
- [Qemu-devel] [PULL 26/27] migration: remove some block_cleanup_parameters(), Juan Quintela, 2018/01/15