Commit d2164ad3 authored by Halil Pasic's avatar Halil Pasic Committed by Juan Quintela
Browse files

vmstate: error hint for failed equal checks 



In some cases a failing VMSTATE_*_EQUAL does not mean we detected a bug,
but it's actually the best we can do. Especially in these cases a verbose
error message is required.

Let's introduce infrastructure for specifying a error hint to be used if
equal check fails. Let's do this by adding a parameter to the _EQUAL
macros called _err_hint. Also change all current users to pass NULL as
last parameter so nothing changes for them.

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

Message-Id: <20170623144823.42936-1-pasic@linux.vnet.ibm.com>
Reviewed-by: default avatarJuan Quintela <quintela@redhat.com>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
parent 01f6e14c

hw/block/fdc.c

+1 −1
Original line number Diff line number Diff line
@@ -1217,7 +1217,7 @@ static const VMStateDescription vmstate_fdc = { 
        VMSTATE_UINT8(config, FDCtrl),

        VMSTATE_UINT8(lock, FDCtrl),

        VMSTATE_UINT8(pwrd, FDCtrl),

        VMSTATE_UINT8_EQUAL(num_floppies, FDCtrl),

        VMSTATE_UINT8_EQUAL(num_floppies, FDCtrl, NULL),

        VMSTATE_STRUCT_ARRAY(drives, FDCtrl, MAX_FD, 1,

                             vmstate_fdrive, FDrive),

        VMSTATE_END_OF_LIST()

hw/display/qxl.c

+2 −2
Original line number Diff line number Diff line
@@ -2373,12 +2373,12 @@ static VMStateDescription qxl_vmstate = { 
        VMSTATE_UINT32(last_release_offset, PCIQXLDevice),

        VMSTATE_UINT32(mode, PCIQXLDevice),

        VMSTATE_UINT32(ssd.unique, PCIQXLDevice),

        VMSTATE_INT32_EQUAL(num_memslots, PCIQXLDevice),

        VMSTATE_INT32_EQUAL(num_memslots, PCIQXLDevice, NULL),

        VMSTATE_STRUCT_ARRAY(guest_slots, PCIQXLDevice, NUM_MEMSLOTS, 0,

                             qxl_memslot, struct guest_slots),

        VMSTATE_STRUCT(guest_primary.surface, PCIQXLDevice, 0,

                       qxl_surface, QXLSurfaceCreate),

        VMSTATE_INT32_EQUAL(ssd.num_surfaces, PCIQXLDevice),

        VMSTATE_INT32_EQUAL(ssd.num_surfaces, PCIQXLDevice, NULL),

        VMSTATE_VARRAY_INT32(guest_surfaces.cmds, PCIQXLDevice,

                             ssd.num_surfaces, 0,

                             vmstate_info_uint64, uint64_t),

hw/display/vga.c

+1 −1
Original line number Diff line number Diff line
@@ -2099,7 +2099,7 @@ const VMStateDescription vmstate_vga_common = { 
        VMSTATE_BUFFER(palette, VGACommonState),



        VMSTATE_INT32(bank_offset, VGACommonState),

        VMSTATE_UINT8_EQUAL(is_vbe_vmstate, VGACommonState),

        VMSTATE_UINT8_EQUAL(is_vbe_vmstate, VGACommonState, NULL),

        VMSTATE_UINT16(vbe_index, VGACommonState),

        VMSTATE_UINT16_ARRAY(vbe_regs, VGACommonState, VBE_DISPI_INDEX_NB),

        VMSTATE_UINT32(vbe_start_addr, VGACommonState),

hw/display/virtio-gpu.c

+1 −1
Original line number Diff line number Diff line
@@ -962,7 +962,7 @@ static const VMStateDescription vmstate_virtio_gpu_scanouts = { 
    .version_id = 1,

    .fields = (VMStateField[]) {

        VMSTATE_INT32(enable, struct VirtIOGPU),

        VMSTATE_UINT32_EQUAL(conf.max_outputs, struct VirtIOGPU),

        VMSTATE_UINT32_EQUAL(conf.max_outputs, struct VirtIOGPU, NULL),

        VMSTATE_STRUCT_VARRAY_UINT32(scanout, struct VirtIOGPU,

                                     conf.max_outputs, 1,

                                     vmstate_virtio_gpu_scanout,

hw/display/vmware_vga.c

+1 −1
Original line number Diff line number Diff line
@@ -1192,7 +1192,7 @@ static const VMStateDescription vmstate_vmware_vga_internal = { 
    .minimum_version_id = 0,

    .post_load = vmsvga_post_load,

    .fields = (VMStateField[]) {

        VMSTATE_INT32_EQUAL(new_depth, struct vmsvga_state_s),

        VMSTATE_INT32_EQUAL(new_depth, struct vmsvga_state_s, NULL),

        VMSTATE_INT32(enable, struct vmsvga_state_s),

        VMSTATE_INT32(config, struct vmsvga_state_s),

        VMSTATE_INT32(cursor.id, struct vmsvga_state_s),