| Message ID | 20220509202035.50335-1-philippe.mathieu.daude@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/adc/zynq-xadc: Use qemu_irq typedef | expand |
On Mon, May 9, 2022 at 10:20 PM Philippe Mathieu-Daudé < philippe.mathieu.daude@gmail.com> wrote: > From: Philippe Mathieu-Daudé <f4bug@amsat.org> > > Except hw/core/irq.c which implements the forward-declared opaque > qemu_irq structure, hw/adc/zynq-xadc.{c,h} are the only files not > using the typedef. Fix this single exception. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > $ git grep --files-with-matches --perl-regexp "\bIRQState\b" hw/core/irq.c include/qemu/typedefs.h Reviewed-By: Bernhard Beschow <shentey@gmail.com>
On Mon, 9 May 2022 at 21:20, Philippe Mathieu-Daudé <philippe.mathieu.daude@gmail.com> wrote: > > From: Philippe Mathieu-Daudé <f4bug@amsat.org> > > Except hw/core/irq.c which implements the forward-declared opaque > qemu_irq structure, hw/adc/zynq-xadc.{c,h} are the only files not > using the typedef. Fix this single exception. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/adc/zynq-xadc.c | 4 ++-- > include/hw/adc/zynq-xadc.h | 3 +-- > 2 files changed, 3 insertions(+), 4 deletions(-) Applied to target-arm.next, thanks. -- PMM
diff --git a/hw/adc/zynq-xadc.c b/hw/adc/zynq-xadc.c index cfc7bab065..032e19cbd0 100644 --- a/hw/adc/zynq-xadc.c +++ b/hw/adc/zynq-xadc.c @@ -86,7 +86,7 @@ static void zynq_xadc_update_ints(ZynqXADCState *s) s->regs[INT_STS] |= INT_DFIFO_GTH; } - qemu_set_irq(s->qemu_irq, !!(s->regs[INT_STS] & ~s->regs[INT_MASK])); + qemu_set_irq(s->irq, !!(s->regs[INT_STS] & ~s->regs[INT_MASK])); } static void zynq_xadc_reset(DeviceState *d) @@ -262,7 +262,7 @@ static void zynq_xadc_init(Object *obj) memory_region_init_io(&s->iomem, obj, &xadc_ops, s, "zynq-xadc", ZYNQ_XADC_MMIO_SIZE); sysbus_init_mmio(sbd, &s->iomem); - sysbus_init_irq(sbd, &s->qemu_irq); + sysbus_init_irq(sbd, &s->irq); } static const VMStateDescription vmstate_zynq_xadc = { diff --git a/include/hw/adc/zynq-xadc.h b/include/hw/adc/zynq-xadc.h index 2017b7a803..c10cc4c379 100644 --- a/include/hw/adc/zynq-xadc.h +++ b/include/hw/adc/zynq-xadc.h @@ -39,8 +39,7 @@ struct ZynqXADCState { uint16_t xadc_dfifo[ZYNQ_XADC_FIFO_DEPTH]; uint16_t xadc_dfifo_entries; - struct IRQState *qemu_irq; - + qemu_irq irq; }; #endif /* ZYNQ_XADC_H */