Commit 619f51da authored by Wanpeng Li's avatar Wanpeng Li Committed by Paolo Bonzini
Browse files

KVM: LAPIC: Drop pending LAPIC timer injection when canceling the timer 



The timer is disarmed when switching between TSC deadline and other modes;
however, the pending timer is still in-flight, so let's accurately remove
any traces of the previous mode.

Fixes: 44275932 ("KVM: x86: thoroughly disarm LAPIC timer around TSC deadline switch")
Signed-off-by: default avatarWanpeng Li <wanpengli@tencent.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 0547758a

arch/x86/kvm/lapic.c

+1 −0
Original line number Diff line number Diff line
@@ -1548,6 +1548,7 @@ static void cancel_apic_timer(struct kvm_lapic *apic) 
	if (apic->lapic_timer.hv_timer_in_use)

		cancel_hv_timer(apic);

	preempt_enable();

	atomic_set(&apic->lapic_timer.pending, 0);

}



static void apic_update_lvtt(struct kvm_lapic *apic)