gwj / at91sam9263 · Commits

Commit 2bb8c10c91c188fc23e624cc33e4c1886bcad08f

Authored by Glauber Costa
Committed by Anthony Liguori
1 parent fc5d642f

fix broken migration 

While fixing migration with -S, commit
89befdd1 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>
Inline Side-by-side
Showing 1 changed file with 3 additions and 1 deletions
... ... @@ -6087,8 +6087,10 @@ int main(int argc, char **argv, char **envp)
6087 6087 if (loadvm)
6088 6088 do_loadvm(cur_mon, loadvm);
6089 6089  
6090   - if (incoming)
  6090 + if (incoming) {
  6091 + autostart = 0;
6091 6092 qemu_start_incoming_migration(incoming);
  6093 + }
6092 6094  
6093 6095 if (autostart)
6094 6096 vm_start();
... ...