On Tue, Jul 26, 2016 at 4:47 AM, Peter Maydell <peter.mayd...@linaro.org> wrote: > On 26 July 2016 at 01:12, Alistair Francis <alistair.fran...@xilinx.com> > wrote: >> The Cadence GEM hardware supports N number priority queues, this patch is a >> step towards that by adding the property to set the queues. At the moment >> behaviour doesn't change as we only use queue 0. >> >> Signed-off-by: Alistair Francis <alistair.fran...@xilinx.com> >> --- > >> @@ -1218,7 +1220,7 @@ static void gem_realize(DeviceState *dev, Error **errp) >> { >> CadenceGEMState *s = CADENCE_GEM(dev); >> >> - sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq); >> + sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq[0]); >> >> qemu_macaddr_default_if_unset(&s->conf.macaddr); > > At some point realize() needs to error-check the num-priority-queues > property (ie check it isn't >8). Do you do that later in the series? > (if so fine, if not, this patch is as good a place as any to put it.)
I'll add it in here. > >> @@ -1243,13 +1245,15 @@ static void gem_init(Object *obj) >> static const VMStateDescription vmstate_cadence_gem = { >> .name = "cadence_gem", >> .version_id = 2, >> - .minimum_version_id = 2, >> + .minimum_version_id = 3, > > You need to bump .version_id too. Yep, I misread it and thought it was a a.b version format. I'll fix up the other one as well. > > Otherwise > Reviewed-by: Peter Maydell <peter.mayd...@linaro.org> Thanks! Alistair > > thanks > -- PMM >