From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53894) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WMOrU-0007XK-54 for qemu-devel@nongnu.org; Sat, 08 Mar 2014 16:32:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WMOrO-0001jN-6a for qemu-devel@nongnu.org; Sat, 08 Mar 2014 16:32:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51540) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WMOrN-0001iR-Vx for qemu-devel@nongnu.org; Sat, 08 Mar 2014 16:32:46 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s28LWjTH023271 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sat, 8 Mar 2014 16:32:45 -0500 From: Juan Quintela Date: Sat, 8 Mar 2014 22:32:36 +0100 Message-Id: <1394314358-19486-3-git-send-email-quintela@redhat.com> In-Reply-To: <1394314358-19486-1-git-send-email-quintela@redhat.com> References: <1394314358-19486-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PATCH 2/4] qemu_file: Fix mismerge of "use fwrite() correctly" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Amit Shah , Markus Armbruster From: Markus Armbruster Reviewers accepted v2 of the patch, but what got committed was v1, with the R-bys for v2. This is the v1->v2 followup fix. [Amit: This fixes commit aded6539d983280212e08d09f14157b1cb4d58cc ] Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Amit Shah Signed-off-by: Amit Shah Signed-off-by: Juan Quintela --- qemu-file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu-file.c b/qemu-file.c index f074af1..e5ec798 100644 --- a/qemu-file.c +++ b/qemu-file.c @@ -105,7 +105,7 @@ static int stdio_put_buffer(void *opaque, const uint8_t *buf, int64_t pos, res = fwrite(buf, 1, size, s->stdio_file); if (res != size) { - return -EIO; /* fake errno value */ + return -errno; } return res; } -- 1.8.5.3