Commit 8b97265a authored by Paolo Bonzini's avatar Paolo Bonzini

KVM: VMX: align vmx->nested.nested_vmx_secondary_ctls_high to vmx->rdtscp_enabled

The SECONDARY_EXEC_RDTSCP must be available iff RDTSCP is enabled in the
guest.
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 29541bb8
...@@ -8686,10 +8686,15 @@ static void vmx_cpuid_update(struct kvm_vcpu *vcpu) ...@@ -8686,10 +8686,15 @@ static void vmx_cpuid_update(struct kvm_vcpu *vcpu)
exec_control); exec_control);
} }
if (nested && !vmx->rdtscp_enabled) if (nested) {
if (vmx->rdtscp_enabled)
vmx->nested.nested_vmx_secondary_ctls_high |=
SECONDARY_EXEC_RDTSCP;
else
vmx->nested.nested_vmx_secondary_ctls_high &= vmx->nested.nested_vmx_secondary_ctls_high &=
~SECONDARY_EXEC_RDTSCP; ~SECONDARY_EXEC_RDTSCP;
} }
}
/* Exposing INVPCID only when PCID is exposed */ /* Exposing INVPCID only when PCID is exposed */
best = kvm_find_cpuid_entry(vcpu, 0x7, 0); best = kvm_find_cpuid_entry(vcpu, 0x7, 0);
......
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