summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2014-06-16 13:59:44 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2014-06-19 12:52:13 +0200
commit5381417f6a51293e7b8af1eb18aefa5d47976a71 (patch)
tree045acd7c04fb4d5883421a1289311a76d3bed525
parent2996fca0690f03a5220203588f4a0d8c5acba2b0 (diff)
downloadop-kernel-dev-5381417f6a51293e7b8af1eb18aefa5d47976a71.zip
op-kernel-dev-5381417f6a51293e7b8af1eb18aefa5d47976a71.tar.gz
KVM: nVMX: Fix returned value of MSR_IA32_VMX_VMCS_ENUM
Many real CPUs get this wrong as well, but ours is totally off: bits 9:1 define the highest index value. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--arch/x86/kvm/vmx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index b93e2ae..a717c13 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -2461,7 +2461,7 @@ static int vmx_get_vmx_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata)
*pdata = -1ULL;
break;
case MSR_IA32_VMX_VMCS_ENUM:
- *pdata = 0x1f;
+ *pdata = 0x2e; /* highest index: VMX_PREEMPTION_TIMER_VALUE */
break;
case MSR_IA32_VMX_PROCBASED_CTLS2:
*pdata = vmx_control_msr(nested_vmx_secondary_ctls_low,
OpenPOWER on IntegriCloud