From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50139) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmKya-0007vx-Rs for qemu-devel@nongnu.org; Fri, 29 Nov 2013 05:07:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VmKyR-0007y3-UN for qemu-devel@nongnu.org; Fri, 29 Nov 2013 05:07:08 -0500 Received: from e23smtp06.au.ibm.com ([202.81.31.148]:54294) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmKyR-0007x0-4W for qemu-devel@nongnu.org; Fri, 29 Nov 2013 05:06:59 -0500 Received: from /spool/local by e23smtp06.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 29 Nov 2013 20:06:57 +1000 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [9.190.235.21]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id 99A792BB0053 for ; Fri, 29 Nov 2013 21:06:55 +1100 (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 rATA6hF88061428 for ; Fri, 29 Nov 2013 21:06:43 +1100 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 rATA6sh4012491 for ; Fri, 29 Nov 2013 21:06:55 +1100 From: Lei Li Date: Fri, 29 Nov 2013 18:06:16 +0800 Message-Id: <1385719584-21114-10-git-send-email-lilei@linux.vnet.ibm.com> In-Reply-To: <1385719584-21114-1-git-send-email-lilei@linux.vnet.ibm.com> References: <1385719584-21114-1-git-send-email-lilei@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 09/17] savevm: adjust ram_control_save_page for page flipping List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aarcange@redhat.com, Lei Li , quintela@redhat.com, mrhines@linux.vnet.ibm.com, aliguori@amazon.com, lagarcia@br.ibm.com, pbonzini@redhat.com, rcj@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 Signed-off-by: Lei Li --- savevm.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) 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) { -- 1.7.7.6