Commit 4f2e3f88 authored Jun 30, 2015 by Radim Krčmář Committed by Sasha Levin Jul 20, 2015

KVM: x86: properly restore LVT0



[ Upstream commit 58382447b9a9989da551a7b17e72756f6e238bb8 ]

commit db1385624c686fe99fe2d1b61a36e1537b915d08 upstream.

Legacy NMI watchdog didn't work after migration/resume, because
vapics_in_nmi_mode was left at 0.

Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>

parent 436a76ef

arch/x86/kvm/lapic.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1687,6 +1687,7 @@ void kvm_apic_post_state_restore(struct kvm_vcpu *vcpu,

		apic_update_ppr(apic);
		hrtimer_cancel(&apic->lapic_timer.timer);
		apic_manage_nmi_watchdog(apic, kvm_apic_get_reg(apic, APIC_LVT0));
		update_divide_count(apic);
		start_apic_timer(apic);
		apic->irr_pending = true;