[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 3/3] propagate error on failed completion
From: |
Glauber Costa |
Subject: |
[Qemu-devel] [PATCH v2 3/3] propagate error on failed completion |
Date: |
Tue, 31 Mar 2009 16:31:36 -0400 |
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 <address@hidden>
CC: Yaniv Kamay <address@hidden>
CC: Dor Laor <address@hidden>
---
migration.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/migration.c b/migration.c
index b3904b2..859d945 100644
--- a/migration.c
+++ b/migration.c
@@ -220,13 +220,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;
}
}
--
1.5.6.6