From patchwork Mon Apr 7 03:21:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 337344 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F7231400E1 for ; Mon, 7 Apr 2014 14:07:49 +1000 (EST) Received: from localhost ([::1]:60515 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX0qZ-0007bA-8i for incoming@patchwork.ozlabs.org; Mon, 07 Apr 2014 00:07:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52134) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX0AU-00006e-SU for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:24:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WX0AO-0000KO-NE for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:24:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:20791) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX0AO-0000KG-E4 for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:24:12 -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 s373OBcQ027467 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 6 Apr 2014 23:24:12 -0400 Received: from trasno.mitica (ovpn-116-27.ams2.redhat.com [10.36.116.27]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id s373LuY5020053; Sun, 6 Apr 2014 23:24:10 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 7 Apr 2014 05:21:55 +0200 Message-Id: <1396840915-10384-98-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> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 97/97] vmstate: Test for VMSTATE_VBUFFER_UINT32 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Juan Quintela --- tests/test-vmstate.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c index ea24f26..4fa235d 100644 --- a/tests/test-vmstate.c +++ b/tests/test-vmstate.c @@ -1104,13 +1104,18 @@ static void test_buffer_test(void) typedef struct TestVBuffer { int32_t size; uint8_t *buffer; + uint32_t size2; + uint8_t *buffer2; } TestVBuffer; uint8_t test_buffer[VMSTATE_ARRAY_SIZE] = { 1, 2, 3, 4, 5}; +uint8_t test_buffer2[VMSTATE_ARRAY_SIZE] = { 6, 7, 8, 9, 10}; TestVBuffer obj_vbuffer = { .size = VMSTATE_ARRAY_SIZE, .buffer = test_buffer, + .size2 = VMSTATE_ARRAY_SIZE, + .buffer2 = test_buffer2, }; static const VMStateDescription vmstate_vbuffer_simple = { @@ -1120,14 +1125,18 @@ static const VMStateDescription vmstate_vbuffer_simple = { .minimum_version_id_old = 1, .fields = (VMStateField[]) { VMSTATE_INT32(size, TestVBuffer), + VMSTATE_UINT32(size2, TestVBuffer), VMSTATE_VBUFFER_INT32(buffer, TestVBuffer, size), + VMSTATE_VBUFFER_UINT32(buffer2, TestVBuffer, size2), VMSTATE_END_OF_LIST() } }; uint8_t wire_vbuffer_simple[] = { /* size */ 0x00, 0x00, 0x00, 0x05, + /* size2 */ 0x00, 0x00, 0x00, 0x05, /* buffer */ 0x01, 0x02, 0x03, 0x04, 0x05, + /* buffer2 */ 0x06, 0x07, 0x08, 0x09, 0x0a, QEMU_VM_EOF, /* just to ensure we won't get EOF reported prematurely */ }; @@ -1169,14 +1178,17 @@ static void test_vbuffer_simple(void) loading = open_test_file(false); TestVBuffer obj; uint8_t local[VMSTATE_ARRAY_SIZE]; + uint8_t local2[VMSTATE_ARRAY_SIZE]; obj.buffer = local; + obj.buffer2 = local2; 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)); + SUCCESS(memcmp(obj.buffer2, obj_vbuffer.buffer2, VMSTATE_ARRAY_SIZE)); } #undef FIELD_ASSERT