Commit e2821620 authored by Xiao Guangrong's avatar Xiao Guangrong Committed by Paolo Bonzini
Browse files

KVM: VMX: drop rdtscp_enabled check in prepare_vmcs02() 



SECONDARY_EXEC_RDTSCP set for L2 guest comes from vmcs12

Signed-off-by: default avatarXiao Guangrong <guangrong.xiao@linux.intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 8b3e34e4

arch/x86/kvm/vmx.c

+1 −2
Original line number Diff line number Diff line
@@ -9327,8 +9327,7 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) 


	if (cpu_has_secondary_exec_ctrls()) {

		exec_control = vmx_secondary_exec_control(vmx);

		if (!vmx->rdtscp_enabled)

			exec_control &= ~SECONDARY_EXEC_RDTSCP;



		/* Take the following fields only from vmcs12 */

		exec_control &= ~(SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES |

				  SECONDARY_EXEC_RDTSCP |