mirror of
https://github.com/torvalds/linux.git
synced 2025-12-07 20:06:24 +00:00
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: Sean Christopherson <seanjc@google.com>
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20221101145426.251680-7-vkuznets@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
committed by
Paolo Bonzini
parent
b83237ad21
commit
a789aeba41
@@ -23,7 +23,7 @@ kvm-$(CONFIG_KVM_XEN) += xen.o
|
|||||||
kvm-$(CONFIG_KVM_SMM) += smm.o
|
kvm-$(CONFIG_KVM_SMM) += smm.o
|
||||||
|
|
||||||
kvm-intel-y += vmx/vmx.o vmx/vmenter.o vmx/pmu_intel.o vmx/vmcs12.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-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
|
kvm-amd-y += svm/svm.o svm/vmenter.o svm/pmu.o svm/nested.o svm/avic.o svm/sev.o
|
||||||
|
|||||||
@@ -3,9 +3,8 @@
|
|||||||
#include <linux/errno.h>
|
#include <linux/errno.h>
|
||||||
#include <linux/smp.h>
|
#include <linux/smp.h>
|
||||||
|
|
||||||
#include "../hyperv.h"
|
|
||||||
#include "../cpuid.h"
|
#include "../cpuid.h"
|
||||||
#include "evmcs.h"
|
#include "hyperv.h"
|
||||||
#include "vmcs.h"
|
#include "vmcs.h"
|
||||||
#include "vmx.h"
|
#include "vmx.h"
|
||||||
#include "trace.h"
|
#include "trace.h"
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
/* SPDX-License-Identifier: GPL-2.0 */
|
/* SPDX-License-Identifier: GPL-2.0 */
|
||||||
#ifndef __KVM_X86_VMX_EVMCS_H
|
#ifndef __KVM_X86_VMX_HYPERV_H
|
||||||
#define __KVM_X86_VMX_EVMCS_H
|
#define __KVM_X86_VMX_HYPERV_H
|
||||||
|
|
||||||
#include <linux/jump_label.h>
|
#include <linux/jump_label.h>
|
||||||
|
|
||||||
@@ -8,6 +8,8 @@
|
|||||||
#include <asm/mshyperv.h>
|
#include <asm/mshyperv.h>
|
||||||
#include <asm/vmx.h>
|
#include <asm/vmx.h>
|
||||||
|
|
||||||
|
#include "../hyperv.h"
|
||||||
|
|
||||||
#include "capabilities.h"
|
#include "capabilities.h"
|
||||||
#include "vmcs.h"
|
#include "vmcs.h"
|
||||||
#include "vmcs12.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);
|
void nested_evmcs_filter_control_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata);
|
||||||
int nested_evmcs_check_controls(struct vmcs12 *vmcs12);
|
int nested_evmcs_check_controls(struct vmcs12 *vmcs12);
|
||||||
|
|
||||||
#endif /* __KVM_X86_VMX_EVMCS_H */
|
#endif /* __KVM_X86_VMX_HYPERV_H */
|
||||||
@@ -7,7 +7,6 @@
|
|||||||
#include <asm/mmu_context.h>
|
#include <asm/mmu_context.h>
|
||||||
|
|
||||||
#include "cpuid.h"
|
#include "cpuid.h"
|
||||||
#include "evmcs.h"
|
|
||||||
#include "hyperv.h"
|
#include "hyperv.h"
|
||||||
#include "mmu.h"
|
#include "mmu.h"
|
||||||
#include "nested.h"
|
#include "nested.h"
|
||||||
|
|||||||
@@ -51,7 +51,6 @@
|
|||||||
|
|
||||||
#include "capabilities.h"
|
#include "capabilities.h"
|
||||||
#include "cpuid.h"
|
#include "cpuid.h"
|
||||||
#include "evmcs.h"
|
|
||||||
#include "hyperv.h"
|
#include "hyperv.h"
|
||||||
#include "kvm_onhyperv.h"
|
#include "kvm_onhyperv.h"
|
||||||
#include "irq.h"
|
#include "irq.h"
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
#include <asm/vmx.h>
|
#include <asm/vmx.h>
|
||||||
|
|
||||||
#include "evmcs.h"
|
#include "hyperv.h"
|
||||||
#include "vmcs.h"
|
#include "vmcs.h"
|
||||||
#include "../x86.h"
|
#include "../x86.h"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user