diff options
| author | Radim Krčmář <rkrcmar@redhat.com> | 2015-06-30 22:19:17 +0200 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-07-20 21:12:43 -0400 |
| commit | 4f2e3f88a6fae8882371378d1d1cb493ca51a50c (patch) | |
| tree | 6d304a7bd5eff76773e42d90d336f772234a0cd5 /arch | |
| parent | 436a76ef9e7f33d2186e2d9f60d0b2b2f2ebeda5 (diff) | |
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>
Diffstat (limited to 'arch')
| -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 fe637cab8e9c..de8e50040124 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -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; |