From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40562) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WIvqo-0008CL-Ey for qemu-devel@nongnu.org; Thu, 27 Feb 2014 02:57:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WIvqi-0005xg-F7 for qemu-devel@nongnu.org; Thu, 27 Feb 2014 02:57:50 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46520) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WIvqi-0005wS-75 for qemu-devel@nongnu.org; Thu, 27 Feb 2014 02:57:44 -0500 From: Markus Armbruster Date: Thu, 27 Feb 2014 08:57:38 +0100 Message-Id: <1393487858-2895-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH] 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: peter.maydell@linaro.org, quintela@redhat.com 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. Signed-off-by: Markus Armbruster --- 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.1.4