qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Lei Li <lilei@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: Lei Li <lilei@linux.vnet.ibm.com>,
	quintela@redhat.com, mrhines@linux.vnet.ibm.com,
	anthony@codemonkey.ws, lagarcia@br.ibm.com, pbonzini@redhat.com
Subject: [Qemu-devel] [PATCH 3/3] arch_init: right return for ram_save_iterate
Date: Fri, 23 Aug 2013 18:03:05 +0800	[thread overview]
Message-ID: <1377252185-25585-3-git-send-email-lilei@linux.vnet.ibm.com> (raw)
In-Reply-To: <1377252185-25585-1-git-send-email-lilei@linux.vnet.ibm.com>

Signed-off-by: Lei Li <lilei@linux.vnet.ibm.com>
---
 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

      parent reply	other threads:[~2013-08-23 10:04 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-23 10:03 [Qemu-devel] [PATCH 1/3] savevm: add comments for qemu_file_get_error() Lei Li
2013-08-23 10:03 ` [Qemu-devel] [PATCH 2/3] savevm: wrong error set by ram_control_load_hook() Lei Li
2013-08-23 10:12   ` Paolo Bonzini
2013-08-23 12:37     ` Lei Li
2013-08-23 10:03 ` Lei Li [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1377252185-25585-3-git-send-email-lilei@linux.vnet.ibm.com \
    --to=lilei@linux.vnet.ibm.com \
    --cc=anthony@codemonkey.ws \
    --cc=lagarcia@br.ibm.com \
    --cc=mrhines@linux.vnet.ibm.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).