Commit a789aeba authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Paolo Bonzini
Browse files

KVM: VMX: Rename "vmx/evmcs.{ch}" to "vmx/hyperv.{ch}" 



To conform with SVM, rename VMX specific Hyper-V files from "evmcs.{ch}"
to "hyperv.{ch}". While Enlightened VMCS is a lion's share of these
files, some stuff (e.g. enlightened MSR bitmap, the upcoming Hyper-V
L2 TLB flush, ...) goes beyond that.

Reviewed-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-Id: <20221101145426.251680-7-vkuznets@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent b83237ad

arch/x86/kvm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ kvm-$(CONFIG_KVM_XEN) += xen.o 
kvm-$(CONFIG_KVM_SMM)	+= smm.o



kvm-intel-y		+= vmx/vmx.o vmx/vmenter.o vmx/pmu_intel.o vmx/vmcs12.o \

			   vmx/evmcs.o vmx/nested.o vmx/posted_intr.o

			   vmx/hyperv.o vmx/nested.o vmx/posted_intr.o

kvm-intel-$(CONFIG_X86_SGX_KVM)	+= vmx/sgx.o



kvm-amd-y		+= svm/svm.o svm/vmenter.o svm/pmu.o svm/nested.o svm/avic.o svm/sev.o

arch/x86/kvm/vmx/evmcs.c→arch/x86/kvm/vmx/hyperv.c

+1 −2
Original line number Diff line number Diff line
@@ -3,9 +3,8 @@ 
#include <linux/errno.h>

#include <linux/smp.h>



#include "../hyperv.h"

#include "../cpuid.h"

#include "evmcs.h"

#include "hyperv.h"

#include "vmcs.h"

#include "vmx.h"

#include "trace.h"

arch/x86/kvm/vmx/evmcs.h→arch/x86/kvm/vmx/hyperv.h

+5 −3
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __KVM_X86_VMX_EVMCS_H

#define __KVM_X86_VMX_EVMCS_H

#ifndef __KVM_X86_VMX_HYPERV_H

#define __KVM_X86_VMX_HYPERV_H



#include <linux/jump_label.h>
@@ -8,6 +8,8 @@ 
#include <asm/mshyperv.h>

#include <asm/vmx.h>



#include "../hyperv.h"



#include "capabilities.h"

#include "vmcs.h"

#include "vmcs12.h"
@@ -242,4 +244,4 @@ int nested_enable_evmcs(struct kvm_vcpu *vcpu, 
void nested_evmcs_filter_control_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata);

int nested_evmcs_check_controls(struct vmcs12 *vmcs12);



#endif /* __KVM_X86_VMX_EVMCS_H */
 
#endif /* __KVM_X86_VMX_HYPERV_H */

arch/x86/kvm/vmx/nested.c

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
#include <asm/mmu_context.h>



#include "cpuid.h"

#include "evmcs.h"

#include "hyperv.h"

#include "mmu.h"

#include "nested.h"

arch/x86/kvm/vmx/vmx.c

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ 


#include "capabilities.h"

#include "cpuid.h"

#include "evmcs.h"

#include "hyperv.h"

#include "kvm_onhyperv.h"

#include "irq.h"