From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paolo Bonzini Subject: Re: [PATCH 10/11] nEPT: Miscelleneous cleanups Date: Mon, 29 Apr 2013 17:12:31 +0200 Message-ID: <517E8DDF.3090508@redhat.com> References: <1366958611-6935-1-git-send-email-jun.nakajima@intel.com> <1366958611-6935-2-git-send-email-jun.nakajima@intel.com> <1366958611-6935-3-git-send-email-jun.nakajima@intel.com> <1366958611-6935-4-git-send-email-jun.nakajima@intel.com> <1366958611-6935-5-git-send-email-jun.nakajima@intel.com> <1366958611-6935-6-git-send-email-jun.nakajima@intel.com> <1366958611-6935-7-git-send-email-jun.nakajima@intel.com> <1366958611-6935-8-git-send-email-jun.nakajima@intel.com> <1366958611-6935-9-git-send-email-jun.nakajima@intel.com> <1366958611-6935-10-git-send-email-jun.nakajima@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org To: Jun Nakajima Return-path: Received: from mail-qe0-f50.google.com ([209.85.128.50]:34204 "EHLO mail-qe0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751026Ab3D2PMs (ORCPT ); Mon, 29 Apr 2013 11:12:48 -0400 Received: by mail-qe0-f50.google.com with SMTP id k5so2561029qej.37 for ; Mon, 29 Apr 2013 08:12:47 -0700 (PDT) In-Reply-To: <1366958611-6935-10-git-send-email-jun.nakajima@intel.com> Sender: kvm-owner@vger.kernel.org List-ID: Il 26/04/2013 08:43, Jun Nakajima ha scritto: > Some trivial code cleanups not really related to nested EPT. > > Signed-off-by: Nadav Har'El > Signed-off-by: Jun Nakajima > Signed-off-by: Xinhao Xu > --- > arch/x86/kvm/vmx.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c > index c67eb06..95304cc 100644 > --- a/arch/x86/kvm/vmx.c > +++ b/arch/x86/kvm/vmx.c > @@ -616,7 +616,6 @@ static void nested_release_page_clean(struct page *page) > static u64 construct_eptp(unsigned long root_hpa); > static void kvm_cpu_vmxon(u64 addr); > static void kvm_cpu_vmxoff(void); > -static void vmx_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3); > static int vmx_set_tss_addr(struct kvm *kvm, unsigned int addr); > static void vmx_set_segment(struct kvm_vcpu *vcpu, > struct kvm_segment *var, int seg); > @@ -912,8 +911,7 @@ static inline bool nested_cpu_has2(struct vmcs12 *vmcs12, u32 bit) > (vmcs12->secondary_vm_exec_control & bit); > } > > -static inline bool nested_cpu_has_virtual_nmis(struct vmcs12 *vmcs12, > - struct kvm_vcpu *vcpu) > +static inline bool nested_cpu_has_virtual_nmis(struct vmcs12 *vmcs12) > { > return vmcs12->pin_based_vm_exec_control & PIN_BASED_VIRTUAL_NMIS; > } > @@ -6321,7 +6319,7 @@ static int vmx_handle_exit(struct kvm_vcpu *vcpu) > > if (unlikely(!cpu_has_virtual_nmis() && vmx->soft_vnmi_blocked && > !(is_guest_mode(vcpu) && nested_cpu_has_virtual_nmis( > - get_vmcs12(vcpu), vcpu)))) { > + get_vmcs12(vcpu))))) { > if (vmx_interrupt_allowed(vcpu)) { > vmx->soft_vnmi_blocked = 0; > } else if (vmx->vnmi_blocked_time > 1000000000LL && > Reviewed-by: Paolo Bonzini