From patchwork Sun Mar 29 14:12:13 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gleb Natapov X-Patchwork-Id: 14980 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 n2TECKEb025341 for ; Sun, 29 Mar 2009 14:12:21 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755501AbZC2OMR (ORCPT ); Sun, 29 Mar 2009 10:12:17 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756050AbZC2OMR (ORCPT ); Sun, 29 Mar 2009 10:12:17 -0400 Received: from mx2.redhat.com ([66.187.237.31]:33023 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755058AbZC2OMP (ORCPT ); Sun, 29 Mar 2009 10:12:15 -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 n2TECEEm011371 for ; Sun, 29 Mar 2009 10:12:14 -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 n2TECEHG012926; Sun, 29 Mar 2009 10:12:14 -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 n2TECDrK029880; Sun, 29 Mar 2009 10:12:13 -0400 Received: from trex.usersys.redhat.com (localhost [127.0.0.1]) by dhcp-1-237.tlv.redhat.com (Postfix) with ESMTP id 3DF6518D395; Sun, 29 Mar 2009 17:12:13 +0300 (IDT) From: Gleb Natapov Subject: [PATCH 3/4] Do not zero idt_vectoring_info in vmx_complete_interrupts(). To: avi@redhat.com Cc: kvm@vger.kernel.org Date: Sun, 29 Mar 2009 17:12:13 +0300 Message-ID: <20090329141212.30481.11432.stgit@trex.usersys.redhat.com> In-Reply-To: <20090329141202.30481.91797.stgit@trex.usersys.redhat.com> References: <20090329141202.30481.91797.stgit@trex.usersys.redhat.com> User-Agent: StGIT/0.14.2 MIME-Version: 1.0 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 We will need it later in task_switch(). Code in handle_exception() is dead. is_external_interrupt(vect_info) will always be false since idt_vectoring_info is zeroed in vmx_complete_interrupts(). Signed-off-by: Gleb Natapov --- arch/x86/kvm/vmx.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 1017544..0da7a9e 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -2613,11 +2613,6 @@ static int handle_exception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) printk(KERN_ERR "%s: unexpected, vectoring info 0x%x " "intr info 0x%x\n", __func__, vect_info, intr_info); - if (!irqchip_in_kernel(vcpu->kvm) && is_external_interrupt(vect_info)) { - int irq = vect_info & VECTORING_INFO_VECTOR_MASK; - kvm_push_irq(vcpu, irq); - } - if ((intr_info & INTR_INFO_INTR_TYPE_MASK) == INTR_TYPE_NMI_INTR) return 1; /* already handled by vmx_vcpu_run() */ @@ -3316,11 +3311,9 @@ static void vmx_complete_interrupts(struct vcpu_vmx *vmx) kvm_queue_exception_e(&vmx->vcpu, vector, err); } else kvm_queue_exception(&vmx->vcpu, vector); - vmx->idt_vectoring_info = 0; break; case INTR_TYPE_EXT_INTR: kvm_queue_interrupt(&vmx->vcpu, vector); - vmx->idt_vectoring_info = 0; break; default: break;