Commit 5d74a699 authored by Radim Krčmář's avatar Radim Krčmář Committed by Paolo Bonzini
Browse files

KVM: x86: really disarm lapic timer when clearing TMICT 



preemption timer only looks at tscdeadline and could inject already
disarmed timer.

Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
Reviewed-by: default avatarWanpeng Li <wanpeng.li@hotmail.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 86bbc1e6

arch/x86/kvm/lapic.c

+3 −1
Original line number Diff line number Diff line
@@ -1489,8 +1489,10 @@ static bool set_target_expiration(struct kvm_lapic *apic) 
	apic->lapic_timer.period = (u64)kvm_lapic_get_reg(apic, APIC_TMICT)

		* APIC_BUS_CYCLE_NS * apic->divide_count;



	if (!apic->lapic_timer.period)

	if (!apic->lapic_timer.period) {

		apic->lapic_timer.tscdeadline = 0;

		return false;

	}



	limit_periodic_timer_frequency(apic);