david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pseries: Cleanup duplications of ics_valid_irq() code

Browse Source 
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 <david@gibson.dropbear.id.au>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
David Gibson 2012-10-29 17:25:02 +00:00 committed by Alexander Graf
parent bf0175de6c
commit 1ecbbab469
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xics.c
View File

@ -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) qemu_irq xics_get_qirq(struct icp_state *icp, int irq)
{ {
if ((irq < icp->ics->offset) if (!ics_valid_irq(icp->ics, irq)) {
|| (irq >= (icp->ics->offset + icp->ics->nr_irqs))) {
return NULL; 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) void xics_set_irq_type(struct icp_state *icp, int irq, bool lsi)
{ {
assert((irq >= icp->ics->offset) assert(ics_valid_irq(icp->ics, irq));
&& (irq < (icp->ics->offset + icp->ics->nr_irqs)));
icp->ics->irqs[irq - icp->ics->offset].lsi = lsi; icp->ics->irqs[irq - icp->ics->offset].lsi = lsi;
} }