From patchwork Thu Aug 13 05:46:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Liang Z" X-Patchwork-Id: 506854 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 835C11401B5 for ; Thu, 13 Aug 2015 15:49:01 +1000 (AEST) Received: from localhost ([::1]:41072 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPlNr-00069c-PH for incoming@patchwork.ozlabs.org; Thu, 13 Aug 2015 01:48:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56648) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPlM3-0002FW-0A for qemu-devel@nongnu.org; Thu, 13 Aug 2015 01:47:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZPlLy-00031y-79 for qemu-devel@nongnu.org; Thu, 13 Aug 2015 01:47:05 -0400 Received: from mga03.intel.com ([134.134.136.65]:20203) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPlLy-00031d-1s; Thu, 13 Aug 2015 01:47:02 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP; 12 Aug 2015 22:47:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,667,1432623600"; d="scan'208";a="783167081" Received: from ll.sh.intel.com (HELO localhost) ([10.239.13.27]) by orsmga002.jf.intel.com with ESMTP; 12 Aug 2015 22:46:59 -0700 From: Liang Li To: qemu-devel@nongnu.org Date: Thu, 13 Aug 2015 13:46:36 +0800 Message-Id: <1439444796-22862-5-git-send-email-liang.z.li@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1439444796-22862-1-git-send-email-liang.z.li@intel.com> References: <1439444796-22862-1-git-send-email-liang.z.li@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.65 Cc: qemu-block@nongnu.org, quintela@redhat.com, Liang Li , qemu-stable@nongnu.org, yong.y.wang@intel.com, yang.z.zhang@intel.com, stefanha@redhat.com, amit.shah@redhat.com Subject: [Qemu-devel] [v2 4/4] migration: code clean up X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 55442bd..869798c 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; @@ -879,7 +874,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 e7f711e..8b045fe 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1024,7 +1024,7 @@ void free_xbzrle_decoded_buf(void) xbzrle_decoded_buf = NULL; } -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 @@ -1049,11 +1049,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; @@ -1610,7 +1605,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)