From 2bb8c10c91c188fc23e624cc33e4c1886bcad08f Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Fri, 24 Jul 2009 16:20:23 -0400 Subject: [PATCH] fix broken migration 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 --- vl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vl.c b/vl.c index 2152f6ae5..bdf2fe8f1 100644 --- a/vl.c +++ b/vl.c @@ -6087,8 +6087,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(); -- 2.39.2