From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MVXR7-0004O4-0E for qemu-devel@nongnu.org; Mon, 27 Jul 2009 17:08:45 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MVXR2-0004NL-H6 for qemu-devel@nongnu.org; Mon, 27 Jul 2009 17:08:44 -0400 Received: from [199.232.76.173] (port=48563 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MVXR2-0004NI-8a for qemu-devel@nongnu.org; Mon, 27 Jul 2009 17:08:40 -0400 Received: from mx2.redhat.com ([66.187.237.31]:50772) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MVXR1-0001vf-Ms for qemu-devel@nongnu.org; Mon, 27 Jul 2009 17:08:40 -0400 From: Paolo Bonzini Date: Mon, 27 Jul 2009 23:08:35 +0200 Message-Id: <1248728915-4984-1-git-send-email-pbonzini@redhat.com> In-Reply-To: <20090727201855.GK4776@poweredge.glommer> References: <20090727201855.GK4776@poweredge.glommer> Subject: [Qemu-devel] [PATCH] fix migration to not require -S List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Glauber Costa , Anthony Liguori 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 Cc: Anthony Liguori --- 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