summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRadim Krčmář <rkrcmar@redhat.com>2015-06-30 22:19:17 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2015-07-03 18:55:17 +0200
commitdb1385624c686fe99fe2d1b61a36e1537b915d08 (patch)
tree47c845b09314af5f796f1925a4a38fa5ad7c2829 /arch
parent42720138b06301cc8a7ee8a495a6d021c4b6a9bc (diff)
downloadlwn-db1385624c686fe99fe2d1b61a36e1537b915d08.tar.gz
lwn-db1385624c686fe99fe2d1b61a36e1537b915d08.zip
KVM: x86: properly restore LVT0
Legacy NMI watchdog didn't work after migration/resume, because vapics_in_nmi_mode was left at 0. Cc: stable@vger.kernel.org Signed-off-by: Radim Krčmář <rkrcmar@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kvm/lapic.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index 607a56b35327..e0f721bfabcb 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -1822,6 +1822,7 @@ void kvm_apic_post_state_restore(struct kvm_vcpu *vcpu,
apic_update_ppr(apic);
hrtimer_cancel(&apic->lapic_timer.timer);
apic_update_lvtt(apic);
+ apic_manage_nmi_watchdog(apic, kvm_apic_get_reg(apic, APIC_LVT0));
update_divide_count(apic);
start_apic_timer(apic);
apic->irr_pending = true;