diff options
| author | Juan Quintela <quintela@redhat.com> | 2011-10-19 15:22:18 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2011-10-20 13:23:52 +0200 |
| commit | 2975725f6b3d634dbe924ea9d9f4d86b8a5b217d (patch) | |
| tree | f6a28a67ab95c169cedd0aa237a45cf4e438c28a /block-migration.c | |
| parent | 42802d47dd09c6e70763676bb2ba59136427ec6a (diff) | |
| download | qemu-2975725f6b3d634dbe924ea9d9f4d86b8a5b217d.tar.gz qemu-2975725f6b3d634dbe924ea9d9f4d86b8a5b217d.tar.bz2 qemu-2975725f6b3d634dbe924ea9d9f4d86b8a5b217d.zip | |
migration: make *save_live return errors
Make *save_live() return negative values when there is one error, and
updates all callers to check for the error.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Diffstat (limited to 'block-migration.c')
| -rw-r--r-- | block-migration.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/block-migration.c b/block-migration.c index b8d19a1151..0bff07538b 100644 --- a/block-migration.c +++ b/block-migration.c @@ -557,6 +557,8 @@ static void blk_mig_cleanup(Monitor *mon) static int block_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque) { + int ret; + DPRINTF("Enter save live stage %d submitted %d transferred %d\n", stage, block_mig_state.submitted, block_mig_state.transferred); @@ -580,9 +582,10 @@ static int block_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque) flush_blks(f); - if (qemu_file_get_error(f)) { + ret = qemu_file_get_error(f); + if (ret) { blk_mig_cleanup(mon); - return 0; + return ret; } blk_mig_reset_dirty_cursor(); @@ -608,9 +611,10 @@ static int block_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque) flush_blks(f); - if (qemu_file_get_error(f)) { + ret = qemu_file_get_error(f); + if (ret) { blk_mig_cleanup(mon); - return 0; + return ret; } } @@ -625,8 +629,9 @@ static int block_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque) /* report completion */ qemu_put_be64(f, (100 << BDRV_SECTOR_BITS) | BLK_MIG_FLAG_PROGRESS); - if (qemu_file_get_error(f)) { - return 0; + ret = qemu_file_get_error(f); + if (ret) { + return ret; } monitor_printf(mon, "Block migration completed\n"); |