From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37097) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bACUJ-0007gt-HV for qemu-devel@nongnu.org; Tue, 07 Jun 2016 04:35:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bACUG-0007El-AX for qemu-devel@nongnu.org; Tue, 07 Jun 2016 04:35:51 -0400 Message-ID: <575686CF.7040705@huawei.com> Date: Tue, 7 Jun 2016 16:33:19 +0800 From: Shannon Zhao MIME-Version: 1.0 References: <1464274540-19693-1-git-send-email-peter.maydell@linaro.org> <1464274540-19693-8-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1464274540-19693-8-git-send-email-peter.maydell@linaro.org> Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 07/22] hw/intc/arm_gicv3: Move irq lines into GICv3CPUState structure List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell , qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: patches@linaro.org, Shlomo Pongratz , Shlomo Pongratz , Pavel Fedin , Shannon Zhao , Christoffer Dall On 2016/5/26 22:55, Peter Maydell wrote: > Move the GICv3 parent_irq and parent_fiq pointers into the > GICv3CPUState structure rather than giving them their own array. > This will make it easy to assert the IRQ and FIQ lines for a > particular CPU interface without having to know or calculate > the CPU index for the GICv3CPUState we are working on. > > Signed-off-by: Peter Maydell Reviewed-by: Shannon Zhao > --- > hw/intc/arm_gicv3_common.c | 7 ++----- > include/hw/intc/arm_gicv3_common.h | 5 ++--- > 2 files changed, 4 insertions(+), 8 deletions(-) > > diff --git a/hw/intc/arm_gicv3_common.c b/hw/intc/arm_gicv3_common.c > index bf6949f..1557833 100644 > --- a/hw/intc/arm_gicv3_common.c > +++ b/hw/intc/arm_gicv3_common.c > @@ -72,14 +72,11 @@ void gicv3_init_irqs_and_mmio(GICv3State *s, qemu_irq_handler handler, > i = s->num_irq - GIC_INTERNAL + GIC_INTERNAL * s->num_cpu; > qdev_init_gpio_in(DEVICE(s), handler, i); > > - s->parent_irq = g_malloc(s->num_cpu * sizeof(qemu_irq)); > - s->parent_fiq = g_malloc(s->num_cpu * sizeof(qemu_irq)); > - > for (i = 0; i < s->num_cpu; i++) { > - sysbus_init_irq(sbd, &s->parent_irq[i]); > + sysbus_init_irq(sbd, &s->cpu[i].parent_irq); > } > for (i = 0; i < s->num_cpu; i++) { > - sysbus_init_irq(sbd, &s->parent_fiq[i]); > + sysbus_init_irq(sbd, &s->cpu[i].parent_fiq); > } > > memory_region_init_io(&s->iomem_dist, OBJECT(s), ops, s, > diff --git a/include/hw/intc/arm_gicv3_common.h b/include/hw/intc/arm_gicv3_common.h > index 6d4327b..f01b616 100644 > --- a/include/hw/intc/arm_gicv3_common.h > +++ b/include/hw/intc/arm_gicv3_common.h > @@ -135,6 +135,8 @@ typedef struct GICv3CPUState GICv3CPUState; > struct GICv3CPUState { > GICv3State *gic; > CPUState *cpu; > + qemu_irq parent_irq; > + qemu_irq parent_fiq; > > /* Redistributor */ > uint32_t level; /* Current IRQ level */ > @@ -169,9 +171,6 @@ struct GICv3State { > SysBusDevice parent_obj; > /*< public >*/ > > - qemu_irq *parent_irq; > - qemu_irq *parent_fiq; > - > MemoryRegion iomem_dist; /* Distributor */ > MemoryRegion iomem_redist; /* Redistributors */ > > -- Shannon