]> Git Repo - qemu.git/commitdiff
qemu_file: Fix mismerge of "use fwrite() correctly"
authorMarkus Armbruster <[email protected]>
Thu, 6 Mar 2014 20:03:35 +0000 (01:33 +0530)
committerJuan Quintela <[email protected]>
Sat, 8 Mar 2014 21:22:34 +0000 (22:22 +0100)
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 <[email protected]>
Reviewed-by: Eric Blake <[email protected]>
Reviewed-by: Amit Shah <[email protected]>
Signed-off-by: Amit Shah <[email protected]>
Signed-off-by: Juan Quintela <[email protected]>
qemu-file.c

index f074af15c31bde289076713de9b84dd5ae202713..e5ec798e0b5f61fb12b2c32f5b90ba1c14e16fd1 100644 (file)
@@ -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;
 }
This page took 0.027081 seconds and 4 git commands to generate.