From nobody Fri Nov 7 14:33:35 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548094471797170.8895761621975; Mon, 21 Jan 2019 10:14:31 -0800 (PST) Received: from localhost ([127.0.0.1]:57445 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gle5e-0002Gi-LF for importer@patchew.org; Mon, 21 Jan 2019 13:14:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51654) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gldy6-0004Lg-7C for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:06:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gldy4-000485-LS for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:06:42 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:53854) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gldy4-00046W-DA for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:06:40 -0500 Received: by mail-wm1-x32d.google.com with SMTP id d15so11709935wmb.3 for ; Mon, 21 Jan 2019 10:06:40 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id 133sm56197732wme.9.2019.01.21.10.06.38 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Jan 2019 10:06:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=guIVJe8+nJJ5xxAT3m8bTMBqqtoMOQUso8LYhgZhNjU=; b=QH15QVPWXigX4nN5VeBi2WxyF8/bAIMoGwHfiuijHYCz24f/68gn2BX3DQTGGVVrZS +FNxPvFo1FeTe1PlRvQ/Bcrpe6MMeNnyuBX313VyrFp5sq/faLJAFIFLXfYiT3aO/q1R F1Oj3g+ZygRgZMUUWavmIrN9IpkFQ1TjyxXq9xqqetnMxNP1/VkMtTIK5oWes33VLIDK HbYFbeyqbIvVJJhMY0BYvil0QMd3giWG1R8YXLXOGrkQTpuP2SfqmKs/HA1h5ow+I/D1 sD0M8pl9TyapfgzdbyLVii8jdnzYxpzs5RmAC12wsO20rLuZ1QXDknspeDGChu15WCwW l5hQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=guIVJe8+nJJ5xxAT3m8bTMBqqtoMOQUso8LYhgZhNjU=; b=C3wXPV202VmqIJCvupDzHjdNhyMrhSWeH9el8MVh9EGtdtIFKcJkX8Botco7/gIEii CcpudBeUyCvmSfF9hKnAgNwNroU939x+9zsGQUx1gRncVnVYkJgWle+d2eBdzkIOvQAg 6GfByDqTndMYZqanhqYDKPYB83Il2ByNGyK4CufE5+lKxCAQ+e5As0ls7Zsh8dNHGysM 7m/DICDj//dgwLyA5rL3IFnvBBC1gbKkz253A7LkT8raIuIURw9wrlEea993no6Cyl+k nf+hcCDpLTuVIgyuux3jr4SSx9dcdn1+fXvnXsjnLuvULS3VJAqtbPJ1B/+hQ8LRd2Zh +QBw== X-Gm-Message-State: AJcUukcUPmlBpwmnw7NMvKf8x5Y4i/mwcwcSRuBkn9pIQNjmcZ9NaZ0O zTPnvB5yazJsO7UApN37u2yvgcuz X-Google-Smtp-Source: ALg8bN48nSF5Ck8owFUjFj4UrFXbi1ORhZeEboq5xgfLZh8ZLnTGwuNkQFsos26NFZ4ejL0ct5hMtg== X-Received: by 2002:a1c:ac85:: with SMTP id v127mr395011wme.62.1548093998925; Mon, 21 Jan 2019 10:06:38 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 21 Jan 2019 19:05:47 +0100 Message-Id: <1548093980-43088-17-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548093980-43088-1-git-send-email-pbonzini@redhat.com> References: <1548093980-43088-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32d Subject: [Qemu-devel] [PULL 16/49] vhost-user-test: create a temporary directory per TestServer X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This makes the tests more independent, and also the source and destination TestServers in the migration test. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini Message-Id: <1543851204-41186-15-git-send-email-pbonzini@redhat.com> --- tests/vhost-user-test.c | 77 ++++++++++++++++++++++-----------------------= ---- 1 file changed, 35 insertions(+), 42 deletions(-) diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index a02f107..083ac5a 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -142,6 +142,8 @@ typedef struct TestServer { gchar *socket_path; gchar *mig_path; gchar *chr_name; + const gchar *mem_path; + gchar *tmpfs; CharBackend chr; int fds_num; int fds[VHOST_MEMORY_MAX_NREGIONS]; @@ -162,9 +164,6 @@ static TestServer *test_server_new(const gchar *name); static void test_server_free(TestServer *server); static void test_server_listen(TestServer *server); =20 -static const char *tmpfs; -static const char *root; - enum test_memfd { TEST_MEMFD_AUTO, TEST_MEMFD_YES, @@ -172,7 +171,7 @@ enum test_memfd { }; =20 static char *get_qemu_cmd(TestServer *s, - int mem, enum test_memfd memfd, const char *mem_= path, + int mem, enum test_memfd memfd, const char *chr_opts, const char *extra) { if (memfd =3D=3D TEST_MEMFD_AUTO && qemu_memfd_check(0)) { @@ -187,7 +186,7 @@ static char *get_qemu_cmd(TestServer *s, } else { return g_strdup_printf(QEMU_CMD_MEM QEMU_CMD_CHR QEMU_CMD_NETDEV QEMU_CMD_NET "%s", mem, mem, - mem_path, s->chr_name, s->socket_path, + s->mem_path, s->chr_name, s->socket_path, chr_opts, s->chr_name, extra); } } @@ -506,11 +505,21 @@ static const char *init_hugepagefs(void) static TestServer *test_server_new(const gchar *name) { TestServer *server =3D g_new0(TestServer, 1); + char template[] =3D "/tmp/vhost-test-XXXXXX"; + const char *tmpfs; =20 server->loop =3D g_main_loop_new(NULL, FALSE); /* run the main loop thread so the chardev may operate */ server->thread =3D g_thread_new(NULL, thread_function, server->loop); =20 + tmpfs =3D mkdtemp(template); + if (!tmpfs) { + g_test_message("mkdtemp on path (%s): %s", template, strerror(errn= o)); + } + g_assert(tmpfs); + + server->tmpfs =3D g_strdup(tmpfs); + server->mem_path =3D init_hugepagefs() ? : server->tmpfs; server->socket_path =3D g_strdup_printf("%s/%s.sock", tmpfs, name); server->mig_path =3D g_strdup_printf("%s/%s.mig", tmpfs, name); server->chr_name =3D g_strdup_printf("chr-%s", name); @@ -556,7 +565,7 @@ static void test_server_listen(TestServer *server) =20 static void test_server_free(TestServer *server) { - int i; + int i, ret; =20 /* finish the helper thread and dispatch pending sources */ g_main_loop_quit(server->loop); @@ -566,6 +575,18 @@ static void test_server_free(TestServer *server) } g_main_loop_unref(server->loop); =20 + unlink(server->socket_path); + g_free(server->socket_path); + + unlink(server->mig_path); + g_free(server->mig_path); + + ret =3D rmdir(server->tmpfs); + if (ret !=3D 0) { + g_test_message("unable to rmdir: path (%s): %s", + server->tmpfs, strerror(errno)); + } + qemu_chr_fe_deinit(&server->chr, true); =20 for (i =3D 0; i < server->fds_num; i++) { @@ -576,12 +597,6 @@ static void test_server_free(TestServer *server) close(server->log_fd); } =20 - unlink(server->socket_path); - g_free(server->socket_path); - - unlink(server->mig_path); - g_free(server->mig_path); - g_free(server->chr_name); g_assert(server->bus); qpci_free_pc(server->bus); @@ -687,7 +702,7 @@ static void test_read_guest_mem(const void *arg) "read-guest-memfd" : "read-guest-mem"); test_server_listen(server); =20 - qemu_cmd =3D get_qemu_cmd(server, 512, memfd, root, "", ""); + qemu_cmd =3D get_qemu_cmd(server, 512, memfd, "", ""); =20 s =3D qtest_start(qemu_cmd); g_free(qemu_cmd); @@ -722,7 +737,7 @@ static void test_migrate(void) test_server_listen(s); test_server_listen(dest); =20 - cmd =3D get_qemu_cmd(s, 2, TEST_MEMFD_AUTO, root, "", ""); + cmd =3D get_qemu_cmd(s, 2, TEST_MEMFD_AUTO, "", ""); from =3D qtest_start(cmd); g_free(cmd); =20 @@ -735,7 +750,7 @@ static void test_migrate(void) g_assert_cmpint(size, =3D=3D, (2 * 1024 * 1024) / (VHOST_LOG_PAGE * 8)= ); =20 tmp =3D g_strdup_printf(" -incoming %s", uri); - cmd =3D get_qemu_cmd(dest, 2, TEST_MEMFD_AUTO, root, "", tmp); + cmd =3D get_qemu_cmd(dest, 2, TEST_MEMFD_AUTO, "", tmp); g_free(tmp); to =3D qtest_init(cmd); g_free(cmd); @@ -845,7 +860,7 @@ static void test_reconnect_subprocess(void) char *cmd; =20 g_thread_new("connect", connect_thread, s); - cmd =3D get_qemu_cmd(s, 2, TEST_MEMFD_AUTO, root, ",server", ""); + cmd =3D get_qemu_cmd(s, 2, TEST_MEMFD_AUTO, ",server", ""); qtest_start(cmd); g_free(cmd); =20 @@ -887,7 +902,7 @@ static void test_connect_fail_subprocess(void) =20 s->test_fail =3D true; g_thread_new("connect", connect_thread, s); - cmd =3D get_qemu_cmd(s, 2, TEST_MEMFD_AUTO, root, ",server", ""); + cmd =3D get_qemu_cmd(s, 2, TEST_MEMFD_AUTO, ",server", ""); qtest_start(cmd); g_free(cmd); =20 @@ -920,7 +935,7 @@ static void test_flags_mismatch_subprocess(void) =20 s->test_flags =3D TEST_FLAGS_DISCONNECT; g_thread_new("connect", connect_thread, s); - cmd =3D get_qemu_cmd(s, 2, TEST_MEMFD_AUTO, root, ",server", ""); + cmd =3D get_qemu_cmd(s, 2, TEST_MEMFD_AUTO, ",server", ""); qtest_start(cmd); g_free(cmd); =20 @@ -968,7 +983,7 @@ static void test_multiqueue(void) cmd =3D g_strdup_printf( QEMU_CMD_MEM QEMU_CMD_CHR QEMU_CMD_NETDEV ",queues=3D%d " "-device virtio-net-pci,netdev=3Dnet0,mq=3Don,vectors=3D%d", - 512, 512, root, s->chr_name, + 512, 512, s->mem_path, s->chr_name, s->socket_path, "", s->chr_name, s->queues, s->queues * 2 + 2); } @@ -988,22 +1003,11 @@ static void test_multiqueue(void) =20 int main(int argc, char **argv) { - int ret; - char template[] =3D "/tmp/vhost-test-XXXXXX"; - g_test_init(&argc, &argv, NULL); =20 module_call_init(MODULE_INIT_QOM); qemu_add_opts(&qemu_chardev_opts); =20 - tmpfs =3D mkdtemp(template); - if (!tmpfs) { - g_test_message("mkdtemp on path (%s): %s\n", template, strerror(er= rno)); - } - g_assert(tmpfs); - - root =3D init_hugepagefs() ? : tmpfs; - if (qemu_memfd_check(0)) { qtest_add_data_func("/vhost-user/read-guest-mem/memfd", GINT_TO_POINTER(TEST_MEMFD_YES), @@ -1027,16 +1031,5 @@ int main(int argc, char **argv) qtest_add_func("/vhost-user/flags-mismatch", test_flags_mismatch); } =20 - ret =3D g_test_run(); - - /* cleanup */ - - ret =3D rmdir(tmpfs); - if (ret !=3D 0) { - g_test_message("unable to rmdir: path (%s): %s\n", - tmpfs, strerror(errno)); - } - g_assert_cmpint(ret, =3D=3D, 0); - - return ret; + return g_test_run(); } --=20 1.8.3.1