@@ -568,7 +568,7 @@ extern const VMStateInfo vmstate_info_bitmap;
VMSTATE_UINT64_TEST(_f, _s, NULL)
#define VMSTATE_UINT8_EQUAL(_f, _s) \
- VMSTATE_SINGLE(_f, _s, 0, vmstate_info_uint8_equal, uint8_t)
+ VMSTATE_SINGLE_TEST(_f, _s, NULL, 0, vmstate_info_uint8_equal, uint8_t)
#define VMSTATE_UINT16_EQUAL(_f, _s) \
VMSTATE_SINGLE(_f, _s, 0, vmstate_info_uint16_equal, uint16_t)
@@ -360,6 +360,47 @@ static void test_simple_test(void)
FIELD_EQUAL(u32_1);
FIELD_EQUAL(u64_1);
}
+
+static const VMStateDescription vmstate_simple_compare = {
+ .name = "simple/compare",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .minimum_version_id_old = 1,
+ .fields = (VMStateField[]) {
+ VMSTATE_UINT8_EQUAL(u8_1, TestSimple),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
+uint8_t wire_simple_compare[] = {
+ /* u8_1 */ 0x82,
+ QEMU_VM_EOF, /* just to ensure we won't get EOF reported prematurely */
+};
+
+static void test_simple_compare(void)
+{
+ TestSimple obj, obj_clone;
+
+ memset(&obj, 0, sizeof(obj));
+ save_vmstate(&vmstate_simple_compare, &obj_simple);
+
+ compare_vmstate(wire_simple_compare, sizeof(wire_simple_compare));
+
+
+ /* we are testing that values are the same, we need to
+ have the same value */
+ memcpy(&obj, &obj_simple, sizeof(obj));
+ SUCCESS(load_vmstate(&vmstate_simple_compare, &obj, &obj_clone,
+ obj_simple_copy, 1, wire_simple_compare,
+ sizeof(wire_simple_compare)));
+
+ /* we change the value, so it is not equal anymore */
+ memcpy(&obj, &obj_simple, sizeof(obj));
+ obj.u8_1 = 27;
+ FAILURE(load_vmstate(&vmstate_simple_compare, &obj, &obj_clone,
+ obj_simple_copy, 1, wire_simple_compare,
+ sizeof(wire_simple_compare)));
+}
#undef FIELD_EQUAL
typedef struct TestBitmap {
@@ -666,6 +707,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/compare", test_simple_compare);
g_test_add_func("/vmstate/simple/bitmap", test_simple_bitmap);
g_test_run();
We intruduce another full test. Signed-off-by: Juan Quintela <quintela@redhat.com> --- include/migration/vmstate.h | 2 +- tests/test-vmstate.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-)