[Qemu-devel] [PATCH 93/97] vmstate: Test for VMSTATE_PARTIAL_VBUFFER

[Juan Quintela]

Signed-off-by: Juan Quintela <address@hidden>
---
 tests/test-vmstate.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)

diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c
index 92e6bcc..6d8545c 100644
--- a/tests/test-vmstate.c
+++ b/tests/test-vmstate.c
@@ -1100,6 +1100,84 @@ static void test_buffer_test(void)
     SUCCESS(memcmp(obj.buffer, obj_buffer.buffer, sizeof(obj.buffer)));
     FAILURE(memcmp(obj.partial, obj_buffer.partial, sizeof(obj.partial)));
 }
+
+typedef struct TestVBuffer {
+    int32_t size;
+    uint8_t  *buffer;
+} TestVBuffer;
+
+uint8_t test_buffer[VMSTATE_ARRAY_SIZE] = { 1, 2, 3, 4, 5};
+
+TestVBuffer obj_vbuffer = {
+    .size = VMSTATE_ARRAY_SIZE,
+    .buffer = test_buffer,
+};
+
+static const VMStateDescription vmstate_vbuffer_simple = {
+    .name = "array/test",
+    .version_id = 1,
+    .minimum_version_id = 1,
+    .minimum_version_id_old = 1,
+    .fields = (VMStateField[]) {
+        VMSTATE_INT32(size, TestVBuffer),
+        VMSTATE_PARTIAL_VBUFFER(buffer, TestVBuffer, size),
+        VMSTATE_END_OF_LIST()
+    }
+};
+
+uint8_t wire_vbuffer_simple[] = {
+    /* size */    0x00, 0x00, 0x00, 0x05,
+    /* buffer */  0x01, 0x02, 0x03, 0x04, 0x05,
+    QEMU_VM_EOF, /* just to ensure we won't get EOF reported prematurely */
+};
+
+static void test_vbuffer_simple(void)
+{
+    QEMUFile *fsave = open_test_file(true);
+
+    /* Save file with vmstate */
+    vmstate_save_state(fsave, &vmstate_vbuffer_simple, &obj_vbuffer);
+    g_assert(!qemu_file_get_error(fsave));
+    qemu_fclose(fsave);
+
+    QEMUFile *loading = open_test_file(false);
+    /* we don't need QEMU_VM_EOF */
+    uint8_t result[sizeof(wire_vbuffer_simple)-1];
+
+    /* read back as binary */
+
+    g_assert_cmpint(qemu_get_buffer(loading, result, sizeof(result)), ==,
+                    sizeof(result));
+    g_assert(!qemu_file_get_error(loading));
+
+    /* Compare that what is on the file is the same that what we
+       expected to be there */
+    SUCCESS(memcmp(result, wire_vbuffer_simple, sizeof(result)));
+
+    /* Must reach EOF */
+    qemu_get_byte(loading);
+    g_assert_cmpint(qemu_file_get_error(loading), ==, -EIO);
+
+    qemu_fclose(loading);
+
+    /* We save the file again.  We want the EOF this time */
+
+    fsave = open_test_file(true);
+    qemu_put_buffer(fsave, wire_vbuffer_simple, sizeof(wire_vbuffer_simple));
+    qemu_fclose(fsave);
+
+    loading = open_test_file(false);
+    TestVBuffer obj;
+    uint8_t local[VMSTATE_ARRAY_SIZE];
+
+    obj.buffer = local;
+    SUCCESS(vmstate_load_state(loading, &vmstate_vbuffer_simple, &obj, 1));
+    g_assert(!qemu_file_get_error(loading));
+
+    qemu_fclose(loading);
+
+    SUCCESS(memcmp(obj.buffer, obj_vbuffer.buffer, VMSTATE_ARRAY_SIZE));
+}
 #undef FIELD_ASSERT


@@ -1329,6 +1407,7 @@ int main(int argc, char **argv)
     g_test_add_func("/vmstate/array/sub", test_array_sub);
     g_test_add_func("/vmstate/buffer/simple", test_buffer_simple);
     g_test_add_func("/vmstate/buffer/test", test_buffer_test);
+    g_test_add_func("/vmstate/vbuffer/simple", test_vbuffer_simple);
     g_test_add_func("/vmstate/versioned/load/v1", test_load_v1);
     g_test_add_func("/vmstate/versioned/load/v2", test_load_v2);
     g_test_add_func("/vmstate/field_exists/load/noskip", test_load_noskip);
-- 
1.9.0