On Thu, Jul 28, 2016 at 2:39 AM, Peter Maydell <peter.mayd...@linaro.org> wrote: > On 26 July 2016 at 19:25, Alistair Francis <alistair.fran...@xilinx.com> > wrote: >> Signed-off-by: Alistair Francis <alistair.fran...@xilinx.com> >> --- >> >> There is a indentation error in this patch in the gem_transmit function. >> I have written it like that to make it easier to see the changes. It is >> fixed in the next patch. > >> @@ -1417,8 +1500,8 @@ static void gem_init(Object *obj) >> >> static const VMStateDescription vmstate_cadence_gem = { >> .name = "cadence_gem", >> - .version_id = 3, >> - .minimum_version_id = 3, >> + .version_id = 4, >> + .minimum_version_id = 4, >> .fields = (VMStateField[]) { >> VMSTATE_UINT32_ARRAY(regs, CadenceGEMState, CADENCE_GEM_MAXREG), >> VMSTATE_UINT16_ARRAY(phy_regs, CadenceGEMState, 32), > > This bit should have moved into the other patch with the change of > the CADENCE_GEM_MAXREG define, right?
Woops, I have moved it to the previous patch. > > Otherwise > Reviewed-by: Peter Maydell <peter.mayd...@linaro.org> Thanks! Will this make it into 2.7? Thanks, Alistair > > thanks > -- PMM >