Remove the unused version field (was unused).
Signed-off-by: Juan Quintela <quint...@redhat.com>
---
hw/sd/sd.c | 2 +-
include/migration/vmstate.h | 4 +--
tests/test-vmstate.c | 75 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 78 insertions(+), 3 deletions(-)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 4502ad1..7ee8c24 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -467,7 +467,7 @@ static const VMStateDescription sd_vmstate = {
VMSTATE_UINT32(card_status, SDState),
VMSTATE_PARTIAL_BUFFER(sd_status, SDState, 1),
VMSTATE_UINT32(vhs, SDState),
- VMSTATE_BITMAP(wp_groups, SDState, 0, wpgrps_size),
+ VMSTATE_BITMAP(wp_groups, SDState, wpgrps_size),
VMSTATE_UINT32(blk_len, SDState),
VMSTATE_UINT32(erase_start, SDState),
VMSTATE_UINT32(erase_end, SDState),
diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index 553cc0a..52b0cc8 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -493,9 +493,9 @@ extern const VMStateInfo vmstate_info_bitmap;
/* _field_size should be a int32_t field in the _state struct giving the
* size of the bitmap _field in bits.
*/
-#define VMSTATE_BITMAP(_field, _state, _version, _field_size) { \
+#define VMSTATE_BITMAP(_field, _state, _field_size) { \
.name = (stringify(_field)), \
- .version_id = (_version), \
+ .version_id = 0, \
.size_offset = vmstate_offset_value(_state, _field_size, int32_t),\
.info = &vmstate_info_bitmap, \
.flags = VMS_VBUFFER|VMS_POINTER, \
diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c
index 2aa6d8b..f105e2c 100644
--- a/tests/test-vmstate.c
+++ b/tests/test-vmstate.c
@@ -28,6 +28,7 @@
#include "migration/migration.h"
#include "migration/vmstate.h"
#include "block/coroutine.h"
+#include "qemu/bitmap.h"
char temp_file[] = "/tmp/vmst.test.XXXXXX";
int temp_fd;
@@ -361,6 +362,79 @@ static void test_simple_test(void)
}
#undef FIELD_EQUAL
+typedef struct TestBitmap {
+ int32_t bitmap_size;
+ unsigned long *bitmap;
+} TestBitmap;
+
+static const VMStateDescription vmstate_simple_bitmap = {
+ .name = "simple/bitmap",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .minimum_version_id_old = 1,
+ .fields = (VMStateField[]) {
+ VMSTATE_INT32_EQUAL(bitmap_size, TestBitmap),
+ VMSTATE_BITMAP(bitmap, TestBitmap, bitmap_size),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
+/* This is the binary representation on the wire of that struct */
+uint8_t wire_simple_bitmap[] = {
+ 0x00, 0x00, 0x00, 0x40, /* size */
+ 0x40, 0x00, 0x00, 0x00, /* bitmap */
+ 0x40, 0x40, 0x00, 0x01,
+ QEMU_VM_EOF, /* just to ensure we won't get EOF reported prematurely */
+};
+
+#define VMSTATE_BITMAP_SIZE 64
+
+static void obj_bitmap_copy(void *arg1, void *arg2)
+{
+ TestBitmap *target = arg1;
+ TestBitmap *source = arg2;
+
+ target->bitmap_size = source->bitmap_size;
+ memcpy(target->bitmap, source->bitmap, VMSTATE_BITMAP_SIZE / sizeof(long));
+}
+
+static TestBitmap *create_bitmap(void)
+{
+ TestBitmap *obj = g_malloc0(sizeof(*obj));
+ obj->bitmap_size = VMSTATE_BITMAP_SIZE;
+ obj->bitmap = bitmap_new(VMSTATE_BITMAP_SIZE);
+
+ return obj;
+}
+
+static void test_simple_bitmap(void)
+{
+ TestBitmap *obj_bitmap, *obj, *obj_clone;
+
+ obj_bitmap = create_bitmap();
+ obj = create_bitmap();
+ obj_clone = create_bitmap();
+
+ set_bit(0, obj_bitmap->bitmap);
+ set_bit(22, obj_bitmap->bitmap);
+ set_bit(30, obj_bitmap->bitmap);
+ set_bit(62, obj_bitmap->bitmap);
+
+ save_vmstate(&vmstate_simple_bitmap, obj_bitmap);
+
+ compare_vmstate(wire_simple_bitmap, sizeof(wire_simple_bitmap));
+
+ SUCCESS(load_vmstate(&vmstate_simple_bitmap, obj, obj_clone,
+ obj_bitmap_copy, 1, wire_simple_bitmap,
+ sizeof(wire_simple_bitmap)));
+
+#define FIELD_EQUAL(name) g_assert_cmpint(obj->name, ==, obj_bitmap->name)
+ FIELD_EQUAL(bitmap_size);
+ g_assert_cmpint(bitmap_equal(obj->bitmap, obj_bitmap->bitmap,
+ VMSTATE_BITMAP_SIZE), ==, 1);
+#undef FIELD_EQUAL
+}
+
typedef struct TestVersioned {
uint32_t a, b, c, e;
uint64_t d, f;
@@ -592,6 +666,7 @@ int main(int argc, char **argv)
g_test_add_func("/vmstate/simple/skip", test_simple_skip);
g_test_add_func("/vmstate/simple/no_skip", test_simple_no_skip);
g_test_add_func("/vmstate/simple/test", test_simple_test);
+ g_test_add_func("/vmstate/simple/bitmap", test_simple_bitmap);
g_test_run();
close(temp_fd);
--
1.9.0
