Commit 830fc739 authored by Damien Hedde's avatar Damien Hedde Committed by Peter Maydell
Browse files

pl330: fix vmstate description 



Fix the pl330 main and queue vmstate description.
There were missing POINTER flags causing crashes during
incoming migration because:
+ PL330State chan field is a pointer to an array
+ PL330Queue queue field is a pointer to an array

Also bump corresponding vmsd version numbers.

Signed-off-by: default avatarDamien Hedde <damien.hedde@greensocs.com>
Reviewed-by: default avatarPhilippe Mathieu-Daude <philmd@redhat.com>
Acked-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Message-id: 20190724143553.21557-1-damien.hedde@greensocs.com
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent c985266e

hw/dma/pl330.c

+9 −8
Original line number Diff line number Diff line
@@ -218,11 +218,12 @@ typedef struct PL330Queue { 


static const VMStateDescription vmstate_pl330_queue = {

    .name = "pl330_queue",

    .version_id = 1,

    .minimum_version_id = 1,

    .version_id = 2,

    .minimum_version_id = 2,

    .fields = (VMStateField[]) {

        VMSTATE_STRUCT_VARRAY_UINT32(queue, PL330Queue, queue_size, 1,

                                 vmstate_pl330_queue_entry, PL330QueueEntry),

        VMSTATE_STRUCT_VARRAY_POINTER_UINT32(queue, PL330Queue, queue_size,

                                             vmstate_pl330_queue_entry,

                                             PL330QueueEntry),

        VMSTATE_END_OF_LIST()

    }

};
@@ -278,11 +279,11 @@ struct PL330State { 


static const VMStateDescription vmstate_pl330 = {

    .name = "pl330",

    .version_id = 1,

    .minimum_version_id = 1,

    .version_id = 2,

    .minimum_version_id = 2,

    .fields = (VMStateField[]) {

        VMSTATE_STRUCT(manager, PL330State, 0, vmstate_pl330_chan, PL330Chan),

        VMSTATE_STRUCT_VARRAY_UINT32(chan, PL330State, num_chnls, 0,

        VMSTATE_STRUCT_VARRAY_POINTER_UINT32(chan, PL330State, num_chnls,

                                             vmstate_pl330_chan, PL330Chan),

        VMSTATE_VBUFFER_UINT32(lo_seqn, PL330State, 1, NULL, num_chnls),

        VMSTATE_VBUFFER_UINT32(hi_seqn, PL330State, 1, NULL, num_chnls),