Message ID | 991e83f9676e77bb3a396d1544756b89cba7d373.1250646771.git.quintela@redhat.com |
---|---|
State | Superseded |
Headers | show |
On 08/19/2009 04:07 AM, Juan Quintela wrote: > Signed-off-by: Juan Quintela<quintela@redhat.com> > --- > vl.c | 6 ++---- > 1 files changed, 2 insertions(+), 4 deletions(-) This is effectively reverting 2bb8c10c (more or less) and is already in Anthony's queue. Paolo
Reply-to: quintela@redhat.com Paolo Bonzini <bonzini@gnu.org> wrote: > On 08/19/2009 04:07 AM, Juan Quintela wrote: >> Signed-off-by: Juan Quintela<quintela@redhat.com> >> --- >> vl.c | 6 ++---- >> 1 files changed, 2 insertions(+), 4 deletions(-) > > This is effectively reverting 2bb8c10c (more or less) and is already > in Anthony's queue. But the series make everything work as expected and consistently, just now it is a mess :( Later, Juan.
On 08/19/2009 11:18 AM, Juan Quintela wrote: > Reply-to: quintela@redhat.com > Paolo Bonzini<bonzini@gnu.org> wrote: >> On 08/19/2009 04:07 AM, Juan Quintela wrote: >>> Signed-off-by: Juan Quintela<quintela@redhat.com> >>> --- >>> vl.c | 6 ++---- >>> 1 files changed, 2 insertions(+), 4 deletions(-) >> >> This is effectively reverting 2bb8c10c (more or less) and is already >> in Anthony's queue. > > But the series make everything work as expected and consistently, just > now it is a mess :( I was not saying it is wrong, just that it is unnecessary when applied on aliguori-queue.git. :-) Paolo
diff --git a/vl.c b/vl.c index 66246af..e86bdce 100644 --- a/vl.c +++ b/vl.c @@ -6040,12 +6040,10 @@ int main(int argc, char **argv, char **envp) do_loadvm(cur_mon, loadvm); if (incoming) { - autostart = 0; qemu_start_incoming_migration(incoming); - } - - else if (autostart) + } else if (autostart) { vm_start(); + } #ifndef _WIN32 if (daemonize) {
Signed-off-by: Juan Quintela <quintela@redhat.com> --- vl.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-)