[Qemu-devel] [PATCH] fix migration to not require -S

[Paolo Bonzini <pbonzini@redhat.com>]

Since migration returns right away, starting the VM right
after calling qemu_start_incoming_migration is wrong even
if -S is not passed.

Cc: Glauber Costa  <glommer@redhat.com>
Cc: Anthony Liguori  <aliguori@us.ibm.com>
---
	Oh my gosh.  This is what I have in my tree and I did not squash
	it before sending out the patch to the list.  I guess that this
	monstrosity :-) explains my reaction to Glauber's patch.

	Anthony, I don't care if you apply my patch or his.

 vl.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/vl.c b/vl.c
index 845d185..d826968 100644
--- a/vl.c
+++ b/vl.c
@@ -6198,7 +6198,7 @@ int main(int argc, char **argv, char **envp)
     if (incoming)
         qemu_start_incoming_migration(incoming);
 
-    if (autostart)
+    else if (autostart)
         vm_start();
 
 #ifndef _WIN32
-- 
1.6.2.5