diff options
| author | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-05 19:33:33 +0000 |
|---|---|---|
| committer | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-05 19:33:33 +0000 |
| commit | d3c26320473efa638a55588450dcbc7bd29fab61 (patch) | |
| tree | d0c9d7840fa21640f8cd3d4ea041fd6061fb05a8 | |
| parent | 7cc73776e7f8f87c9b99e021a088e7de52d268ec (diff) | |
| download | qemu-d3c26320473efa638a55588450dcbc7bd29fab61.tar.gz | |
propagate error on failed completion (Glauber Costa)
migrate_fd_put_ready() calls qemu_savevm_state_complete(),
but the later can fail.
If it happens, re-start the vm and propagate the error up
Based on a patch by Yaniv Kamay
Signed-off-by: Glauber Costa <glommer@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/branches/stable_0_10@7000 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | migration.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/migration.c b/migration.c index 0ef777adde..ee9e20e4bb 100644 --- a/migration.c +++ b/migration.c @@ -212,13 +212,19 @@ void migrate_fd_put_ready(void *opaque) dprintf("iterate\n"); if (qemu_savevm_state_iterate(s->file) == 1) { + int state; dprintf("done iterating\n"); vm_stop(0); bdrv_flush_all(); - qemu_savevm_state_complete(s->file); - s->state = MIG_STATE_COMPLETED; + if ((qemu_savevm_state_complete(s->file)) < 0) { + vm_start(); + state = MIG_STATE_ERROR; + } else { + state = MIG_STATE_COMPLETED; + } migrate_fd_cleanup(s); + s->state = state; } } |