From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48112) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebJ9z-0008GS-Qg for qemu-devel@nongnu.org; Mon, 15 Jan 2018 23:47:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ebJ9y-0004s0-UV for qemu-devel@nongnu.org; Mon, 15 Jan 2018 23:47:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45060) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ebJ9y-0004rl-Lz for qemu-devel@nongnu.org; Mon, 15 Jan 2018 23:47:42 -0500 Date: Tue, 16 Jan 2018 06:47:38 +0200 From: "Michael S. Tsirkin" Message-ID: <1516077852-7974-18-git-send-email-mst@redhat.com> References: <1516077852-7974-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1516077852-7974-1-git-send-email-mst@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 17/33] vhost-user-test: extract read-guest-mem test from main loop List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Maxime Coquelin , =?utf-8?Q?Marc-Andr=C3=A9?= Lureau , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Eric Blake From: Maxime Coquelin This patch makes read-guest-test consistent with other tests, i.e. create the test server in the test function. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Maxime Coquelin Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/vhost-user-test.c | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index 43c6528..df56724 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -617,6 +617,28 @@ GSourceFuncs test_migrate_source_funcs =3D { .check =3D test_migrate_source_check, }; =20 +static void test_read_guest_mem(void) +{ + TestServer *server =3D NULL; + char *qemu_cmd =3D NULL; + QTestState *s =3D NULL; + + server =3D test_server_new("test"); + test_server_listen(server); + + qemu_cmd =3D GET_QEMU_CMD(server); + + s =3D qtest_start(qemu_cmd); + g_free(qemu_cmd); + + init_virtio_dev(server); + + read_guest_mem(server); + + qtest_quit(s); + test_server_free(server); +} + static void test_migrate(void) { TestServer *s =3D test_server_new("src"); @@ -919,10 +941,7 @@ static void test_multiqueue(void) =20 int main(int argc, char **argv) { - QTestState *s =3D NULL; - TestServer *server =3D NULL; const char *hugefs; - char *qemu_cmd =3D NULL; int ret; char template[] =3D "/tmp/vhost-test-XXXXXX"; GMainLoop *loop; @@ -947,20 +966,11 @@ int main(int argc, char **argv) root =3D tmpfs; } =20 - server =3D test_server_new("test"); - test_server_listen(server); - loop =3D g_main_loop_new(NULL, FALSE); /* run the main loop thread so the chardev may operate */ thread =3D g_thread_new(NULL, thread_function, loop); =20 - qemu_cmd =3D GET_QEMU_CMD(server); - - s =3D qtest_start(qemu_cmd); - g_free(qemu_cmd); - init_virtio_dev(server); - - qtest_add_data_func("/vhost-user/read-guest-mem", server, read_guest= _mem); + qtest_add_func("/vhost-user/read-guest-mem", test_read_guest_mem); qtest_add_func("/vhost-user/migrate", test_migrate); qtest_add_func("/vhost-user/multiqueue", test_multiqueue); =20 @@ -978,12 +988,7 @@ int main(int argc, char **argv) =20 ret =3D g_test_run(); =20 - if (s) { - qtest_quit(s); - } - /* cleanup */ - test_server_free(server); =20 /* finish the helper thread and dispatch pending sources */ g_main_loop_quit(loop); --=20 MST