Patchwork [05/12] fix broken migration

login
register
mail settings
Submitter Glauber Costa
Date Aug. 26, 2009, 1:05 p.m.
Message ID <1251291946-25821-6-git-send-email-glommer@redhat.com>
Download mbox | patch
Permalink /patch/32164/
State Superseded
Headers show

Comments

Glauber Costa - Aug. 26, 2009, 1:05 p.m.
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 <glommer@redhat.com>
CC: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Glauber Costa <glommer@redhat.com>
---
 vl.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
Paolo Bonzini - Aug. 26, 2009, 6:15 p.m.
On 08/26/2009 03:05 PM, Glauber Costa wrote:
> 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...

This patch is superseded by 06/12 (in fact 06/12 was meant that way for 
trunk as well) and has already been reverted in Anthony's queue.

Paolo
Glauber Costa - Aug. 27, 2009, 5:36 p.m.
On Thu, Aug 27, 2009 at 12:33:44AM +0200, Juan Quintela wrote:
> Glauber Costa <glommer@redhat.com> wrote:
> > 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...
> 
> Please drop this one.  I agree with bonzini here.
> It breaks completely incoming migration, and conflicts with semantics of
> next one.
wrong semantics is not a problem here, as long as we keep the same semantics.

For master, I can agree that the work you've done leave us at a better shape, but
for stable-0.10, this patch is totally needed for migration to work.
Paolo Bonzini - Aug. 28, 2009, 7:47 a.m.
>> Please drop this one.  I agree with bonzini here.
>> It breaks completely incoming migration, and conflicts with semantics of
>> next one.
> wrong semantics is not a problem here, as long as we keep the same semantics.
>
> For master, I can agree that the work you've done leave us at a better shape, but
> for stable-0.10, this patch is totally needed for migration to work.

Not at all, 6/12 (in particular changing the if to else if) does the same.

Paolo

Patch

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