From ea7415fac677c5c1599214ee226ab4a3a438fdd6 Mon Sep 17 00:00:00 2001 From: Liang Li Date: Mon, 2 Nov 2015 15:37:01 +0800 Subject: migration: rename qemu_savevm_state_cancel The function qemu_savevm_state_cancel is called after the migration in migration_thread, it seems strange to 'cancel' it after completion, rename it to qemu_savevm_state_cleanup looks better. Signed-off-by: Liang Li Reviewed-by: Juan Quintela al3 Reviewed-by: Amit Shah al3 Signed-off-by: Juan Quintela al3 --- migration/savevm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'migration/savevm.c') diff --git a/migration/savevm.c b/migration/savevm.c index dbcc39a617..ae8fdda875 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -902,11 +902,11 @@ uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size) return ret; } -void qemu_savevm_state_cancel(void) +void qemu_savevm_state_cleanup(void) { SaveStateEntry *se; - trace_savevm_state_cancel(); + trace_savevm_state_cleanup(); QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { if (se->ops && se->ops->cancel) { se->ops->cancel(se->opaque); @@ -943,7 +943,7 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp) ret = qemu_file_get_error(f); } if (ret != 0) { - qemu_savevm_state_cancel(); + qemu_savevm_state_cleanup(); error_setg_errno(errp, -ret, "Error while writing VM state"); } return ret; -- cgit v1.2.3