From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:54482) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1To6Db-0000ra-91 for qemu-devel@nongnu.org; Thu, 27 Dec 2012 00:41:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1To6DY-0002P0-MJ for qemu-devel@nongnu.org; Thu, 27 Dec 2012 00:41:23 -0500 Received: from qmta01.emeryville.ca.mail.comcast.net ([2001:558:fe2d:43:76:96:30:16]:60845) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1To6DY-0002Oh-Cr for qemu-devel@nongnu.org; Thu, 27 Dec 2012 00:41:20 -0500 From: Matthew Ogilvie Date: Wed, 26 Dec 2012 22:39:56 -0700 Message-Id: <1356586796-7631-5-git-send-email-mmogilvi_qemu@miniinfo.net> In-Reply-To: <1356586796-7631-1-git-send-email-mmogilvi_qemu@miniinfo.net> References: <1356586796-7631-1-git-send-email-mmogilvi_qemu@miniinfo.net> Subject: [Qemu-devel] [PATCH KVM v2 4/4] KVM: i8259: refactor pic_set_irq level logic List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gleb Natapov , Jan Kiszka , Matthew Ogilvie , kvm@vger.kernel.org, "Maciej W. Rozycki" No change in functionality. Clarify that the only difference between level triggered and edge triggered interrupts is on the leading edge. Signed-off-by: Matthew Ogilvie --- arch/x86/kvm/i8259.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/arch/x86/kvm/i8259.c b/arch/x86/kvm/i8259.c index 76d8dc1..63f731b 100644 --- a/arch/x86/kvm/i8259.c +++ b/arch/x86/kvm/i8259.c @@ -95,26 +95,20 @@ static inline int pic_set_irq1(struct kvm_kpic_state *s, int irq, int level) { int mask, ret = 1; mask = 1 << irq; - if (s->elcr & mask) /* level triggered */ - if (level) { + if (level) { + if ((s->last_irr & mask) == 0 || /* edge for edge-triggered */ + (s->elcr & mask)) { /* or level triggered */ ret = !(s->irr & mask); s->irr |= mask; - s->last_irr |= mask; - } else { - s->irr &= ~mask; - s->last_irr &= ~mask; - } - else /* edge triggered */ - if (level) { - if ((s->last_irr & mask) == 0) { - ret = !(s->irr & mask); - s->irr |= mask; - } - s->last_irr |= mask; - } else { - s->irr &= ~mask; - s->last_irr &= ~mask; } + s->last_irr |= mask; + } else { + /* Dropping level clears the interrupt regardless of edge + * trigger vs level trigger. + */ + s->irr &= ~mask; + s->last_irr &= ~mask; + } return (s->imr & mask) ? -1 : ret; } -- 1.7.10.2.484.gcd07cc5