From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1765629AbZD3Rcb (ORCPT ); Thu, 30 Apr 2009 13:32:31 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1764671AbZD3RIQ (ORCPT ); Thu, 30 Apr 2009 13:08:16 -0400 Received: from kroah.org ([198.145.64.141]:56697 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1764401AbZD3RID (ORCPT ); Thu, 30 Apr 2009 13:08:03 -0400 X-Mailbox-Line: From gregkh@mini.kroah.org Thu Apr 30 09:57:46 2009 Message-Id: <20090430165746.524583497@mini.kroah.org> User-Agent: quilt/0.48-1 Date: Thu, 30 Apr 2009 09:56:44 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , Domenico Andreoli , Willy Tarreau , Rodrigo Rubira Branco , Jake Edge , Eugene Teo , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Jan Kiszka , mtosatti@redhat.com, avi@redhat.com, Gleb Natapov Subject: [patch 55/88] KVM: x86: Reset pending/inject NMI state on CPU reset References: <20090430165549.117010404@mini.kroah.org> Content-Disposition: inline; filename=kvm-x86-reset-pending-inject-nmi-state-on-cpu-reset.patch In-Reply-To: <20090430170122.GA16015@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.28-stable review patch. If anyone has any objections, please let us know. ------------------ From: Jan Kiszka (cherry picked from 448fa4a9c5dbc6941dd19ed09692c588d815bb06) CPU reset invalidates pending or already injected NMIs, therefore reset the related state variables. Based on original patch by Gleb Natapov. Signed-off-by: Gleb Natapov Signed-off-by: Jan Kiszka Signed-off-by: Avi Kivity Signed-off-by: Greg Kroah-Hartman --- arch/x86/kvm/x86.c | 3 +++ 1 file changed, 3 insertions(+) --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -3925,6 +3925,9 @@ void kvm_arch_vcpu_destroy(struct kvm_vc int kvm_arch_vcpu_reset(struct kvm_vcpu *vcpu) { + vcpu->arch.nmi_pending = false; + vcpu->arch.nmi_injected = false; + return kvm_x86_ops->vcpu_reset(vcpu); }