Commit 1c17c3e6 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: VMX: reflect broken preemption timer in vmcs_config 



Simplify cpu_has_vmx_preemption_timer.  This is consistent with the
rest of setup_vmcs_config and preparatory for the next patch.

Tested-by: default avatarWanpeng Li <kernellwp@gmail.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 84260972

arch/x86/kvm/vmx.c

+2 −3
Original line number Diff line number Diff line
@@ -1121,9 +1121,6 @@ static inline bool cpu_has_broken_vmx_preemption_timer(void) 


static inline bool cpu_has_vmx_preemption_timer(void)

{

	if (cpu_has_broken_vmx_preemption_timer())

		return false;



	return vmcs_config.pin_based_exec_ctrl &

		PIN_BASED_VMX_PREEMPTION_TIMER;

}
@@ -3407,6 +3404,8 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf) 
				&_pin_based_exec_control) < 0)

		return -EIO;



	if (cpu_has_broken_vmx_preemption_timer())

		_pin_based_exec_control &= ~PIN_BASED_VMX_PREEMPTION_TIMER;

	if (!(_cpu_based_2nd_exec_control &

		SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY))

		_pin_based_exec_control &= ~PIN_BASED_POSTED_INTR;