aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlauber Costa <glommer@redhat.com>2009-07-24 16:20:23 -0400
committerAnthony Liguori <aliguori@us.ibm.com>2009-07-27 14:09:15 -0500
commit2bb8c10c91c188fc23e624cc33e4c1886bcad08f (patch)
tree383e8abb6e18b3b5c414734623eb66ec70941893
parentfc5d642fcae392bbc9fed9ac6bc78ac29ed48372 (diff)
fix broken migration
While fixing migration with -S, commit 89befdd1a6b18215153b8976682d57b7d03d5782 broke the rest of us. Poor glommer, with a poor family, spare him his life from this monstruosity. Since the unconditional vm_start, not autostart was the villain, I'm putting back autostart. Let me know if you prefer other solutions, it doesn't really matter, doesn't really matter to me. Any way the wind blows... Signed-off-by: Glauber Costa <glommer@redhat.com> CC: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--vl.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/vl.c b/vl.c
index 2152f6ae53..bdf2fe8f12 100644
--- a/vl.c
+++ b/vl.c
@@ -6087,8 +6087,10 @@ int main(int argc, char **argv, char **envp)
if (loadvm)
do_loadvm(cur_mon, loadvm);
- if (incoming)
+ if (incoming) {
+ autostart = 0;
qemu_start_incoming_migration(incoming);
+ }
if (autostart)
vm_start();