Skip to content

Commit

Permalink
Fix vmstate_info_int32_le comparison/assign
Browse files Browse the repository at this point in the history
Fix comparison of vmstate_info_int32_le so that it succeeds if loaded
value is (l)ess than or (e)qual

When the comparison succeeds, assign the value loaded
  This is a change in behaviour but I think the original intent, since
  the idea is to check if the version/size of the thing you're loading is
  less than some limit, but you might well want to do something based on
  the actual version/size in the file

Fix up comment and name text

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
  • Loading branch information
dagrh authored and Juan Quintela committed Feb 25, 2014
1 parent aded653 commit 24a370e
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions vmstate.c
Expand Up @@ -321,23 +321,24 @@ const VMStateInfo vmstate_info_int32_equal = {
.put = put_int32,
};

/* 32 bit int. See that the received value is the less or the same
than the one in the field */
/* 32 bit int. Check that the received value is less than or equal to
the one in the field */

static int get_int32_le(QEMUFile *f, void *pv, size_t size)
{
int32_t *old = pv;
int32_t new;
qemu_get_sbe32s(f, &new);
int32_t *cur = pv;
int32_t loaded;
qemu_get_sbe32s(f, &loaded);

if (*old <= new) {
if (loaded <= *cur) {
*cur = loaded;
return 0;
}
return -EINVAL;
}

const VMStateInfo vmstate_info_int32_le = {
.name = "int32 equal",
.name = "int32 le",
.get = get_int32_le,
.put = put_int32,
};
Expand Down

0 comments on commit 24a370e

Please sign in to comment.