@@ -526,8 +526,8 @@ extern const VMStateInfo vmstate_info_bitmap;
VMSTATE_STRUCT_ARRAY_TEST(_field, _state, _num, NULL, _version, \
_vmsd, _type)
-#define VMSTATE_BOOL_V(_f, _s, _v) \
- VMSTATE_SINGLE(_f, _s, _v, vmstate_info_bool, bool)
+#define VMSTATE_BOOL_TEST(_f, _s, _t) \
+ VMSTATE_SINGLE_TEST(_f, _s, _t, 0, vmstate_info_bool, bool)
#define VMSTATE_INT8_V(_f, _s, _v) \
VMSTATE_SINGLE(_f, _s, _v, vmstate_info_int8, int8_t)
@@ -548,7 +548,7 @@ extern const VMStateInfo vmstate_info_bitmap;
VMSTATE_SINGLE(_f, _s, _v, vmstate_info_uint64, uint64_t)
#define VMSTATE_BOOL(_f, _s) \
- VMSTATE_BOOL_V(_f, _s, 0)
+ VMSTATE_BOOL_TEST(_f, _s, NULL)
#define VMSTATE_INT8(_f, _s) \
VMSTATE_INT8_V(_f, _s, 0)
@@ -274,6 +274,49 @@ static void test_simple_primitive(void)
FIELD_EQUAL(i64_1);
FIELD_EQUAL(i64_2);
}
+
+static bool test_true(void *opaque, int version_id)
+{
+ return true;
+}
+
+static bool test_false(void *opaque, int version_id)
+{
+ return false;
+}
+
+static const VMStateDescription vmstate_simple_test = {
+ .name = "simple/test",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .minimum_version_id_old = 1,
+ .fields = (VMStateField[]) {
+ VMSTATE_BOOL_TEST(b_1, TestSimple, test_true),
+ VMSTATE_BOOL_TEST(b_2, TestSimple, test_false),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
+uint8_t wire_simple_test[] = {
+ /* b_1 */ 0x01,
+ QEMU_VM_EOF, /* just to ensure we won't get EOF reported prematurely */
+};
+
+static void test_simple_test(void)
+{
+ TestSimple obj, obj_clone;
+
+ memset(&obj, 0, sizeof(obj));
+ save_vmstate(&vmstate_simple_test, &obj_simple);
+
+ compare_vmstate(wire_simple_test, sizeof(wire_simple_test));
+
+ SUCCESS(load_vmstate(&vmstate_simple_test, &obj, &obj_clone,
+ obj_simple_copy, 1, wire_simple_test,
+ sizeof(wire_simple_test)));
+
+ FIELD_EQUAL(b_1);
+}
#undef FIELD_EQUAL
typedef struct TestVersioned {
@@ -507,6 +550,7 @@ int main(int argc, char **argv)
g_test_add_func("/vmstate/simple/v2", test_simple_v2);
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_run();
close(temp_fd);
Remove VMSTATE_BOOL_V, we are removing versioning, would use only tests. Signed-off-by: Juan Quintela <quintela@redhat.com> --- include/migration/vmstate.h | 6 +++--- tests/test-vmstate.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 3 deletions(-)