qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PATCH v3] qemu_file: use fwrite() correctly


From: Juan Quintela
Subject: [Qemu-devel] [PATCH v3] qemu_file: use fwrite() correctly
Date: Tue, 18 Feb 2014 16:56:36 +0100

fwrite() returns the number of items written.  But when there is one
error, it can return a short write.

In the particular bug that I was tracking, I did a migration to a
read-only filesystem.  And it was able to finish the migration
correctly.  fwrite() never returned a negative error code, nor zero,
always 4096. (migration writes chunks of about 14000 bytes).  And it
was able to "complete" the migration with success (yes, reading the
file was a bit more difficult).

To add insult to injury, if your amount of memory was big enough (12GB
on my case), it overwrote some important structure, and from them,
malloc failed.  This check makes the problem go away.

Signed-off-by: Juan Quintela <address@hidden>
---

v3: fwrite don't set errno in all cases.

v2: a.k.a Paolo was right

    On the first call to fwrite() it returns 0, and errno is setup to
    EPIPE, exactly what we wanted.

    Once here, improve the commit message.


 qemu-file.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/qemu-file.c b/qemu-file.c
index 9473b67..4d5465e 100644
--- a/qemu-file.c
+++ b/qemu-file.c
@@ -100,7 +100,17 @@ static int stdio_put_buffer(void *opaque, const uint8_t 
*buf, int64_t pos,
                             int size)
 {
     QEMUFileStdio *s = opaque;
-    return fwrite(buf, 1, size, s->stdio_file);
+    int res;
+
+    res = fwrite(buf, 1, size, s->stdio_file);
+
+    if (res != size) {
+        if (errno) {
+            return -errno;
+        }
+        return -EIO;   /* fake errno value */
+    }
+    return res;
 }

 static int stdio_get_buffer(void *opaque, uint8_t *buf, int64_t pos, int size)
-- 
1.8.5.3




reply via email to

[Prev in Thread] Current Thread [Next in Thread]