From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: Re: [PATCH v2 04/22] KVM: x86: introduce vcpu_gva_to_gpa to cleanup the code Date: Wed, 29 Jun 2011 11:24:09 +0300 Message-ID: <4E0AE129.1070200@redhat.com> References: <4E01FBC9.3020009@cn.fujitsu.com> <4E01FC5B.9040809@cn.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: Marcelo Tosatti , LKML , KVM To: Xiao Guangrong Return-path: Received: from mx1.redhat.com ([209.132.183.28]:55653 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753824Ab1F2IYO (ORCPT ); Wed, 29 Jun 2011 04:24:14 -0400 In-Reply-To: <4E01FC5B.9040809@cn.fujitsu.com> Sender: kvm-owner@vger.kernel.org List-ID: On 06/22/2011 05:29 PM, Xiao Guangrong wrote: > Introduce vcpu_gva_to_gpa to translate the gva to gpa, we can use it > to cleanup the code between read emulation and write emulation > > Signed-off-by: Xiao Guangrong > --- > arch/x86/kvm/x86.c | 38 +++++++++++++++++++++++++++++--------- > 1 files changed, 29 insertions(+), 9 deletions(-) > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index eb27be4..c29ef96 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -3944,6 +3944,27 @@ out: > } > EXPORT_SYMBOL_GPL(kvm_write_guest_virt_system); > > +static int vcpu_gva_to_gpa(struct kvm_vcpu *vcpu, unsigned long gva, > + gpa_t *gpa, struct x86_exception *exception, > + bool write) > +{ > + u32 access = (kvm_x86_ops->get_cpl(vcpu) == 3) ? PFERR_USER_MASK : 0; > + > + if (write) > + access |= PFERR_WRITE_MASK; Needs fetch as well so NX/SMEP can work. > + > + *gpa = vcpu->arch.walk_mmu->gva_to_gpa(vcpu, gva, access, exception); -- error compiling committee.c: too many arguments to function