From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48033) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VnPfb-0006y5-Eo for qemu-devel@nongnu.org; Mon, 02 Dec 2013 04:20:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VnPfR-0002Uz-6n for qemu-devel@nongnu.org; Mon, 02 Dec 2013 04:19:59 -0500 Received: from e28smtp06.in.ibm.com ([122.248.162.6]:42904) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VnPfQ-0002Ut-GX for qemu-devel@nongnu.org; Mon, 02 Dec 2013 04:19:49 -0500 Received: from /spool/local by e28smtp06.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 2 Dec 2013 14:49:46 +0530 Received: from d28relay02.in.ibm.com (d28relay02.in.ibm.com [9.184.220.59]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id D6D9B394003F for ; Mon, 2 Dec 2013 14:49:44 +0530 (IST) Received: from d28av01.in.ibm.com (d28av01.in.ibm.com [9.184.220.63]) by d28relay02.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id rB29JgGx51970250 for ; Mon, 2 Dec 2013 14:49:42 +0530 Received: from d28av01.in.ibm.com (localhost [127.0.0.1]) by d28av01.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id rB29Jhdk001415 for ; Mon, 2 Dec 2013 14:49:44 +0530 From: Lei Li Date: Mon, 2 Dec 2013 17:19:09 +0800 Message-Id: <1385975957-22941-10-git-send-email-lilei@linux.vnet.ibm.com> In-Reply-To: <1385975957-22941-1-git-send-email-lilei@linux.vnet.ibm.com> References: <1385975957-22941-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