From patchwork Sun May 19 04:52:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Nakajima, Jun" X-Patchwork-Id: 2589731 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id EB093DFB79 for ; Sun, 19 May 2013 04:53:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752113Ab3ESExF (ORCPT ); Sun, 19 May 2013 00:53:05 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:38863 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751371Ab3ESExD (ORCPT ); Sun, 19 May 2013 00:53:03 -0400 Received: by mail-pa0-f47.google.com with SMTP id kl13so4688665pab.6 for ; Sat, 18 May 2013 21:53:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=0Mui3eh7nrdOSSf6yZUuh6bPvXZeZCryhnGqUwuFuEo=; b=RrJ1GkSYJ9xqREJgEXVzOfLZ3xnUt32fmEz21lmERXI3ue9PwAyo2oXNPPH21lg+f+ ouxzkSw//mX3uG9zMIuwQGv9KcSDkpvd1ttawYY5rTf7qAbCIoVwfzOHlEr99ycdQMLE oLtOZ+2xjskVUvOr3f4KWqQk+5DaTtaNRDvoCkzOJryY8J47GY8VnKPzd4GzpIQ1PVCU 5WNzjXXw7x/jrO4HNIOoBuMHrRxpNYgyTqUPiX05LczhzTxz0cBJsf68Xt3DaFebMADO JAX5zE5jzJ1An6Pp7bc0jxaUbAWjHCyUD+L9H2BLjcXi6OEblWdZ4b2PpuKRP7bj4Tqe p3Qw== X-Received: by 10.68.111.228 with SMTP id il4mr742995pbb.134.1368939182946; Sat, 18 May 2013 21:53:02 -0700 (PDT) Received: from localhost (c-98-207-34-191.hsd1.ca.comcast.net. [98.207.34.191]) by mx.google.com with ESMTPSA id cd2sm18199280pbd.35.2013.05.18.21.53.01 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 18 May 2013 21:53:02 -0700 (PDT) From: Jun Nakajima To: kvm@vger.kernel.org Cc: Gleb Natapov , Paolo Bonzini Subject: [PATCH v3 11/13] nEPT: Miscelleneous cleanups Date: Sat, 18 May 2013 21:52:30 -0700 Message-Id: <1368939152-11406-11-git-send-email-jun.nakajima@intel.com> X-Mailer: git-send-email 1.8.2.1.610.g562af5b In-Reply-To: <1368939152-11406-1-git-send-email-jun.nakajima@intel.com> References: <1368939152-11406-1-git-send-email-jun.nakajima@intel.com> X-Gm-Message-State: ALoCoQmOCSJLCZ6xIAXTUpWiUMJLk/Iq2BzPnhlTmaL80/iNdDsk3lJBlIvO5k7zUlNXxziT7/6L Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Nadav Har'El 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 Reviewed-by: Paolo Bonzini --- 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 d9d991d..ec4e9b9 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -714,7 +714,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); @@ -1039,8 +1038,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; } @@ -6737,7 +6735,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 &&