From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:40266) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TT2Qy-0008KW-T4 for qemu-devel@nongnu.org; Mon, 29 Oct 2012 23:24:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TT2Qu-0001MJ-CA for qemu-devel@nongnu.org; Mon, 29 Oct 2012 23:24:08 -0400 From: David Gibson Date: Tue, 30 Oct 2012 14:25:02 +1100 Message-Id: <1351567512-17278-7-git-send-email-david@gibson.dropbear.id.au> In-Reply-To: <1351567512-17278-1-git-send-email-david@gibson.dropbear.id.au> References: <1351567512-17278-1-git-send-email-david@gibson.dropbear.id.au> Subject: [Qemu-devel] [PATCH 06/16] pseries: Cleanup duplications of ics_valid_irq() code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: agraf@suse.de Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, David Gibson A couple of places in xics.c open-coded the same logic as is already implemented in ics_valid_irq(). This patch fixes the code duplication. Signed-off-by: David Gibson --- hw/xics.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/xics.c b/hw/xics.c index db01fe3..6b08430 100644 --- a/hw/xics.c +++ b/hw/xics.c @@ -326,8 +326,7 @@ static void ics_eoi(struct ics_state *ics, int nr) qemu_irq xics_get_qirq(struct icp_state *icp, int irq) { - if ((irq < icp->ics->offset) - || (irq >= (icp->ics->offset + icp->ics->nr_irqs))) { + if (!ics_valid_irq(icp->ics, irq)) { return NULL; } @@ -336,8 +335,7 @@ qemu_irq xics_get_qirq(struct icp_state *icp, int irq) void xics_set_irq_type(struct icp_state *icp, int irq, bool lsi) { - assert((irq >= icp->ics->offset) - && (irq < (icp->ics->offset + icp->ics->nr_irqs))); + assert(ics_valid_irq(icp->ics, irq)); icp->ics->irqs[irq - icp->ics->offset].lsi = lsi; } -- 1.7.10.4