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: aarcange@redhat.com, Lei Li <lilei@linux.vnet.ibm.com>,
	quintela@redhat.com, mdroth@linux.vnet.ibm.com,
	mrhines@linux.vnet.ibm.com, aliguori@amazon.com,
	lagarcia@br.ibm.com, pbonzini@redhat.com, rcj@linux.vnet.ibm.com
Subject: [Qemu-devel] [PATCH 11/17] savevm: adjust ram_control_save_page for page flipping
Date: Thu, 21 Nov 2013 17:11:34 +0800	[thread overview]
Message-ID: <1385025100-3191-12-git-send-email-lilei@linux.vnet.ibm.com> (raw)
In-Reply-To: <1385025100-3191-1-git-send-email-lilei@linux.vnet.ibm.com>

As callback save_page will always be opened by
qemu_fopen_socket_local(), and without unix_page_flipping
it will return RAM_SAVE_CONTROL_NOT_SUPP, it leads to a
wrong qemu_file_set_error() based on the current logic.
So this patch adds RAM_SAVE_CONTROL_NOT_SUPP to the check.

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Lei Li <lilei@linux.vnet.ibm.com>
---
 savevm.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/savevm.c b/savevm.c
index 3ee256e..4576145 100644
--- a/savevm.c
+++ b/savevm.c
@@ -668,7 +668,8 @@ size_t ram_control_save_page(QEMUFile *f, MemoryRegion *mr, ram_addr_t offset,
         int ret = f->ops->save_page(f, f->opaque, mr, offset,
                                     size, bytes_sent);
 
-        if (ret != RAM_SAVE_CONTROL_DELAYED) {
+        if (ret != RAM_SAVE_CONTROL_DELAYED &&
+            ret != RAM_SAVE_CONTROL_NOT_SUPP) {
             if (bytes_sent && *bytes_sent > 0) {
                 qemu_update_position(f, *bytes_sent);
             } else if (ret < 0) {
-- 
1.7.7.6

  parent reply	other threads:[~2013-11-21  9:12 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-21  9:11 [Qemu-devel] [PATCH 0/17 v3] Localhost migration with side channel for ram Lei Li
2013-11-21  9:11 ` [Qemu-devel] [PATCH 01/17] QAPI: introduce migration capability unix_page_flipping Lei Li
2013-11-21  9:11 ` [Qemu-devel] [PATCH 02/17] migration: add migrate_unix_page_flipping() Lei Li
2013-11-21  9:11 ` [Qemu-devel] [PATCH 03/17] qmp-command.hx: add missing docs for migration capabilites Lei Li
2013-11-21  9:11 ` [Qemu-devel] [PATCH 04/17] migration-local: add QEMUFileLocal with socket based QEMUFile Lei Li
2013-11-21  9:11 ` [Qemu-devel] [PATCH 05/17] migration-local: introduce qemu_fopen_socket_local() Lei Li
2013-11-21  9:11 ` [Qemu-devel] [PATCH 06/17] migration-local: add send_pipefd() Lei Li
2013-11-26 11:26   ` Paolo Bonzini
2013-11-21  9:11 ` [Qemu-devel] [PATCH 07/17] migration-local: override before_ram_iterate to send pipefd Lei Li
2013-11-21  9:11 ` [Qemu-devel] [PATCH 08/17] add unix_msgfd_lookup() to callback get_buffer Lei Li
2013-11-26 11:30   ` Lei Li
2013-11-26 11:31   ` Paolo Bonzini
2013-11-26 14:00     ` Lei Li
2013-11-26 14:14       ` Paolo Bonzini
2013-11-21  9:11 ` [Qemu-devel] [PATCH 09/17] save_page: replace block_offset with a MemoryRegion Lei Li
2013-11-21  9:11 ` [Qemu-devel] [PATCH 10/17] migration-local: override save_page for page transmit Lei Li
2013-11-26 11:22   ` Paolo Bonzini
2013-11-26 12:10     ` Lei Li
2013-11-21  9:11 ` Lei Li [this message]
2013-11-21  9:11 ` [Qemu-devel] [PATCH 12/17] migration-local: override hook_ram_load Lei Li
2013-11-26 11:25   ` Paolo Bonzini
2013-11-26 12:11     ` Lei Li
2013-11-21  9:11 ` [Qemu-devel] [PATCH 13/17] migration-unix: replace qemu_fopen_socket with qemu_fopen_socket_local Lei Li
2013-11-21  9:11 ` [Qemu-devel] [PATCH 14/17] add new RanState RAN_STATE_MEMORY_STALE Lei Li
2013-11-26 12:28   ` Paolo Bonzini
2013-11-26 14:02     ` Lei Li
2013-11-21  9:11 ` [Qemu-devel] [PATCH 15/17] migration-unix: page flipping support on unix outgoing Lei Li
2013-11-21  9:11 ` [Qemu-devel] [PATCH 16/17] migration: adjust migration_thread() process for page flipping Lei Li
2013-11-26 11:32   ` Paolo Bonzini
2013-11-26 12:03     ` Lei Li
2013-11-26 12:54       ` Paolo Bonzini
2013-11-26 13:53         ` Lei Li
2013-11-26 14:11           ` Paolo Bonzini
2013-11-28  8:19             ` Lei Li
2013-11-21  9:11 ` [Qemu-devel] [PATCH 17/17] hmp: better format for info migrate_capabilities Lei Li
2013-11-21 10:19 ` [Qemu-devel] [PATCH 0/17 v3] Localhost migration with side channel for ram Daniel P. Berrange
2013-11-22 11:29   ` Lei Li
2013-11-22 11:36     ` Paolo Bonzini
2013-11-25  7:29       ` Lei Li
2013-11-25  9:48         ` Paolo Bonzini
2013-11-26 11:07           ` Lei Li
2013-11-26 11:17             ` Paolo Bonzini
2013-11-27 16:48               ` Andrea Arcangeli
2013-11-22 11:36     ` Daniel P. Berrange
  -- strict thread matches above, loose matches on Subject: below --
2013-10-22  3:25 [Qemu-devel] [PATCH 0/17 v2] " Lei Li
2013-10-22  3:25 ` [Qemu-devel] [PATCH 11/17] savevm: adjust ram_control_save_page for page flipping Lei Li
2013-10-24 14:09   ` Paolo Bonzini

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=1385025100-3191-12-git-send-email-lilei@linux.vnet.ibm.com \
    --to=lilei@linux.vnet.ibm.com \
    --cc=aarcange@redhat.com \
    --cc=aliguori@amazon.com \
    --cc=lagarcia@br.ibm.com \
    --cc=mdroth@linux.vnet.ibm.com \
    --cc=mrhines@linux.vnet.ibm.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    --cc=rcj@linux.vnet.ibm.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).