diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2019-07-02 14:40:40 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-07-02 17:36:12 +0200 |
| commit | e8a70bd4e92525de459acfa5668c8e1f24664331 (patch) | |
| tree | 73ab1cc64f08e8525f83caf7e659596787f859ec /arch/x86/kvm | |
| parent | 6defc591846d0104d1a95f2fb450bdb05a9e738b (diff) | |
| download | linux-e8a70bd4e92525de459acfa5668c8e1f24664331.tar.gz linux-e8a70bd4e92525de459acfa5668c8e1f24664331.tar.bz2 linux-e8a70bd4e92525de459acfa5668c8e1f24664331.zip | |
KVM: nVMX: allow setting the VMFUNC controls MSR
Allow userspace to set a custom value for the VMFUNC controls MSR, as long
as the capabilities it advertises do not exceed those of the host.
Fixes: 27c42a1bb ("KVM: nVMX: Enable VMFUNC for the L1 hypervisor", 2017-08-03)
Reviewed-by: Liran Alon <liran.alon@oracle.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm')
| -rw-r--r-- | arch/x86/kvm/vmx/nested.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c index c4e29ef0b21e..163d226efa96 100644 --- a/arch/x86/kvm/vmx/nested.c +++ b/arch/x86/kvm/vmx/nested.c @@ -1234,6 +1234,11 @@ int vmx_set_vmx_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data) case MSR_IA32_VMX_VMCS_ENUM: vmx->nested.msrs.vmcs_enum = data; return 0; + case MSR_IA32_VMX_VMFUNC: + if (data & ~vmx->nested.msrs.vmfunc_controls) + return -EINVAL; + vmx->nested.msrs.vmfunc_controls = data; + return 0; default: /* * The rest of the VMX capability MSRs do not support restore. |