diff options
| author | Sean Christopherson | 2018-12-03 22:53:10 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2018-12-14 17:17:57 +0100 |
| commit | 5158917c7b0196aefc1a4e9bc4458777dd2c41ec (patch) | |
| tree | 9a976d2d7abc877e7bc7b5a36f1714ba2b3ab21f /arch/x86/kvm/x86.c | |
| parent | KVM: VMX: Move nested hardware/vcpu {un}setup to helper functions (diff) | |
| download | kernel-qcow2-linux-5158917c7b0196aefc1a4e9bc4458777dd2c41ec.tar.gz kernel-qcow2-linux-5158917c7b0196aefc1a4e9bc4458777dd2c41ec.tar.xz kernel-qcow2-linux-5158917c7b0196aefc1a4e9bc4458777dd2c41ec.zip | |
KVM: x86: nVMX: Allow nested_enable_evmcs to be NULL
...so that it can conditionally set by the VMX code, i.e. iff @nested is
true. This will in turn allow it to be moved out of vmx.c and into a
nested-specified file.
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm/x86.c')
| -rw-r--r-- | arch/x86/kvm/x86.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 6af846c54660..54ef79421c6b 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -3827,6 +3827,8 @@ static int kvm_vcpu_ioctl_enable_cap(struct kvm_vcpu *vcpu, return kvm_hv_activate_synic(vcpu, cap->cap == KVM_CAP_HYPERV_SYNIC2); case KVM_CAP_HYPERV_ENLIGHTENED_VMCS: + if (!kvm_x86_ops->nested_enable_evmcs) + return -ENOTTY; r = kvm_x86_ops->nested_enable_evmcs(vcpu, &vmcs_version); if (!r) { user_ptr = (void __user *)(uintptr_t)cap->args[0]; |