From patchwork Mon Aug 24 08:54:18 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gleb Natapov X-Patchwork-Id: 43570 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 n7O8t0lG005378 for ; Mon, 24 Aug 2009 08:55:01 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752054AbZHXIya (ORCPT ); Mon, 24 Aug 2009 04:54:30 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751862AbZHXIy3 (ORCPT ); Mon, 24 Aug 2009 04:54:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44669 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751962AbZHXIy0 (ORCPT ); Mon, 24 Aug 2009 04:54:26 -0400 Received: from int-mx07.intmail.prod.int.phx2.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n7O8sS63002902 for ; Mon, 24 Aug 2009 04:54:28 -0400 Received: from dhcp-1-237.tlv.redhat.com (dhcp-1-237.tlv.redhat.com [10.35.1.237]) by int-mx07.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7O8sQsK032011; Mon, 24 Aug 2009 04:54:27 -0400 Received: by dhcp-1-237.tlv.redhat.com (Postfix, from userid 13519) id 614A018D468; Mon, 24 Aug 2009 11:54:26 +0300 (IDT) From: Gleb Natapov To: avi@redhat.com Cc: kvm@vger.kernel.org Subject: [PATCH v4 1/9] Call pic_clear_isr() on pic reset to reuse logic there. Date: Mon, 24 Aug 2009 11:54:18 +0300 Message-Id: <1251104066-23504-2-git-send-email-gleb@redhat.com> In-Reply-To: <1251104066-23504-1-git-send-email-gleb@redhat.com> References: <1251104066-23504-1-git-send-email-gleb@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.20 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Also move call of ack notifiers after pic state change. Signed-off-by: Gleb Natapov --- arch/x86/kvm/i8259.c | 22 +++++++++------------- 1 files changed, 9 insertions(+), 13 deletions(-) diff --git a/arch/x86/kvm/i8259.c b/arch/x86/kvm/i8259.c index 01f1516..ccc941a 100644 --- a/arch/x86/kvm/i8259.c +++ b/arch/x86/kvm/i8259.c @@ -225,22 +225,11 @@ int kvm_pic_read_irq(struct kvm *kvm) void kvm_pic_reset(struct kvm_kpic_state *s) { - int irq, irqbase, n; + int irq; struct kvm *kvm = s->pics_state->irq_request_opaque; struct kvm_vcpu *vcpu0 = kvm->bsp_vcpu; + u8 irr = s->irr, isr = s->imr; - if (s == &s->pics_state->pics[0]) - irqbase = 0; - else - irqbase = 8; - - for (irq = 0; irq < PIC_NUM_PINS/2; irq++) { - if (vcpu0 && kvm_apic_accept_pic_intr(vcpu0)) - if (s->irr & (1 << irq) || s->isr & (1 << irq)) { - n = irq + irqbase; - kvm_notify_acked_irq(kvm, SELECT_PIC(n), n); - } - } s->last_irr = 0; s->irr = 0; s->imr = 0; @@ -256,6 +245,13 @@ void kvm_pic_reset(struct kvm_kpic_state *s) s->rotate_on_auto_eoi = 0; s->special_fully_nested_mode = 0; s->init4 = 0; + + for (irq = 0; irq < PIC_NUM_PINS/2; irq++) { + if (vcpu0 && kvm_apic_accept_pic_intr(vcpu0)) + if (irr & (1 << irq) || isr & (1 << irq)) { + pic_clear_isr(s, irq); + } + } } static void pic_ioport_write(void *opaque, u32 addr, u32 val)