Commit e344b8a1 authored by David Gibson's avatar David Gibson Committed by Juan Quintela
Browse files

savevm: Add VMSTATE_UINT64_EQUAL helpers 



The savevm code already includes a number of *_EQUAL helpers which act as
sanity checks verifying that the configuration of the saved state matches
that of the machine we're loading into to work.  Variants already exist
for 8 bit 16 bit and 32 bit integers, but not 64 bit integers.  This patch
fills that hole, adding a UINT64 version.

Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
parent 817c6045

include/migration/vmstate.h

+7 −0
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ extern const VMStateInfo vmstate_info_uint8_equal; 
extern const VMStateInfo vmstate_info_uint16_equal;

extern const VMStateInfo vmstate_info_int32_equal;

extern const VMStateInfo vmstate_info_uint32_equal;

extern const VMStateInfo vmstate_info_uint64_equal;

extern const VMStateInfo vmstate_info_int32_le;



extern const VMStateInfo vmstate_info_uint8;
@@ -521,6 +522,12 @@ extern const VMStateInfo vmstate_info_bitmap; 
#define VMSTATE_UINT32_EQUAL(_f, _s)                                   \

    VMSTATE_SINGLE(_f, _s, 0, vmstate_info_uint32_equal, uint32_t)



#define VMSTATE_UINT64_EQUAL_V(_f, _s, _v)                            \

    VMSTATE_SINGLE(_f, _s, _v, vmstate_info_uint64_equal, uint64_t)



#define VMSTATE_UINT64_EQUAL(_f, _s)                                  \

    VMSTATE_UINT64_EQUAL_V(_f, _s, 0)



#define VMSTATE_INT32_LE(_f, _s)                                   \

    VMSTATE_SINGLE(_f, _s, 0, vmstate_info_int32_le, int32_t)

savevm.c

+21 −0
Original line number Diff line number Diff line
@@ -1072,6 +1072,27 @@ const VMStateInfo vmstate_info_uint64 = { 
    .put  = put_uint64,

};



/* 64 bit unsigned int. See that the received value is the same than the one

   in the field */



static int get_uint64_equal(QEMUFile *f, void *pv, size_t size)

{

    uint64_t *v = pv;

    uint64_t v2;

    qemu_get_be64s(f, &v2);



    if (*v == v2) {

        return 0;

    }

    return -EINVAL;

}



const VMStateInfo vmstate_info_uint64_equal = {

    .name = "int64 equal",

    .get  = get_uint64_equal,

    .put  = put_uint64,

};



/* 8 bit int. See that the received value is the same than the one

   in the field */