From patchwork Mon Apr 21 14:41:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 341122 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 11E2A1400DF for ; Tue, 22 Apr 2014 13:20:42 +1000 (EST) Received: from localhost ([::1]:49643 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcG3r-00020P-Pl for incoming@patchwork.ozlabs.org; Mon, 21 Apr 2014 11:23:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59504) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcFRs-00064L-7v for qemu-devel@nongnu.org; Mon, 21 Apr 2014 10:44:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WcFRl-0004NB-UB for qemu-devel@nongnu.org; Mon, 21 Apr 2014 10:43:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33780) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcFRl-0004N7-Kt for qemu-devel@nongnu.org; Mon, 21 Apr 2014 10:43:49 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s3LEhnhI005642 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 21 Apr 2014 10:43:49 -0400 Received: from trasno.mitica (ovpn-116-41.ams2.redhat.com [10.36.116.41]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s3LEfi7a019220; Mon, 21 Apr 2014 10:43:48 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 21 Apr 2014 16:41:10 +0200 Message-Id: <1398091304-10677-91-git-send-email-quintela@redhat.com> In-Reply-To: <1398091304-10677-1-git-send-email-quintela@redhat.com> References: <1398091304-10677-1-git-send-email-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 090/124] vmstate: Test for VMSTATE_BUFFER 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 | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c index 8b45ea5..cea5984 100644 --- a/tests/test-vmstate.c +++ b/tests/test-vmstate.c @@ -865,6 +865,55 @@ static void test_array_sub(void) #undef ELEM_EQUAL_2D #undef ELEM_NOT_EQUAL +typedef struct TestBuffer { + uint8_t buffer[6]; +} TestBuffer; + +TestBuffer obj_buffer = { + .buffer = "hello", +}; + +static const VMStateDescription vmstate_buffer_simple = { + .name = "buffer/simple", + .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 obj_buffer_copy(void *arg1, void *arg2) +{ + TestBuffer *target = arg1; + TestBuffer *source = arg2; + + memcpy(target->buffer, source->buffer, 6); +} + +static void test_buffer_simple(void) +{ + TestBuffer obj, obj_clone; + + memset(&obj, 0, sizeof(obj)); + + save_vmstate(&vmstate_buffer_simple, &obj_buffer); + + compare_vmstate(wire_buffer_simple, sizeof(wire_buffer_simple)); + + SUCCESS(load_vmstate(&vmstate_buffer_simple, &obj, &obj_clone, + obj_buffer_copy, 1, wire_buffer_simple, + sizeof(wire_buffer_simple))); + + SUCCESS(memcmp(obj.buffer, obj_buffer.buffer, sizeof(obj.buffer))); +} + typedef struct TestVersioned { uint32_t a, b, c, e; uint64_t d, f; @@ -1101,6 +1150,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_run(); close(temp_fd);