From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: Re: [PATCH 1/4] KVM: Fix x86_decode_insn() return code check Date: Thu, 13 Jan 2011 15:54:43 +0200 Message-ID: <4D2F0423.4050708@redhat.com> References: <1294146884-6253-1-git-send-email-avi@redhat.com> <1294146884-6253-2-git-send-email-avi@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit To: Marcelo Tosatti , kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:33642 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756834Ab1AMNyq (ORCPT ); Thu, 13 Jan 2011 08:54:46 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id p0DDskZl001749 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 13 Jan 2011 08:54:46 -0500 In-Reply-To: <1294146884-6253-2-git-send-email-avi@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: On 01/04/2011 03:14 PM, Avi Kivity wrote: > x86_decode_insn() doesn't return X86EMUL_* values, it returns > EMULATION_* codes. Adjust the check. > > Signed-off-by: Avi Kivity > --- > arch/x86/kvm/x86.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index fa708c9..b20499d 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -4391,7 +4391,7 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu, > vcpu->arch.emulate_ctxt.perm_ok = false; > > r = x86_decode_insn(&vcpu->arch.emulate_ctxt, insn, insn_len); > - if (r == X86EMUL_PROPAGATE_FAULT) > + if (r != EMULATION_OK) > goto done; > > trace_kvm_emulate_insn_start(vcpu); Strangely, this patch causes a failure in Windows XP. Dropping until submitter investigates and fixes. -- error compiling committee.c: too many arguments to function