This makes the tests more independent and removes the need to defer test_server_free via an idle event source.
Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> Message-Id: <1543851204-41186-13-git-send-email-pbonz...@redhat.com> --- tests/vhost-user-test.c | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index c3a8af3..2e610d4 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -143,6 +143,8 @@ typedef struct TestServer { int fds_num; int fds[VHOST_MEMORY_MAX_NREGIONS]; VhostUserMemory memory; + GMainLoop *loop; + GThread *thread; GMutex data_mutex; GCond data_cond; int log_fd; @@ -490,6 +492,10 @@ static TestServer *test_server_new(const gchar *name) { TestServer *server = g_new0(TestServer, 1); + server->loop = g_main_loop_new(NULL, FALSE); + /* run the main loop thread so the chardev may operate */ + server->thread = g_thread_new(NULL, thread_function, server->loop); + server->socket_path = g_strdup_printf("%s/%s.sock", tmpfs, name); server->mig_path = g_strdup_printf("%s/%s.mig", tmpfs, name); server->chr_name = g_strdup_printf("chr-%s", name); @@ -533,9 +539,18 @@ static void test_server_listen(TestServer *server) test_server_create_chr(server, ",server,nowait"); } -static gboolean _test_server_free(TestServer *server) +static void test_server_free(TestServer *server) { int i; + int ret; + + /* finish the helper thread and dispatch pending sources */ + g_main_loop_quit(server->loop); + g_thread_join(server->thread); + while (g_main_context_pending(NULL)) { + g_main_context_iteration(NULL, TRUE); + } + g_main_loop_unref(server->loop); qemu_chr_fe_deinit(&server->chr, true); @@ -558,13 +573,6 @@ static gboolean _test_server_free(TestServer *server) qpci_free_pc(server->bus); g_free(server); - - return FALSE; -} - -static void test_server_free(TestServer *server) -{ - g_idle_add((GSourceFunc)_test_server_free, server); } static void wait_for_log_fd(TestServer *s) @@ -969,8 +977,6 @@ int main(int argc, char **argv) const char *hugefs; int ret; char template[] = "/tmp/vhost-test-XXXXXX"; - GMainLoop *loop; - GThread *thread; g_test_init(&argc, &argv, NULL); @@ -991,10 +997,6 @@ int main(int argc, char **argv) root = tmpfs; } - loop = g_main_loop_new(NULL, FALSE); - /* run the main loop thread so the chardev may operate */ - thread = g_thread_new(NULL, thread_function, loop); - if (qemu_memfd_check(0)) { qtest_add_data_func("/vhost-user/read-guest-mem/memfd", GINT_TO_POINTER(TEST_MEMFD_YES), @@ -1022,14 +1024,6 @@ int main(int argc, char **argv) /* cleanup */ - /* finish the helper thread and dispatch pending sources */ - g_main_loop_quit(loop); - g_thread_join(thread); - while (g_main_context_pending(NULL)) { - g_main_context_iteration (NULL, TRUE); - } - g_main_loop_unref(loop); - ret = rmdir(tmpfs); if (ret != 0) { g_test_message("unable to rmdir: path (%s): %s\n", -- 1.8.3.1