Commit 25091990 authored by Paolo Bonzini's avatar Paolo Bonzini

KVM: eVMCS: check if nesting is enabled

In the next patch nested_get_evmcs_version will be always set in kvm_x86_ops for
VMX, even if nesting is disabled.  Therefore, check whether VMX (aka nesting)
is available in the function, the caller will not do the check anymore.
Reviewed-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 56083bdf
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include <linux/smp.h> #include <linux/smp.h>
#include "../hyperv.h" #include "../hyperv.h"
#include "../cpuid.h"
#include "evmcs.h" #include "evmcs.h"
#include "vmcs.h" #include "vmcs.h"
#include "vmx.h" #include "vmx.h"
...@@ -326,17 +327,18 @@ bool nested_enlightened_vmentry(struct kvm_vcpu *vcpu, u64 *evmcs_gpa) ...@@ -326,17 +327,18 @@ bool nested_enlightened_vmentry(struct kvm_vcpu *vcpu, u64 *evmcs_gpa)
uint16_t nested_get_evmcs_version(struct kvm_vcpu *vcpu) uint16_t nested_get_evmcs_version(struct kvm_vcpu *vcpu)
{ {
struct vcpu_vmx *vmx = to_vmx(vcpu); struct vcpu_vmx *vmx = to_vmx(vcpu);
/* /*
* vmcs_version represents the range of supported Enlightened VMCS * vmcs_version represents the range of supported Enlightened VMCS
* versions: lower 8 bits is the minimal version, higher 8 bits is the * versions: lower 8 bits is the minimal version, higher 8 bits is the
* maximum supported version. KVM supports versions from 1 to * maximum supported version. KVM supports versions from 1 to
* KVM_EVMCS_VERSION. * KVM_EVMCS_VERSION.
*/ */
if (vmx->nested.enlightened_vmcs_enabled) if (kvm_cpu_cap_get(X86_FEATURE_VMX) &&
return (KVM_EVMCS_VERSION << 8) | 1; vmx->nested.enlightened_vmcs_enabled)
return (KVM_EVMCS_VERSION << 8) | 1;
return 0;
return 0;
} }
void nested_evmcs_filter_control_msr(u32 msr_index, u64 *pdata) void nested_evmcs_filter_control_msr(u32 msr_index, u64 *pdata)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment