From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MgLwe-0002N5-Rm for qemu-devel@nongnu.org; Wed, 26 Aug 2009 13:06:01 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MgLwW-0002BT-Kl for qemu-devel@nongnu.org; Wed, 26 Aug 2009 13:05:57 -0400 Received: from [199.232.76.173] (port=45779 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MgLwW-0002BD-AX for qemu-devel@nongnu.org; Wed, 26 Aug 2009 13:05:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9693) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MgLwV-0000XO-M2 for qemu-devel@nongnu.org; Wed, 26 Aug 2009 13:05:52 -0400 From: Glauber Costa Date: Wed, 26 Aug 2009 09:05:39 -0400 Message-Id: <1251291946-25821-6-git-send-email-glommer@redhat.com> In-Reply-To: <1251291946-25821-5-git-send-email-glommer@redhat.com> References: <1251291946-25821-1-git-send-email-glommer@redhat.com> <1251291946-25821-2-git-send-email-glommer@redhat.com> <1251291946-25821-3-git-send-email-glommer@redhat.com> <1251291946-25821-4-git-send-email-glommer@redhat.com> <1251291946-25821-5-git-send-email-glommer@redhat.com> Subject: [Qemu-devel] [PATCH 05/12] fix broken migration List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , aliguori@us.ibm.com 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 CC: Paolo Bonzini Signed-off-by: Anthony Liguori Signed-off-by: Glauber Costa --- vl.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/vl.c b/vl.c index 6cd0ce7..0e46727 100644 --- a/vl.c +++ b/vl.c @@ -5721,8 +5721,10 @@ int main(int argc, char **argv, char **envp) if (loadvm) do_loadvm(loadvm); - if (incoming) + if (incoming) { + autostart = 0; qemu_start_incoming_migration(incoming); + } if (autostart) vm_start(); -- 1.6.2.2