From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37351) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtxUv-0004Ie-1n for qemu-devel@nongnu.org; Wed, 04 Nov 2015 07:49:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZtxUu-0003gT-2v for qemu-devel@nongnu.org; Wed, 04 Nov 2015 07:49:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43122) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtxUt-0003gJ-U0 for qemu-devel@nongnu.org; Wed, 04 Nov 2015 07:49:04 -0500 From: Juan Quintela Date: Wed, 4 Nov 2015 13:48:54 +0100 Message-Id: <1446641337-2684-3-git-send-email-quintela@redhat.com> In-Reply-To: <1446641337-2684-1-git-send-email-quintela@redhat.com> References: <1446641337-2684-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PULL 2/5] migration: rename qemu_savevm_state_cancel List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: amit.shah@redhat.com, Liang Li , dgilbert@redhat.com From: Liang Li 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 --- include/sysemu/sysemu.h | 2 +- migration/migration.c | 2 +- migration/savevm.c | 6 +++--- trace-events | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index c439975..5cb0f05 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -89,7 +89,7 @@ void qemu_savevm_state_begin(QEMUFile *f, void qemu_savevm_state_header(QEMUFile *f); int qemu_savevm_state_iterate(QEMUFile *f); void qemu_savevm_state_complete(QEMUFile *f); -void qemu_savevm_state_cancel(void); +void qemu_savevm_state_cleanup(void); uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size); int qemu_loadvm_state(QEMUFile *f); diff --git a/migration/migration.c b/migration/migration.c index d5a7304..f99d3ea 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1090,7 +1090,7 @@ static void *migration_thread(void *opaque) end_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME); qemu_mutex_lock_iothread(); - qemu_savevm_state_cancel(); + qemu_savevm_state_cleanup(); if (s->state == MIGRATION_STATUS_COMPLETED) { uint64_t transferred_bytes = qemu_ftell(s->file); s->total_time = end_time - s->total_time; diff --git a/migration/savevm.c b/migration/savevm.c index dbcc39a..ae8fdda 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; diff --git a/trace-events b/trace-events index 72136b9..17fbddf 100644 --- a/trace-events +++ b/trace-events @@ -1211,7 +1211,7 @@ savevm_state_begin(void) "" savevm_state_header(void) "" savevm_state_iterate(void) "" savevm_state_complete(void) "" -savevm_state_cancel(void) "" +savevm_state_cleanup(void) "" vmstate_save(const char *idstr, const char *vmsd_name) "%s, %s" vmstate_load(const char *idstr, const char *vmsd_name) "%s, %s" qemu_announce_self_iter(const char *mac) "%s" -- 2.4.3