Received: by 2002:a25:e74b:0:0:0:0:0 with SMTP id e72csp927444ybh; Wed, 15 Jul 2020 20:43:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyMKdDnF84xbaUQcJux/8mEYKAmWjNgthLvtT+yubTe5U1Ldg89dqkZ+XV7vj1MmV/FTx6H X-Received: by 2002:a17:906:c35a:: with SMTP id ci26mr1828512ejb.451.1594871022241; Wed, 15 Jul 2020 20:43:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594871022; cv=none; d=google.com; s=arc-20160816; b=FX7cRy3aC55XfjMiaigBf+PbLjqgYQburmaUqE9NPji3PGVqgdbD6ANJwRLOgv8e3k surt/bN8U/NYe2dOhAffXptO/y8mylMD7N+cb8uRXYQQ3BDKyxmKPCt/2qHC9/yFC6sT 322Vu+oCZ/9IyeHlPrnIEOg2f3lIm5+t3hDelr4YbhK6XGHW6rz3BxIjgH4b7wSoDjfc abQvZ6LxhAl/aajHHJVwrxpFTrSDXjPdq1eicsgrvRnhnWtA5O/SkB1JfUu3GWzdzS7G cO3LiTIWtVSY0N2Lefp5vW0GrYU+LnTjwUSrN2DN4yVvrqEDZrlQsJvsEw6mQQJNFEMy solQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:ironport-sdr; bh=m4z7X3A/lrXNmyCQC/FlWF6IrtHyR08uDetfzzo/o5s=; b=QeUEEUmzOgj0NjPwriMZ9mpdfAJG64TbZYdgyNmcr82fpyOm8tbhwToI7p+dGJFHMB 2MHBdjhfBfs1Nuc02ApHE7MzOUkRiBx9DeGS18AiobNpcDSQWwuMSydLyeu2NJp66s3r qaS1HKtCrypkFIM6s/4OUh0xbGIRVeSl5Mj795wniHobYF5v1cACVw4xY0+8AvDkBN+G mJ4vjyUvY9JOGEEECeJq4bZ/0XPEThS0tP2FtGRNG9sdHnb2ezDtfzmmQ198iN2TT3K8 WfTPoQ6G6S4HXyctVYsn+bKk06bZFr4rUTP6+1wnYVztVtQRstJVp8K5HzKLSWHDPcr3 wWBA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p13si2462567edh.504.2020.07.15.20.43.19; Wed, 15 Jul 2020 20:43:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728400AbgGPDmK (ORCPT + 99 others); Wed, 15 Jul 2020 23:42:10 -0400 Received: from mga11.intel.com ([192.55.52.93]:49384 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728202AbgGPDl0 (ORCPT ); Wed, 15 Jul 2020 23:41:26 -0400 IronPort-SDR: fLzG9b6lmKg2YBCoJM/45TDACijhxLzDreKEy6Mlsc2Zwcwyc21WYlMv1dwwSljKReG1iBF1T1 tNkqmiILV9tA== X-IronPort-AV: E=McAfee;i="6000,8403,9683"; a="147310951" X-IronPort-AV: E=Sophos;i="5.75,357,1589266800"; d="scan'208";a="147310951" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jul 2020 20:41:25 -0700 IronPort-SDR: fa9qogkE5TPLIpNxA3ic3sDUw9W8G5Z6UWTIwe8yvaXMqX5/jJcK9Dvdq6PSitV7rFoEEYFtCA Y2MlNDXb7odA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,357,1589266800"; d="scan'208";a="316905480" Received: from sjchrist-coffee.jf.intel.com ([10.54.74.152]) by orsmga008.jf.intel.com with ESMTP; 15 Jul 2020 20:41:24 -0700 From: Sean Christopherson To: Paolo Bonzini Cc: Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/9] KVM: VMX: Make vmx_load_mmu_pgd() static Date: Wed, 15 Jul 2020 20:41:17 -0700 Message-Id: <20200716034122.5998-5-sean.j.christopherson@intel.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200716034122.5998-1-sean.j.christopherson@intel.com> References: <20200716034122.5998-1-sean.j.christopherson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Make vmx_load_mmu_pgd() static as it is no longer invoked directly by nested VMX (or any code for that matter). No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/kvm/vmx/vmx.c | 2 +- arch/x86/kvm/vmx/vmx.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 1bb59ae5016dc..791baa73e5786 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -3092,7 +3092,7 @@ u64 construct_eptp(struct kvm_vcpu *vcpu, unsigned long root_hpa) return eptp; } -void vmx_load_mmu_pgd(struct kvm_vcpu *vcpu, unsigned long pgd) +static void vmx_load_mmu_pgd(struct kvm_vcpu *vcpu, unsigned long pgd) { struct kvm *kvm = vcpu->kvm; bool update_guest_cr3 = true; diff --git a/arch/x86/kvm/vmx/vmx.h b/arch/x86/kvm/vmx/vmx.h index 0e8d25b0cec35..3c55433ac1b21 100644 --- a/arch/x86/kvm/vmx/vmx.h +++ b/arch/x86/kvm/vmx/vmx.h @@ -338,7 +338,6 @@ void vmx_set_efer(struct kvm_vcpu *vcpu, u64 efer); void vmx_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0); int vmx_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4); void set_cr4_guest_host_mask(struct vcpu_vmx *vmx); -void vmx_load_mmu_pgd(struct kvm_vcpu *vcpu, unsigned long cr3); void ept_save_pdptrs(struct kvm_vcpu *vcpu); void vmx_get_segment(struct kvm_vcpu *vcpu, struct kvm_segment *var, int seg); void vmx_set_segment(struct kvm_vcpu *vcpu, struct kvm_segment *var, int seg); -- 2.26.0