[Qemu-devel] [6323] bdrv_write should not stop on partial write (Gleb Natapov)

[Anthony Liguori]

Revision: 6323
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6323
Author:   aliguori
Date:     2009-01-15 20:43:39 +0000 (Thu, 15 Jan 2009)

Log Message:
-----------
bdrv_write should not stop on partial write (Gleb Natapov)

Should return real error instead.

Signed-off-by: Gleb Natapov <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>

Modified Paths:
--------------
    trunk/block.c

Modified: trunk/block.c
===================================================================
--- trunk/block.c       2009-01-15 20:37:28 UTC (rev 6322)
+++ trunk/block.c       2009-01-15 20:43:39 UTC (rev 6323)
@@ -565,21 +565,22 @@
     if (bs->read_only)
         return -EACCES;
     if (drv->bdrv_pwrite) {
-        int ret, len;
+        int ret, len, count = 0;
         len = nb_sectors * 512;
-        ret = drv->bdrv_pwrite(bs, sector_num * 512, buf, len);
-        if (ret < 0)
-            return ret;
-        else if (ret != len)
-            return -EIO;
-        else {
-           bs->wr_bytes += (unsigned) len;
-           bs->wr_ops ++;
-            return 0;
-       }
-    } else {
-        return drv->bdrv_write(bs, sector_num, buf, nb_sectors);
+        do {
+            ret = drv->bdrv_pwrite(bs, sector_num * 512, buf, len - count);
+            if (ret < 0) {
+                printf("bdrv_write ret=%d\n", ret);
+                return ret;
+            }
+            count += ret;
+            buf += ret;
+        } while (count != len);
+        bs->wr_bytes += (unsigned) len;
+        bs->wr_ops ++;
+        return 0;
     }
+    return drv->bdrv_write(bs, sector_num, buf, nb_sectors);
 }
 
 static int bdrv_pread_em(BlockDriverState *bs, int64_t offset,