[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/5] pseries: Cleanup duplications of ics_valid_irq(
From: |
Alexander Graf |
Subject: |
[Qemu-devel] [PATCH 5/5] pseries: Cleanup duplications of ics_valid_irq() code |
Date: |
Thu, 1 Nov 2012 13:07:17 +0100 |
From: David Gibson <address@hidden>
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 <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>
---
hw/xics.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/hw/xics.c b/hw/xics.c
index 7a899dd..ff4b5e2 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.6.0.2
- [Qemu-devel] [PULL 0/5] ppc patch queue 2012-11-01, Alexander Graf, 2012/11/01
- [Qemu-devel] [PATCH 1/5] Revert "PPC: pseries: Remove hack for PIO window", Alexander Graf, 2012/11/01
- [Qemu-devel] [PATCH 5/5] pseries: Cleanup duplications of ics_valid_irq() code,
Alexander Graf <=
- [Qemu-devel] [PATCH 3/5] target-ppc: Extend FPU state for newer POWER CPUs, Alexander Graf, 2012/11/01
- [Qemu-devel] [PATCH 4/5] pseries: Clean up inconsistent variable name in xics.c, Alexander Graf, 2012/11/01
- [Qemu-devel] [PATCH 2/5] target-ppc: Rework storage of VPA registration state, Alexander Graf, 2012/11/01
- Re: [Qemu-devel] [PULL 0/5] ppc patch queue 2012-11-01, Aurelien Jarno, 2012/11/01