From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MURFn-0008Hp-J9 for qemu-devel@nongnu.org; Fri, 24 Jul 2009 16:20:31 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MURFi-0008CK-R3 for qemu-devel@nongnu.org; Fri, 24 Jul 2009 16:20:31 -0400 Received: from [199.232.76.173] (port=38232 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MURFi-0008CH-KH for qemu-devel@nongnu.org; Fri, 24 Jul 2009 16:20:26 -0400 Received: from mx2.redhat.com ([66.187.237.31]:55719) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MURFi-0003H9-6T for qemu-devel@nongnu.org; Fri, 24 Jul 2009 16:20:26 -0400 From: Glauber Costa Date: Fri, 24 Jul 2009 16:20:23 -0400 Message-Id: <1248466823-12707-1-git-send-email-glommer@redhat.com> Subject: [Qemu-devel] [PATCH] 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 --- 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