diff options
author | Radim Krčmář <rkrcmar@redhat.com> | 2015-06-30 16:19:17 -0400 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-07-03 12:55:17 -0400 |
commit | db1385624c686fe99fe2d1b61a36e1537b915d08 (patch) | |
tree | 47c845b09314af5f796f1925a4a38fa5ad7c2829 | |
parent | 42720138b06301cc8a7ee8a495a6d021c4b6a9bc (diff) |
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>
-rw-r--r-- | arch/x86/kvm/lapic.c | 1 |
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, | |||
1822 | apic_update_ppr(apic); | 1822 | apic_update_ppr(apic); |
1823 | hrtimer_cancel(&apic->lapic_timer.timer); | 1823 | hrtimer_cancel(&apic->lapic_timer.timer); |
1824 | apic_update_lvtt(apic); | 1824 | apic_update_lvtt(apic); |
1825 | apic_manage_nmi_watchdog(apic, kvm_apic_get_reg(apic, APIC_LVT0)); | ||
1825 | update_divide_count(apic); | 1826 | update_divide_count(apic); |
1826 | start_apic_timer(apic); | 1827 | start_apic_timer(apic); |
1827 | apic->irr_pending = true; | 1828 | apic->irr_pending = true; |