From patchwork Fri May 8 20:06:58 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glauber Costa X-Patchwork-Id: 22654 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n48K7PCN015085 for ; Fri, 8 May 2009 20:07:26 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758128AbZEHUHA (ORCPT ); Fri, 8 May 2009 16:07:00 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755189AbZEHUG7 (ORCPT ); Fri, 8 May 2009 16:06:59 -0400 Received: from mx2.redhat.com ([66.187.237.31]:53293 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756712AbZEHUG7 (ORCPT ); Fri, 8 May 2009 16:06:59 -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 n48K70Cl010347 for ; Fri, 8 May 2009 16:07:00 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n48K6x94009870; Fri, 8 May 2009 16:06:59 -0400 Received: from localhost.localdomain (virtlab1.virt.bos.redhat.com [10.16.72.21]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n48K6wMj026657; Fri, 8 May 2009 16:06:58 -0400 From: Glauber Costa To: kvm@vger.kernel.org Cc: avi@redhat.com Subject: [PATCH] make migration work again Date: Fri, 8 May 2009 16:06:58 -0400 Message-Id: <1241813218-28435-1-git-send-email-glommer@redhat.com> X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org 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(-) 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; + for(i = 0; i < CPU_NB_REGS; i++) qemu_get_betls(f, &env->regs[i]); qemu_get_betls(f, &env->eip);