From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33541) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zt9lP-0008ES-Jf for qemu-devel@nongnu.org; Mon, 02 Nov 2015 02:42:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zt9lM-00017o-Ci for qemu-devel@nongnu.org; Mon, 02 Nov 2015 02:42:47 -0500 Received: from mga11.intel.com ([192.55.52.93]:41435) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zt9lM-00017k-8I for qemu-devel@nongnu.org; Mon, 02 Nov 2015 02:42:44 -0500 From: Liang Li Date: Mon, 2 Nov 2015 15:37:02 +0800 Message-Id: <1446449823-25049-4-git-send-email-liang.z.li@intel.com> In-Reply-To: <1446449823-25049-1-git-send-email-liang.z.li@intel.com> References: <1446449823-25049-1-git-send-email-liang.z.li@intel.com> Subject: [Qemu-devel] [v2 RESEND 3/4] migration: rename cancel to cleanup in SaveVMHandles List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: quintela@redhat.com, Liang Li , yong.y.wang@intel.com, stefanha@redhat.com, amit.shah@redhat.com, pbonzini@redhat.com 'cleanup' seems more appropriate than 'cancel'. Signed-off-by: Liang Li --- include/migration/vmstate.h | 2 +- migration/block.c | 2 +- migration/ram.c | 2 +- migration/savevm.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index 9a65522..d173b56 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -39,7 +39,7 @@ typedef struct SaveVMHandlers { void (*set_params)(const MigrationParams *params, void * opaque); SaveStateHandler *save_state; - void (*cancel)(void *opaque); + void (*cleanup)(void *opaque); int (*save_live_complete)(QEMUFile *f, void *opaque); /* This runs both outside and inside the iothread lock. */ diff --git a/migration/block.c b/migration/block.c index 8401597..ecfe005 100644 --- a/migration/block.c +++ b/migration/block.c @@ -884,7 +884,7 @@ static SaveVMHandlers savevm_block_handlers = { .save_live_complete = block_save_complete, .save_live_pending = block_save_pending, .load_state = block_load, - .cancel = block_migration_cancel, + .cleanup = block_migration_cancel, .is_active = block_is_active, }; diff --git a/migration/ram.c b/migration/ram.c index 25e9eeb..0a51473 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1685,7 +1685,7 @@ static SaveVMHandlers savevm_ram_handlers = { .save_live_complete = ram_save_complete, .save_live_pending = ram_save_pending, .load_state = ram_load, - .cancel = ram_migration_cancel, + .cleanup = ram_migration_cancel, }; void ram_mig_init(void) diff --git a/migration/savevm.c b/migration/savevm.c index ae8fdda..e05158d 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -908,8 +908,8 @@ void qemu_savevm_state_cleanup(void) trace_savevm_state_cleanup(); QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { - if (se->ops && se->ops->cancel) { - se->ops->cancel(se->opaque); + if (se->ops && se->ops->cleanup) { + se->ops->cleanup(se->opaque); } } } -- 1.9.1