diff options
| author | Radim Krčmář <rkrcmar@redhat.com> | 2015-06-30 22:19:17 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-10 09:45:42 -0700 |
| commit | f5dadd1dd3c07964ab189c45418b96cc20c04bd5 (patch) | |
| tree | b3de158b25348d03d5841f1b5de6e9a70d43893e | |
| parent | 0b505c9b0736390f06ee057e6c5e2a700591452d (diff) | |
| download | lwn-f5dadd1dd3c07964ab189c45418b96cc20c04bd5.tar.gz lwn-f5dadd1dd3c07964ab189c45418b96cc20c04bd5.zip | |
KVM: x86: properly restore LVT0
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>
| -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 3cb2b58fa26b..1711dd8c6bc0 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -1784,6 +1784,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; |