From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47678) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VCrTs-0002Tw-Fr for qemu-devel@nongnu.org; Fri, 23 Aug 2013 09:32:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VCrTj-0000lH-IS for qemu-devel@nongnu.org; Fri, 23 Aug 2013 09:32:48 -0400 Received: from e23smtp04.au.ibm.com ([202.81.31.146]:35850) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VCrTd-0000cZ-4F for qemu-devel@nongnu.org; Fri, 23 Aug 2013 09:32:39 -0400 Received: from /spool/local by e23smtp04.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 23 Aug 2013 23:15:16 +1000 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [9.190.235.21]) by d23dlp03.au.ibm.com (Postfix) with ESMTP id A14E23578051 for ; Fri, 23 Aug 2013 23:32:15 +1000 (EST) Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r7NDW2Ll7799056 for ; Fri, 23 Aug 2013 23:32:04 +1000 Received: from d23av01.au.ibm.com (localhost [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id r7NDWC4n007849 for ; Fri, 23 Aug 2013 23:32:13 +1000 From: Lei Li Date: Fri, 23 Aug 2013 21:30:53 +0800 Message-Id: <1377264653-31031-3-git-send-email-lilei@linux.vnet.ibm.com> In-Reply-To: <1377264653-31031-1-git-send-email-lilei@linux.vnet.ibm.com> References: <1377264653-31031-1-git-send-email-lilei@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH resend 3/3] arch_init: right return for ram_save_iterate List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, mrhines@linux.vnet.ibm.com, anthony@codemonkey.ws, Lei Li Signed-off-by: Lei Li --- arch_init.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/arch_init.c b/arch_init.c index 94d45e1..a34437c 100644 --- a/arch_init.c +++ b/arch_init.c @@ -709,16 +709,11 @@ static int ram_save_iterate(QEMUFile *f, void *opaque) */ ram_control_after_iterate(f, RAM_CONTROL_ROUND); - if (ret < 0) { - bytes_transferred += total_sent; - return ret; - } - qemu_put_be64(f, RAM_SAVE_FLAG_EOS); total_sent += 8; bytes_transferred += total_sent; - return total_sent; + return qemu_file_get_error(f); } static int ram_save_complete(QEMUFile *f, void *opaque) -- 1.7.7.6