From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37390) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtxV2-0004RU-A4 for qemu-devel@nongnu.org; Wed, 04 Nov 2015 07:49:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZtxUy-0003in-Ah for qemu-devel@nongnu.org; Wed, 04 Nov 2015 07:49:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59272) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtxUy-0003iZ-5Q for qemu-devel@nongnu.org; Wed, 04 Nov 2015 07:49:08 -0500 From: Juan Quintela Date: Wed, 4 Nov 2015 13:48:56 +0100 Message-Id: <1446641337-2684-5-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 4/5] migration: code clean up 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 Just clean up code, no behavior change. Signed-off-by: Liang Li Reviewed-by: Juan Quintela al3 Reviewed-by: Amit Shah al3 Signed-off-by: Juan Quintela al3 --- 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) -- 2.4.3