From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33469) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zt9lD-0007pF-3Y for qemu-devel@nongnu.org; Mon, 02 Nov 2015 02:42:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zt9l9-00015K-UD for qemu-devel@nongnu.org; Mon, 02 Nov 2015 02:42:35 -0500 Received: from mga14.intel.com ([192.55.52.115]:7681) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zt9l9-00015F-Ov for qemu-devel@nongnu.org; Mon, 02 Nov 2015 02:42:31 -0500 From: Liang Li Date: Mon, 2 Nov 2015 15:37:03 +0800 Message-Id: <1446449823-25049-5-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 4/4] migration: code clean up 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 Just clean up code, no behavior change. Signed-off-by: Liang Li --- migration/block.c | 9 ++------- migration/ram.c | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/migration/block.c b/migration/block.c index ecfe005..cf9d9f8 100644 --- a/migration/block.c +++ b/migration/block.c @@ -591,7 +591,7 @@ static int64_t get_remaining_dirty(void) /* Called with iothread lock taken. */ -static void blk_mig_cleanup(void) +static void block_migration_cleanup(void *opaque) { BlkMigDevState *bmds; BlkMigBlock *blk; @@ -618,11 +618,6 @@ static void blk_mig_cleanup(void) blk_mig_unlock(); } -static void block_migration_cancel(void *opaque) -{ - blk_mig_cleanup(); -} - static int block_save_setup(QEMUFile *f, void *opaque) { int ret; @@ -884,7 +879,7 @@ static SaveVMHandlers savevm_block_handlers = { .save_live_complete = block_save_complete, .save_live_pending = block_save_pending, .load_state = block_load, - .cleanup = block_migration_cancel, + .cleanup = block_migration_cleanup, .is_active = block_is_active, }; diff --git a/migration/ram.c b/migration/ram.c index 0a51473..df3df9e 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1100,7 +1100,7 @@ static void migration_bitmap_free(struct BitmapRcu *bmap) g_free(bmap); } -static void migration_end(void) +static void ram_migration_cleanup(void *opaque) { /* caller have hold iothread lock or is in a bh, so there is * no writing race against this migration_bitmap @@ -1124,11 +1124,6 @@ static void migration_end(void) XBZRLE_cache_unlock(); } -static void ram_migration_cancel(void *opaque) -{ - migration_end(); -} - static void reset_ram_globals(void) { last_seen_block = NULL; @@ -1685,7 +1680,7 @@ static SaveVMHandlers savevm_ram_handlers = { .save_live_complete = ram_save_complete, .save_live_pending = ram_save_pending, .load_state = ram_load, - .cleanup = ram_migration_cancel, + .cleanup = ram_migration_cleanup, }; void ram_mig_init(void) -- 1.9.1