On 30/06/2015 22:19, Radim Krčmář wrote: > 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@xxxxxxxxxx> > --- > arch/x86/kvm/lapic.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c > index f49c7cca1de6..8dc32b5a4e0d 100644 > --- a/arch/x86/kvm/lapic.c > +++ b/arch/x86/kvm/lapic.c > @@ -1824,6 +1824,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; > Applied already, with Cc: stable, as it is not related to APICv. Paolo -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
