diff options
author | 2015-09-24 08:56:12 +0800 | |
---|---|---|
committer | 2015-09-24 08:56:12 +0800 | |
commit | 738df5b97312bb61617669250ce67073108de070 (patch) | |
tree | 85e999c2f3d38ccf9d045b7de89a42f99a15a74b /qemu/migration/migration.c | |
parent | cc84a1f21026270463b580f2564f9d71912b20db (diff) |
migration: do cleanup operation after completion
Because of the patch 3ea3b7fa9af067982f34b of kvm, now the migration_end()
is a time consuming operation, which takes about dozens of milliseconds, and
will prolong VM downtime. Such an operation should be done after migration
completion.
For a VM with 8G RAM, this patch can reduce the VM downtime about 32 ms during
live migration.
Change-Id: Iddd10bd5a2b1bf52cce36253f303fc458da343cd
Signed-off-by: Liang Li <liang.z.li@intel.com>
Diffstat (limited to 'qemu/migration/migration.c')
-rw-r--r-- | qemu/migration/migration.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/qemu/migration/migration.c b/qemu/migration/migration.c index 662e77e4e..4ddb9adce 100644 --- a/qemu/migration/migration.c +++ b/qemu/migration/migration.c @@ -560,12 +560,9 @@ static void migrate_fd_cleanup(void *opaque) assert(s->state != MIGRATION_STATUS_ACTIVE); - if (s->state != MIGRATION_STATUS_COMPLETED) { - qemu_savevm_state_cancel(); - if (s->state == MIGRATION_STATUS_CANCELLING) { - migrate_set_state(s, MIGRATION_STATUS_CANCELLING, - MIGRATION_STATUS_CANCELLED); - } + if (s->state == MIGRATION_STATUS_CANCELLING) { + migrate_set_state(s, MIGRATION_STATUS_CANCELLING, + MIGRATION_STATUS_CANCELLED); } notifier_list_notify(&migration_state_notifiers, s); @@ -923,6 +920,7 @@ static void *migration_thread(void *opaque) int64_t initial_bytes = 0; int64_t max_size = 0; int64_t start_time = initial_time; + int64_t end_time; bool old_vm_running = false; rcu_register_thread(); @@ -1007,9 +1005,11 @@ static void *migration_thread(void *opaque) } } + end_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME); + qemu_mutex_lock_iothread(); + qemu_savevm_state_cancel(); if (s->state == MIGRATION_STATUS_COMPLETED) { - int64_t end_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME); uint64_t transferred_bytes = qemu_ftell(s->file); s->total_time = end_time - s->total_time; s->downtime = end_time - start_time; |