Skip to contentSkip to conversation

qemu_file: Fix mismerge of "use fwrite() correctly"

PATCH In review Markus Armbruster 3 participants 3 messages Feb 27, 2014 – Mar 6, 2014

lore
Share & tools
lore
#0 lore raw

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.

---
 qemu-file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
qemu-file.c +1 -1
index f074af1..e5ec798 100644
@@ -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
Reviewed-by on v1 1/1
#1 lore raw
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->v2 followup fix.

Ouch.

Quoted 5 lines
---
 qemu-file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 15 lines
qemu-file.c +1 -1
index f074af1..e5ec798 100644
@@ -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