OSDN Git Service
(root)
/
qmiga
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1889465
)
Make sure to only vm_start() a failed migration if we were running to begin
author
Anthony Liguori
<aliguori@us.ibm.com>
Thu, 9 Jul 2009 18:25:47 +0000
(13:25 -0500)
committer
Anthony Liguori
<aliguori@us.ibm.com>
Thu, 9 Jul 2009 21:58:08 +0000
(16:58 -0500)
with.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
migration.c
patch
|
blob
|
history
diff --git
a/migration.c
b/migration.c
index
190b37e
..
e6c8b16
100644
(file)
--- a/
migration.c
+++ b/
migration.c
@@
-261,12
+261,16
@@
void migrate_fd_put_ready(void *opaque)
dprintf("iterate\n");
if (qemu_savevm_state_iterate(s->file) == 1) {
int state;
+ int old_vm_running = vm_running;
+
dprintf("done iterating\n");
vm_stop(0);
bdrv_flush_all();
if ((qemu_savevm_state_complete(s->file)) < 0) {
- vm_start();
+ if (old_vm_running) {
+ vm_start();
+ }
state = MIG_STATE_ERROR;
} else {
state = MIG_STATE_COMPLETED;