Patchwork block migration: propagate return value when bdrv_write() returns < 0

login
register
mail settings
Submitter Yoshiaki Tamura
Date July 20, 2010, 9:19 a.m.
Message ID <1279617540-17240-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp>
Download mbox | patch
Permalink /patch/59289/
State New
Headers show

Comments

Yoshiaki Tamura - July 20, 2010, 9:19 a.m.
Currently block_load() doesn't check return value of bdrv_write(), and
even the destination weren't prepared to execute block migration, it
proceeds and guest boots on the target.  This patch fix this issue.

Signed-off-by: Yoshiaki Tamura <tamura.yoshiaki@lab.ntt.co.jp>
---
 block-migration.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
Kevin Wolf - July 20, 2010, 10:24 a.m.
Am 20.07.2010 11:19, schrieb Yoshiaki Tamura:
> Currently block_load() doesn't check return value of bdrv_write(), and
> even the destination weren't prepared to execute block migration, it
> proceeds and guest boots on the target.  This patch fix this issue.
> 
> Signed-off-by: Yoshiaki Tamura <tamura.yoshiaki@lab.ntt.co.jp>

Thanks, applied to the block branch.

Kevin

Patch

diff --git a/block-migration.c b/block-migration.c
index a77106e..8eda307 100644
--- a/block-migration.c
+++ b/block-migration.c
@@ -586,6 +586,7 @@  static int block_load(QEMUFile *f, void *opaque, int version_id)
         addr >>= BDRV_SECTOR_BITS;
 
         if (flags & BLK_MIG_FLAG_DEVICE_BLOCK) {
+            int ret;
             /* get device name */
             len = qemu_get_byte(f);
             qemu_get_buffer(f, (uint8_t *)device_name, len);
@@ -601,9 +602,12 @@  static int block_load(QEMUFile *f, void *opaque, int version_id)
             buf = qemu_malloc(BLOCK_SIZE);
 
             qemu_get_buffer(f, buf, BLOCK_SIZE);
-            bdrv_write(bs, addr, buf, BDRV_SECTORS_PER_DIRTY_CHUNK);
+            ret = bdrv_write(bs, addr, buf, BDRV_SECTORS_PER_DIRTY_CHUNK);
 
             qemu_free(buf);
+            if (ret < 0) {
+                return ret;
+            }
         } else if (flags & BLK_MIG_FLAG_PROGRESS) {
             if (!banner_printed) {
                 printf("Receiving block device images\n");