From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37471) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bvyjw-0000Mv-6l for qemu-devel@nongnu.org; Sun, 16 Oct 2016 23:37:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bvyju-0007GZ-Tz for qemu-devel@nongnu.org; Sun, 16 Oct 2016 23:37:28 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:54049) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bvyjt-0007Ed-Q6 for qemu-devel@nongnu.org; Sun, 16 Oct 2016 23:37:26 -0400 Date: Mon, 17 Oct 2016 14:34:20 +1100 From: David Gibson Message-ID: <20161017033420.GN25390@umbus.fritz.box> References: <20161011171833.20803-1-dgilbert@redhat.com> <20161011171833.20803-3-dgilbert@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="JlJsEFsx9RQyiX4C" Content-Disposition: inline In-Reply-To: <20161011171833.20803-3-dgilbert@redhat.com> Subject: Re: [Qemu-devel] [very-WIP 2/7] tests/migration: Add test for VMSTATE_WITH_TMP List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Dr. David Alan Gilbert (git)" Cc: qemu-devel@nongnu.org, amit.shah@redhat.com, quintela@redhat.com, duanj@linux.vnet.ibm.com, pasic@linux.vnet.ibm.com --JlJsEFsx9RQyiX4C Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Oct 11, 2016 at 06:18:31PM +0100, Dr. David Alan Gilbert (git) wrot= e: > From: "Dr. David Alan Gilbert" >=20 > Add a test for VMSTATE_WITH_TMP to tests/test-vmstate.c >=20 > Signed-off-by: Dr. David Alan Gilbert Looks reasonable. The other obvious use case to me - which involves a little less awkwardness with command line supplied values - is changing an internal value to an equivalent-but-scaled representation. e.g. changing from size (in bytes, but must be page aligned), to number of pages. > --- > tests/test-vmstate.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++= +++--- > 1 file changed, 93 insertions(+), 4 deletions(-) >=20 > diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c > index d8da26f..203ab4a 100644 > --- a/tests/test-vmstate.c > +++ b/tests/test-vmstate.c > @@ -83,7 +83,7 @@ static void save_vmstate(const VMStateDescription *desc= , void *obj) > qemu_fclose(f); > } > =20 > -static void compare_vmstate(uint8_t *wire, size_t size) > +static void compare_vmstate(const uint8_t *wire, size_t size) > { > QEMUFile *f =3D open_test_file(false); > uint8_t result[size]; > @@ -106,7 +106,7 @@ static void compare_vmstate(uint8_t *wire, size_t siz= e) > } > =20 > static int load_vmstate_one(const VMStateDescription *desc, void *obj, > - int version, uint8_t *wire, size_t size) > + int version, const uint8_t *wire, size_t siz= e) > { > QEMUFile *f; > int ret; > @@ -130,7 +130,7 @@ static int load_vmstate_one(const VMStateDescription = *desc, void *obj, > static int load_vmstate(const VMStateDescription *desc, > void *obj, void *obj_clone, > void (*obj_copy)(void *, void*), > - int version, uint8_t *wire, size_t size) > + int version, const uint8_t *wire, size_t size) > { > /* We test with zero size */ > obj_copy(obj_clone, obj); > @@ -282,7 +282,6 @@ static void test_simple_primitive(void) > FIELD_EQUAL(i64_1); > FIELD_EQUAL(i64_2); > } > -#undef FIELD_EQUAL > =20 > typedef struct TestStruct { > uint32_t a, b, c, e; > @@ -475,6 +474,95 @@ static void test_load_skip(void) > qemu_fclose(loading); > } > =20 > +typedef struct TmpTestStruct { > + TestStruct *parent; > + int64_t diff; > +} TmpTestStruct; > + > +static void tmp_child_pre_save(void *opaque) > +{ > + struct TmpTestStruct *tts =3D opaque; > + > + tts->diff =3D tts->parent->b - tts->parent->a; > +} > + > +static int tmp_child_post_load(void *opaque, int version_id) > +{ > + struct TmpTestStruct *tts =3D opaque; > + > + tts->parent->b =3D tts->parent->a + tts->diff; > + > + return 0; > +} > + > +static const VMStateDescription vmstate_tmp_back_to_parent =3D { > + .name =3D "test/tmp_child_parent", > + .fields =3D (VMStateField[]) { > + VMSTATE_UINT64(f, TestStruct), > + VMSTATE_END_OF_LIST() > + } > +}; > + > +static const VMStateDescription vmstate_tmp_child =3D { > + .name =3D "test/tmp_child", > + .pre_save =3D tmp_child_pre_save, > + .post_load =3D tmp_child_post_load, > + .fields =3D (VMStateField[]) { > + VMSTATE_INT64(diff, TmpTestStruct), > + VMSTATE_STRUCT_POINTER(parent, TmpTestStruct, > + vmstate_tmp_back_to_parent, TestStruct), > + VMSTATE_END_OF_LIST() > + } > +}; > + > +static const VMStateDescription vmstate_with_tmp =3D { > + .name =3D "test/with_tmp", > + .version_id =3D 1, > + .fields =3D (VMStateField[]) { > + VMSTATE_UINT32(a, TestStruct), > + VMSTATE_UINT64(d, TestStruct), > + VMSTATE_WITH_TMP(TestStruct, TmpTestStruct, vmstate_tmp_child), > + VMSTATE_END_OF_LIST() > + } > +}; > + > +static void obj_tmp_copy(void *target, void *source) > +{ > + memcpy(target, source, sizeof(TestStruct)); > +} > + > +static void test_tmp_struct(void) > +{ > + TestStruct obj, obj_clone; > + > + uint8_t const wire_with_tmp[] =3D { > + /* u32 a */ 0x00, 0x00, 0x00, 0x02, > + /* u64 d */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, > + /* diff */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, > + /* u64 f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, > + QEMU_VM_EOF, /* just to ensure we won't get EOF reported prematu= rely */ > + }; > + > + memset(&obj, 0, sizeof(obj)); > + obj.a =3D 2; > + obj.b =3D 4; > + obj.d =3D 1; > + obj.f =3D 8; > + save_vmstate(&vmstate_with_tmp, &obj); > + > + compare_vmstate(wire_with_tmp, sizeof(wire_with_tmp)); > + > + memset(&obj, 0, sizeof(obj)); > + fprintf(stderr, "test_tmp_struct load\n"); > + SUCCESS(load_vmstate(&vmstate_with_tmp, &obj, &obj_clone, > + obj_tmp_copy, 1, wire_with_tmp, > + sizeof(wire_with_tmp))); > + g_assert_cmpint(obj.a, =3D=3D, 2); /* From top level vmsd */ > + g_assert_cmpint(obj.b, =3D=3D, 4); /* from the post_load */ > + g_assert_cmpint(obj.d, =3D=3D, 1); /* From top level vmsd */ > + g_assert_cmpint(obj.f, =3D=3D, 8); /* From the child->parent */ > +} > + > int main(int argc, char **argv) > { > temp_fd =3D mkstemp(temp_file); > @@ -489,6 +577,7 @@ int main(int argc, char **argv) > g_test_add_func("/vmstate/field_exists/load/skip", test_load_skip); > g_test_add_func("/vmstate/field_exists/save/noskip", test_save_noski= p); > g_test_add_func("/vmstate/field_exists/save/skip", test_save_skip); > + g_test_add_func("/vmstate/tmp_struct", test_tmp_struct); > g_test_run(); > =20 > close(temp_fd); --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --JlJsEFsx9RQyiX4C Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJYBEa8AAoJEGw4ysog2bOSShMP/R9oe7PtH9Xp5D7XiOzu5fKM s4SSjVZCw2wuEELbkNw1VOMSd+yITWvyv2qZ5XLOzWuFN1KxfUE1dOTeKf1bRB0d S11nNlBkGOCyc/Jc6w7syKIMbZmlBAUARfkILd58Z23Bk5maA03vbk3zlmBbmi4Q dFxDAE9DXFh5C+e1zMTNbyzVjV3HRCOYUutsylsdGKhnPOmMT3htPGpnNWh+RDC3 zdvjYJlkuNs6CxY875APHuT8CE0nofc/4yGrLUNzwwpd8LCDmjPcZ7IQn2y1Dx9V Caupg1bWlg+LGdtyc0QZlQ/zmaPWj0mfSxV0kPgSvvRjHM7HUejS2F8AIiYnDQBl BC7Rd2wK/Kox4g5lcjNsOLDUho8H0Hw8QKYNZPQXk5tgLZTwj26/1vUSpxguGm3Z gaEUecomMPCBnU5ZhFdnpLOpmVnWi0ywH7Kug11z9K+e+eOivX51CmW5fYssbWZy 5Kei/DBxyH8IVBXa0PaocsGP3+1vnoruZ8JZVFZASW2u0GJpUTd2Xy3Bb5nsuQ/u 0k+tt7T/C4nBvFy0gK8Fgwrd/wiH7CgFzfSZriOB6u7KOiDWxvlvbab6e9R04BGk /1olhHzgNQfU1k5Mu74iqe/8dHsXS+UqGOB+Bu4QWPp9gQvi+DX6Z1QdqkpAkiEQ A9yCYTxVwxATyuE4oMoi =ZS8Y -----END PGP SIGNATURE----- --JlJsEFsx9RQyiX4C--