From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paolo Bonzini Subject: Re: [PATCH 2/3] KVM: x86: properly restore LVT0 Date: Wed, 1 Jul 2015 15:29:47 +0200 Message-ID: <5593EB4B.9020601@redhat.com> References: <1435695558-3168-1-git-send-email-rkrcmar@redhat.com> <1435695558-3168-3-git-send-email-rkrcmar@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: kvm@vger.kernel.org, Yoshida Nobuo To: =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= , linux-kernel@vger.kernel.org Return-path: Received: from mail-wi0-f171.google.com ([209.85.212.171]:37397 "EHLO mail-wi0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753317AbbGAN3v (ORCPT ); Wed, 1 Jul 2015 09:29:51 -0400 In-Reply-To: <1435695558-3168-3-git-send-email-rkrcmar@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: On 30/06/2015 22:19, Radim Kr=C4=8Dm=C3=A1=C5=99 wrote: > Legacy NMI watchdog didn't work after migration/resume, because > vapics_in_nmi_mode was left at 0. >=20 > Signed-off-by: Radim Kr=C4=8Dm=C3=A1=C5=99 > --- > arch/x86/kvm/lapic.c | 1 + > 1 file changed, 1 insertion(+) >=20 > 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_vcp= u *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 =3D true; >=20 Applied already, with Cc: stable, as it is not related to APICv. Paolo