From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1765751AbZD3Rc5 (ORCPT ); Thu, 30 Apr 2009 13:32:57 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1763062AbZD3RIR (ORCPT ); Thu, 30 Apr 2009 13:08:17 -0400 Received: from kroah.org ([198.145.64.141]:56703 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1764495AbZD3RID (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.681003104@mini.kroah.org> User-Agent: quilt/0.48-1 Date: Thu, 30 Apr 2009 09:56:45 -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, mtosatti@redhat.com, avi@redhat.com, Gleb Natapov Subject: [patch 56/88] KVM: call kvm_arch_vcpu_reset() instead of the kvm_x86_ops callback References: <20090430165549.117010404@mini.kroah.org> Content-Disposition: inline; filename=kvm-call-kvm_arch_vcpu_reset-instead-of-the-kvm_x86_ops-callback.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: Gleb Natapov (cherry picked from 5f179287fa02723215eecf681d812b303c243973) Call kvm_arch_vcpu_reset() instead of directly using arch callback. The function does additional things. Signed-off-by: Gleb Natapov Signed-off-by: Avi Kivity Signed-off-by: Greg Kroah-Hartman --- arch/x86/kvm/x86.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -2973,7 +2973,7 @@ static int __vcpu_run(struct kvm_vcpu *v pr_debug("vcpu %d received sipi with vector # %x\n", vcpu->vcpu_id, vcpu->arch.sipi_vector); kvm_lapic_reset(vcpu); - r = kvm_x86_ops->vcpu_reset(vcpu); + r = kvm_arch_vcpu_reset(vcpu); if (r) return r; vcpu->arch.mp_state = KVM_MP_STATE_RUNNABLE;