Commit 59046ec2 authored by Halil Pasic's avatar Halil Pasic Committed by Dr. David Alan Gilbert
Browse files

migration: consolidate VMStateField.start 



The member VMStateField.start is used for two things, partial data
migration for VBUFFER data (basically provide migration for a
sub-buffer) and for locating next in QTAILQ.

The implementation of the VBUFFER feature is broken when VMSTATE_ALLOC
is used. This however goes unnoticed because actually partial migration
for VBUFFER is not used at all.

Let's consolidate the usage of VMStateField.start by removing support
for partial migration for VBUFFER.

Signed-off-by: default avatarHalil Pasic <pasic@linux.vnet.ibm.com>

Message-Id: <20170203175217.45562-1-pasic@linux.vnet.ibm.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
parent 0827b9e9

hw/char/exynos4210_uart.c

+1 −1
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ static const VMStateDescription vmstate_exynos4210_uart_fifo = { 
    .fields = (VMStateField[]) {

        VMSTATE_UINT32(sp, Exynos4210UartFIFO),

        VMSTATE_UINT32(rp, Exynos4210UartFIFO),

        VMSTATE_VBUFFER_UINT32(data, Exynos4210UartFIFO, 1, NULL, 0, size),

        VMSTATE_VBUFFER_UINT32(data, Exynos4210UartFIFO, 1, NULL, size),

        VMSTATE_END_OF_LIST()

    }

};

hw/display/g364fb.c

+1 −1
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ static const VMStateDescription vmstate_g364fb = { 
    .minimum_version_id = 1,

    .post_load = g364fb_post_load,

    .fields = (VMStateField[]) {

        VMSTATE_VBUFFER_UINT32(vram, G364State, 1, NULL, 0, vram_size),

        VMSTATE_VBUFFER_UINT32(vram, G364State, 1, NULL, vram_size),

        VMSTATE_BUFFER_UNSAFE(color_palette, G364State, 0, 256 * 3),

        VMSTATE_BUFFER_UNSAFE(cursor_palette, G364State, 0, 9),

        VMSTATE_UINT16_ARRAY(cursor, G364State, 512),

hw/dma/pl330.c

+4 −4
Original line number Diff line number Diff line
@@ -173,8 +173,8 @@ static const VMStateDescription vmstate_pl330_fifo = { 
    .version_id = 1,

    .minimum_version_id = 1,

    .fields = (VMStateField[]) {

        VMSTATE_VBUFFER_UINT32(buf, PL330Fifo, 1, NULL, 0, buf_size),

        VMSTATE_VBUFFER_UINT32(tag, PL330Fifo, 1, NULL, 0, buf_size),

        VMSTATE_VBUFFER_UINT32(buf, PL330Fifo, 1, NULL, buf_size),

        VMSTATE_VBUFFER_UINT32(tag, PL330Fifo, 1, NULL, buf_size),

        VMSTATE_UINT32(head, PL330Fifo),

        VMSTATE_UINT32(num, PL330Fifo),

        VMSTATE_UINT32(buf_size, PL330Fifo),
@@ -282,8 +282,8 @@ static const VMStateDescription vmstate_pl330 = { 
        VMSTATE_STRUCT(manager, PL330State, 0, vmstate_pl330_chan, PL330Chan),

        VMSTATE_STRUCT_VARRAY_UINT32(chan, PL330State, num_chnls, 0,

                                     vmstate_pl330_chan, PL330Chan),

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

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

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

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

        VMSTATE_STRUCT(fifo, PL330State, 0, vmstate_pl330_fifo, PL330Fifo),

        VMSTATE_STRUCT(read_queue, PL330State, 0, vmstate_pl330_queue,

                       PL330Queue),

hw/intc/exynos4210_gic.c

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ static const VMStateDescription vmstate_exynos4210_irq_gate = { 
    .version_id = 2,

    .minimum_version_id = 2,

    .fields = (VMStateField[]) {

        VMSTATE_VBUFFER_UINT32(level, Exynos4210IRQGateState, 1, NULL, 0, n_in),

        VMSTATE_VBUFFER_UINT32(level, Exynos4210IRQGateState, 1, NULL, n_in),

        VMSTATE_END_OF_LIST()

    }

};

hw/ipmi/isa_ipmi_bt.c

+2 −4
Original line number Diff line number Diff line
@@ -471,10 +471,8 @@ static const VMStateDescription vmstate_ISAIPMIBTDevice = { 
        VMSTATE_BOOL(bt.use_irq, ISAIPMIBTDevice),

        VMSTATE_BOOL(bt.irqs_enabled, ISAIPMIBTDevice),

        VMSTATE_UINT32(bt.outpos, ISAIPMIBTDevice),

        VMSTATE_VBUFFER_UINT32(bt.outmsg, ISAIPMIBTDevice, 1, NULL, 0,

                               bt.outlen),

        VMSTATE_VBUFFER_UINT32(bt.inmsg, ISAIPMIBTDevice, 1, NULL, 0,

                               bt.inlen),

        VMSTATE_VBUFFER_UINT32(bt.outmsg, ISAIPMIBTDevice, 1, NULL, bt.outlen),

        VMSTATE_VBUFFER_UINT32(bt.inmsg, ISAIPMIBTDevice, 1, NULL, bt.inlen),

        VMSTATE_UINT8(bt.control_reg, ISAIPMIBTDevice),

        VMSTATE_UINT8(bt.mask_reg, ISAIPMIBTDevice),

        VMSTATE_UINT8(bt.waiting_rsp, ISAIPMIBTDevice),