fix broken migration

While fixing migration with -S, commit
89befdd1a6 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 <glommer@redhat.com>
CC: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Glauber Costa 2009-07-24 16:20:23 -04:00 committed by Anthony Liguori
parent f833ef2133
commit 1d600827f6
1 changed files with 3 additions and 1 deletions

4
vl.c
View File

@ -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();