diff mbox

[09/17] savevm: adjust ram_control_save_page for page flipping

Message ID 1385975957-22941-10-git-send-email-lilei@linux.vnet.ibm.com
State New
Headers show

Commit Message

Lei Li Dec. 2, 2013, 9:19 a.m. UTC 
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 mbox

Patch

diff --git a/savevm.c b/savevm.c
index 06c1f29..137e74f 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) {