From patchwork Mon Apr 13 09:55:40 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gleb Natapov X-Patchwork-Id: 17913 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n3D9uI5T006010 for ; Mon, 13 Apr 2009 09:56:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755836AbZDMJ4P (ORCPT ); Mon, 13 Apr 2009 05:56:15 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755788AbZDMJ4O (ORCPT ); Mon, 13 Apr 2009 05:56:14 -0400 Received: from mx2.redhat.com ([66.187.237.31]:57758 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755589AbZDMJzu (ORCPT ); Mon, 13 Apr 2009 05:55:50 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n3D9tniG000532; Mon, 13 Apr 2009 05:55:49 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n3D9tosx026707; Mon, 13 Apr 2009 05:55:51 -0400 Received: from dhcp-1-237.tlv.redhat.com (dhcp-1-237.tlv.redhat.com [10.35.1.237]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n3D9tm1E001887; Mon, 13 Apr 2009 05:55:48 -0400 Received: by dhcp-1-237.tlv.redhat.com (Postfix, from userid 587) id 7133E13366B; Mon, 13 Apr 2009 12:55:45 +0300 (IDT) From: Gleb Natapov To: avi@redhat.com Cc: kvm@vger.kernel.org, joerg.roedel@amd.com, sheng@linux.intel.com, Gleb Natapov Subject: [PATCH 10/15] sync_lapic_to_cr8() should always sync cr8 to V_TPR. Date: Mon, 13 Apr 2009 12:55:40 +0300 Message-Id: <1239616545-25199-11-git-send-email-gleb@redhat.com> In-Reply-To: <1239616545-25199-1-git-send-email-gleb@redhat.com> References: <1239616545-25199-1-git-send-email-gleb@redhat.com> X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Even if IRQ chip is in userspace. Signed-off-by: Gleb Natapov --- arch/x86/kvm/svm.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index f8beddb..52bd999 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -2339,7 +2339,7 @@ static inline void sync_cr8_to_lapic(struct kvm_vcpu *vcpu) if (!(svm->vmcb->control.intercept_cr_write & INTERCEPT_CR8_MASK)) { int cr8 = svm->vmcb->control.int_ctl & V_TPR_MASK; - kvm_lapic_set_tpr(vcpu, cr8); + kvm_set_cr8(vcpu, cr8); } } @@ -2348,9 +2348,6 @@ static inline void sync_lapic_to_cr8(struct kvm_vcpu *vcpu) struct vcpu_svm *svm = to_svm(vcpu); u64 cr8; - if (!irqchip_in_kernel(vcpu->kvm)) - return; - cr8 = kvm_get_cr8(vcpu); svm->vmcb->control.int_ctl &= ~V_TPR_MASK; svm->vmcb->control.int_ctl |= cr8 & V_TPR_MASK;