From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52018) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX0AE-0008Jo-Nn for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:24:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WX0A8-0000FI-JA for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:24:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55117) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX0A8-0000FA-B4 for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:23:56 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s373Ntge027404 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 6 Apr 2014 23:23:55 -0400 From: Juan Quintela Date: Mon, 7 Apr 2014 05:21:43 +0200 Message-Id: <1396840915-10384-86-git-send-email-quintela@redhat.com> In-Reply-To: <1396840915-10384-1-git-send-email-quintela@redhat.com> References: <1396840915-10384-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PATCH 85/97] vmstate: Test for VMSTATE_BUFFER List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Juan Quintela --- tests/test-vmstate.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 70 insertions(+), 1 deletion(-) diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c index a087007..2fbcc02 100644 --- a/tests/test-vmstate.c +++ b/tests/test-vmstate.c @@ -949,10 +949,78 @@ static void test_array_sub(void) ELEM_NOT_ASSERT(u32_2, i); } } -#undef FIELD_ASSERT #undef ELEM_ASSERT #undef ELEM_NOT_ASSERT +typedef struct TestBuffer { + uint8_t buffer[6]; +} TestBuffer; + +TestBuffer obj_buffer = { + .buffer = "hello", +}; + +static const VMStateDescription vmstate_buffer_simple = { + .name = "array/test", + .version_id = 1, + .minimum_version_id = 1, + .minimum_version_id_old = 1, + .fields = (VMStateField[]) { + VMSTATE_BUFFER(buffer, TestBuffer), + VMSTATE_END_OF_LIST() + } +}; + +uint8_t wire_buffer_simple[] = { + /* buffer */ 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x00, + QEMU_VM_EOF, /* just to ensure we won't get EOF reported prematurely */ +}; + +static void test_buffer_simple(void) +{ + QEMUFile *fsave = open_test_file(true); + + /* Save file with vmstate */ + vmstate_save_state(fsave, &vmstate_buffer_simple, &obj_buffer); + 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_buffer_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_buffer_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_buffer_simple, sizeof(wire_buffer_simple)); + qemu_fclose(fsave); + + loading = open_test_file(false); + TestBuffer obj; + SUCCESS(vmstate_load_state(loading, &vmstate_buffer_simple, &obj, 1)); + g_assert(!qemu_file_get_error(loading)); + + qemu_fclose(loading); + SUCCESS(memcmp(obj.buffer, obj_buffer.buffer, sizeof(obj.buffer))); +} +#undef FIELD_ASSERT + typedef struct TestStruct { uint32_t a, b, c, e; @@ -1178,6 +1246,7 @@ int main(int argc, char **argv) g_test_add_func("/vmstate/array/primitive", test_array_primitive); g_test_add_func("/vmstate/array/test", test_array_test); 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/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