From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40053) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WLeWf-0006OV-0d for qemu-devel@nongnu.org; Thu, 06 Mar 2014 15:04:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WLeWZ-0005F5-1X for qemu-devel@nongnu.org; Thu, 06 Mar 2014 15:04:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:25881) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WLeWY-0005Ey-PY for qemu-devel@nongnu.org; Thu, 06 Mar 2014 15:04:10 -0500 From: Amit Shah Date: Fri, 7 Mar 2014 01:33:35 +0530 Message-Id: <805f9ef9b4bf5580a5555dbc408d1e2646b47184.1394135904.git.amit.shah@redhat.com> In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PATCH 1/4] qemu_file: Fix mismerge of "use fwrite() correctly" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: aik@ozlabs.ru, Amit Shah , qemu list , 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 --- 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