Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit e2821620 authored Sep 09, 2015 by Xiao Guangrong Committed by Paolo Bonzini Oct 01, 2015

KVM: VMX: drop rdtscp_enabled check in prepare_vmcs02()



SECONDARY_EXEC_RDTSCP set for L2 guest comes from vmcs12

Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com>
Signed-off-by: Paolo 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 \|