From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: Re: [PATCH] make migration work again Date: Sun, 10 May 2009 15:51:53 +0300 Message-ID: <4A06CDE9.5080800@redhat.com> References: <1241813218-28435-1-git-send-email-glommer@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org To: Glauber Costa Return-path: Received: from mx2.redhat.com ([66.187.237.31]:57900 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752591AbZEJMwy (ORCPT ); Sun, 10 May 2009 08:52:54 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n4ACqtgg002384 for ; Sun, 10 May 2009 08:52:55 -0400 In-Reply-To: <1241813218-28435-1-git-send-email-glommer@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: Glauber Costa wrote: > Due to a small messup in version checking, migration was not working. > fix it. > > Signed-off-by: Glauber Costa > --- > migration-tcp.c | 1 + > savevm.c | 1 + > target-i386/helper.c | 1 + > target-i386/machine.c | 8 ++++---- > 4 files changed, 7 insertions(+), 4 deletions(-) > > Strange diffstat. > diff --git a/target-i386/machine.c b/target-i386/machine.c > index 7f75d31..c1e05c5 100644 > --- a/target-i386/machine.c > +++ b/target-i386/machine.c > @@ -194,11 +194,11 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id) > int32_t a20_mask; > > if (version_id != 3 && version_id != 4 && version_id != 5 > - && version_id != 6 && version_id != 7 && version_id != 8) > - return -EINVAL; > - /* KVM cannot accept migrations from QEMU today */ > - if (version_id != 9) > + && version_id != 6 && version_id != 7 && version_id != 8 > + /* KVM cannot accept migrations from QEMU today */ > + && version_id != 9) > return -EINVAL; > I think you want to remove the first line as well? Only accept version_id == 9? And keep the comment. -- error compiling committee.c: too many arguments to function