summary refs log tree commit diff stats
path: root/qemu-file.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2014-03-07 01:33:35 +0530
committerJuan Quintela <quintela@redhat.com>2014-03-08 22:22:34 +0100
commitac4df4e608e84da135eacecd7bba7c6e9e9a63b7 (patch)
treecb474caecca2064c5e1e5d56126961b86492183c /qemu-file.c
parentfd8cec932c2ddc687e2da954978954b46a926f90 (diff)
downloadfocaccia-qemu-ac4df4e608e84da135eacecd7bba7c6e9e9a63b7.tar.gz
focaccia-qemu-ac4df4e608e84da135eacecd7bba7c6e9e9a63b7.zip
qemu_file: Fix mismerge of "use fwrite() correctly"
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 <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Diffstat (limited to 'qemu-file.c')
-rw-r--r--qemu-file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/qemu-file.c b/qemu-file.c
index f074af15c3..e5ec798e0b 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;
 }