[1/6] 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: David Gibson <david@gibson.dropbear.id.au>
---
 savevm.c  |   20 ++++++++++++++++++++
 vmstate.h |    7 +++++++
 2 files changed, 27 insertions(+)

On Wed, Sep 26, 2012 at 3:21 AM, David Gibson
<david@gibson.dropbear.id.au> wrote:
> 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: David Gibson <david@gibson.dropbear.id.au>
> ---
>  savevm.c  |   20 ++++++++++++++++++++
>  vmstate.h |    7 +++++++
>  2 files changed, 27 insertions(+)
>
> diff --git a/savevm.c b/savevm.c
> index c7fe283..f38e16e 100644
> --- a/savevm.c
> +++ b/savevm.c
> @@ -1043,6 +1043,26 @@ 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)

Braces.

> +        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 */
>
> diff --git a/vmstate.h b/vmstate.h
> index c9c320e..6c7fbe0 100644
> --- a/vmstate.h
> +++ b/vmstate.h
> @@ -129,6 +129,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;
> @@ -488,6 +489,12 @@ extern const VMStateInfo vmstate_info_unused_buffer;
>  #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)
>
> --
> 1.7.10.4
>
>

On Sat, Sep 29, 2012 at 11:36:35AM +0000, Blue Swirl wrote:
> On Wed, Sep 26, 2012 at 3:21 AM, David Gibson
> <david@gibson.dropbear.id.au> wrote:
> > 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: David Gibson <david@gibson.dropbear.id.au>
> > ---
> >  savevm.c  |   20 ++++++++++++++++++++
> >  vmstate.h |    7 +++++++
> >  2 files changed, 27 insertions(+)
> >
> > diff --git a/savevm.c b/savevm.c
> > index c7fe283..f38e16e 100644
> > --- a/savevm.c
> > +++ b/savevm.c
> > @@ -1043,6 +1043,26 @@ 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)
> 
> Braces.

Oops, fixed for the next version.