[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 38/41] block-migration: handle errors with the retur
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 38/41] block-migration: handle errors with the return codes correctly |
Date: |
Fri, 21 Sep 2012 10:47:32 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
block-migration.c | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/block-migration.c b/block-migration.c
index 565628f..9f94733 100644
--- a/block-migration.c
+++ b/block-migration.c
@@ -423,10 +423,9 @@ static int mig_save_device_dirty(QEMUFile *f,
BlkMigDevState *bmds,
error:
DPRINTF("Error reading sector %" PRId64 "\n", sector);
- qemu_file_set_error(f, ret);
g_free(blk->buf);
g_free(blk);
- return 0;
+ return ret;
}
/* return value:
@@ -440,7 +439,7 @@ static int blk_mig_save_dirty_block(QEMUFile *f, int
is_async)
QSIMPLEQ_FOREACH(bmds, &block_mig_state.bmds_list, entry) {
ret = mig_save_device_dirty(f, bmds, is_async);
- if (ret == 0) {
+ if (ret <= 0) {
break;
}
}
@@ -598,12 +597,17 @@ static int block_save_iterate(QEMUFile *f, void *opaque)
block_mig_state.bulk_completed = 1;
}
} else {
- if (blk_mig_save_dirty_block(f, 1) != 0) {
+ ret = blk_mig_save_dirty_block(f, 1);
+ if (ret != 0) {
/* no more dirty blocks */
break;
}
}
}
+ if (ret) {
+ blk_mig_cleanup();
+ return ret;
+ }
ret = flush_blks(f);
if (ret) {
@@ -635,18 +639,15 @@ static int block_save_complete(QEMUFile *f, void *opaque)
all async read completed */
assert(block_mig_state.submitted == 0);
- while (blk_mig_save_dirty_block(f, 0) == 0) {
+ while ((ret = blk_mig_save_dirty_block(f, 0)) == 0) {
/* Do nothing */
}
blk_mig_cleanup();
-
- /* report completion */
- qemu_put_be64(f, (100 << BDRV_SECTOR_BITS) | BLK_MIG_FLAG_PROGRESS);
-
- ret = qemu_file_get_error(f);
if (ret) {
return ret;
}
+ /* report completion */
+ qemu_put_be64(f, (100 << BDRV_SECTOR_BITS) | BLK_MIG_FLAG_PROGRESS);
DPRINTF("Block migration completed\n");
--
1.7.11.4
- [Qemu-devel] [PATCH 27/41] savevm: unexport qemu_fflush, (continued)
- [Qemu-devel] [PATCH 27/41] savevm: unexport qemu_fflush, Juan Quintela, 2012/09/21
- [Qemu-devel] [PATCH 23/41] buffered_file: We can access directly to bandwidth_limit, Juan Quintela, 2012/09/21
- [Qemu-devel] [PATCH 26/41] migration: make migrate_fd_wait_for_unfreeze() return errors, Juan Quintela, 2012/09/21
- [Qemu-devel] [PATCH 29/41] savevm: Remove qemu_fseek(), Juan Quintela, 2012/09/21
- [Qemu-devel] [PATCH 30/41] savevm: make qemu_fflush() return an error code, Juan Quintela, 2012/09/21
- [Qemu-devel] [PATCH 38/41] block-migration: handle errors with the return codes correctly,
Juan Quintela <=
- [Qemu-devel] [PATCH 40/41] savevm: make qemu_file_put_notify() return errors, Juan Quintela, 2012/09/21
- [Qemu-devel] [PATCH 36/41] block-migration: make flush_blks() return errors, Juan Quintela, 2012/09/21
- [Qemu-devel] [PATCH 39/41] savevm: un-export qemu_file_set_error(), Juan Quintela, 2012/09/21
- [Qemu-devel] [PATCH 25/41] buffered_file: make buffered_flush return the error code, Juan Quintela, 2012/09/21