From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38715) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VC2ix-0000sf-MY for qemu-devel@nongnu.org; Wed, 21 Aug 2013 03:21:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VC2io-00012d-K8 for qemu-devel@nongnu.org; Wed, 21 Aug 2013 03:20:59 -0400 Received: from e28smtp01.in.ibm.com ([122.248.162.1]:58549) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VC2in-000124-R0 for qemu-devel@nongnu.org; Wed, 21 Aug 2013 03:20:50 -0400 Received: from /spool/local by e28smtp01.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 21 Aug 2013 12:41:55 +0530 Received: from d28relay01.in.ibm.com (d28relay01.in.ibm.com [9.184.220.58]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id 19A41E0056 for ; Wed, 21 Aug 2013 12:51:15 +0530 (IST) Received: from d28av01.in.ibm.com (d28av01.in.ibm.com [9.184.220.63]) by d28relay01.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r7L7MFie29360236 for ; Wed, 21 Aug 2013 12:52:15 +0530 Received: from d28av01.in.ibm.com (localhost [127.0.0.1]) by d28av01.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id r7L7Ki9m027374 for ; Wed, 21 Aug 2013 12:50:44 +0530 From: Lei Li Date: Wed, 21 Aug 2013 15:18:49 +0800 Message-Id: <1377069536-12658-13-git-send-email-lilei@linux.vnet.ibm.com> In-Reply-To: <1377069536-12658-1-git-send-email-lilei@linux.vnet.ibm.com> References: <1377069536-12658-1-git-send-email-lilei@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 12/18] arch_init: factor out ram_save_blocks() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aarcange@redhat.com, aliguori@us.ibm.com, Lei Li , quintela@redhat.com, mrhines@linux.vnet.ibm.com, lagarcia@br.ibm.com, pbonzini@redhat.com, rcj@linux.vnet.ibm.com Factor out ram_save_blocks(), which will be used to send ram blocks hooked by save_page in ram_save_setup stage in coming patch. Signed-off-by: Lei Li --- arch_init.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/arch_init.c b/arch_init.c index 1ea7c29..434a4ca 100644 --- a/arch_init.c +++ b/arch_init.c @@ -534,6 +534,20 @@ void acct_update_position(QEMUFile *f, size_t size, bool zero) } } +static void ram_save_blocks(QEMUFile *f) +{ + while (true) { + int bytes_sent; + + bytes_sent = ram_save_block(f, true); + /* no more blocks to sent */ + if (bytes_sent == 0) { + break; + } + bytes_transferred += bytes_sent; + } +} + static ram_addr_t ram_save_remaining(void) { return migration_dirty_pages; @@ -719,16 +733,7 @@ static int ram_save_complete(QEMUFile *f, void *opaque) /* try transferring iterative blocks of memory */ /* flush all remaining blocks regardless of rate limiting */ - while (true) { - int bytes_sent; - - bytes_sent = ram_save_block(f, true); - /* no more blocks to sent */ - if (bytes_sent == 0) { - break; - } - bytes_transferred += bytes_sent; - } + ram_save_blocks(f); ram_control_after_iterate(f, RAM_CONTROL_FINISH); migration_end(); -- 1.7.7.6