qemu_file: Fix mismerge of "use fwrite() correctly"
PATCH 1/1 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.
Signed-off-by Markus Armbruster <[email protected]>
--- qemu-file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
qemu-file.c +1 -1
@@ -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; }
Signature · 1 line
1.8.1.4
Quoted 2 lines · Markus Armbruster
Reviewers accepted v2 of the patch, but what got committed was v1, with the R-bys for v2. This is the
v1->v2followup fix.
Ouch.
Quoted 5 lines
Signed-off-by Markus Armbruster <[email protected]>--- qemu-file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by Eric Blake <[email protected]>
Quoted 15 lines
qemu-file.c +1
-1@@ -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; }
Signature · 2 lines
Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
Quoted 4 lines · Markus Armbruster
Reviewers accepted v2 of the patch, but what got committed was v1, with the R-bys for v2. This is the
v1->v2followup fix.Signed-off-by Markus Armbruster <[email protected]>
Reviewed-by Amit Shah <[email protected]>
This fixes commit aded6539d983280212e08d09f14157b1cb4d58cc
Amit