Re: [Qemu-arm] [Qemu-devel] [PATCH v3 4/6] cadence_gem: Add queue support

[Peter Maydell]

On 28 July 2016 at 17:33, Alistair Francis <address@hidden> wrote:
> On Thu, Jul 28, 2016 at 2:39 AM, Peter Maydell <address@hidden> wrote:
>> On 26 July 2016 at 19:25, Alistair Francis <address@hidden> wrote:
>>> Signed-off-by: Alistair Francis <address@hidden>
>>> ---
>>>
>>> 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 <address@hidden>
>
> Thanks!
>
> Will this make it into 2.7?

I'm afraid not, no (we discussed this when you posted v1, I think).

thanks
-- PMM