From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51744) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNjLP-0005Yr-UQ for qemu-devel@nongnu.org; Fri, 16 Nov 2018 13:59:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gNjLM-0003IG-Pj for qemu-devel@nongnu.org; Fri, 16 Nov 2018 13:59:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36662) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gNjLM-0003Du-Ho for qemu-devel@nongnu.org; Fri, 16 Nov 2018 13:59:52 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AFE503082E51 for ; Fri, 16 Nov 2018 18:59:51 +0000 (UTC) Date: Fri, 16 Nov 2018 18:59:46 +0000 From: "Dr. David Alan Gilbert" Message-ID: <20181116185945.GG2447@work-vm> References: <20181114132130.27141-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <20181114132130.27141-1-marcandre.lureau@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] tests: add /vmstate/simple/array List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?iso-8859-1?Q?Marc-Andr=E9?= Lureau Cc: qemu-devel@nongnu.org, quintela@redhat.com * Marc-Andr=E9 Lureau (marcandre.lureau@redhat.com) wrote: > A very simple test to show VMSTATE_*_ARRAY usage and result. It could > be systematically extended to other primitives, but I leave that as an > exercise for others :). >=20 > Signed-off-by: Marc-Andr=E9 Lureau Yes, fair enough. I don't think it's necessary to test every subtype that can go in the array; but it would be nice to add some of the more esoteric array macros no one understands. Reviewed-by: Dr. David Alan Gilbert > --- > tests/test-vmstate.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 50 insertions(+) >=20 > diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c > index 37a7a93784..2a960dedbe 100644 > --- a/tests/test-vmstate.c > +++ b/tests/test-vmstate.c > @@ -284,6 +284,55 @@ static void test_simple_primitive(void) > FIELD_EQUAL(i64_2); > } > =20 > +typedef struct TestSimpleArray { > + uint16_t u16_1[3]; > +} TestSimpleArray; > + > +/* Object instantiation, we are going to use it in more than one test = */ > + > +TestSimpleArray obj_simple_arr =3D { > + .u16_1 =3D { 0x42, 0x43, 0x44 }, > +}; > + > +/* Description of the values. If you add a primitive type > + you are expected to add a test here */ > + > +static const VMStateDescription vmstate_simple_arr =3D { > + .name =3D "simple/array", > + .version_id =3D 1, > + .minimum_version_id =3D 1, > + .fields =3D (VMStateField[]) { > + VMSTATE_UINT16_ARRAY(u16_1, TestSimpleArray, 3), > + VMSTATE_END_OF_LIST() > + } > +}; > + > +uint8_t wire_simple_arr[] =3D { > + /* u16_1 */ 0x00, 0x42, > + /* u16_1 */ 0x00, 0x43, > + /* u16_1 */ 0x00, 0x44, > + QEMU_VM_EOF, /* just to ensure we won't get EOF reported premature= ly */ > +}; > + > +static void obj_simple_arr_copy(void *target, void *source) > +{ > + memcpy(target, source, sizeof(TestSimpleArray)); > +} > + > +static void test_simple_array(void) > +{ > + TestSimpleArray obj, obj_clone; > + > + memset(&obj, 0, sizeof(obj)); > + save_vmstate(&vmstate_simple_arr, &obj_simple_arr); > + > + compare_vmstate(wire_simple_arr, sizeof(wire_simple_arr)); > + > + SUCCESS(load_vmstate(&vmstate_simple_arr, &obj, &obj_clone, > + obj_simple_arr_copy, 1, wire_simple_arr, > + sizeof(wire_simple_arr))); > +} > + > typedef struct TestStruct { > uint32_t a, b, c, e; > uint64_t d, f; > @@ -863,6 +912,7 @@ int main(int argc, char **argv) > =20 > g_test_init(&argc, &argv, NULL); > g_test_add_func("/vmstate/simple/primitive", test_simple_primitive= ); > + g_test_add_func("/vmstate/simple/array", test_simple_array); > 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_nos= kip); > --=20 > 2.19.1.708.g4ede3d42df >=20 -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK