[Qemu-devel] [PATCH] fix broken migration

[Glauber Costa]

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 <address@hidden>
CC: Paolo Bonzini <address@hidden>
---
 vl.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/vl.c b/vl.c
index ce213c2..015f631 100644
--- a/vl.c
+++ b/vl.c
@@ -6075,8 +6075,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();
-- 
1.6.2.2