From nobody Sun Nov 9 22:38:56 2025 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) 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 1551982301173952.668659332608; Thu, 7 Mar 2019 10:11:41 -0800 (PST) Received: from localhost ([127.0.0.1]:56681 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1xUW-0003UJ-VD for importer@patchew.org; Thu, 07 Mar 2019 13:11:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39855) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1wr9-0003cj-AZ for qemu-devel@nongnu.org; Thu, 07 Mar 2019 12:30:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1wr7-0008P8-5N for qemu-devel@nongnu.org; Thu, 07 Mar 2019 12:30:55 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:43673) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h1wr6-0008OL-Q5 for qemu-devel@nongnu.org; Thu, 07 Mar 2019 12:30:53 -0500 Received: by mail-wr1-x42d.google.com with SMTP id d17so18395600wre.10 for ; Thu, 07 Mar 2019 09:30:52 -0800 (PST) Received: from 640k.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id d206sm9979753wmc.11.2019.03.07.09.30.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Mar 2019 09:30:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=MfFNZP6uPLkgEwl3XOuqPRBEvqyyufFyb9vWcSRq8bg=; b=qUcXNMgdaSx/PHQCzKY6nITaZK4sX2pYKNMpQdgZ6HYuiobgkFnMgGE2SgOFxh+9cE oeIhiJiTQB8E7ocgVepthLCccNx99TMHtXPeI2GKheBt1XJDJFsc3+c3Xp3NyuzrfBwS 5TKbfXjnkpXb2Cpys5UlqwIoZsFCGFPutaFQDgguqYvtL2Kw5ApCURgg2fglaGo49kSN yYtKe3mYMj5Cd8jEmDsfHDfLgq2D0muMhLrmdCrlhP1izdLEyZWJtjUnzHwVqAnFEzEN mC+4L8Sn9FcPWe3Iztkzit4SmjMX+bCqh41yP3b5jgg498sdcHFTABxBelVScyzQztKp /Q1w== 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:cc:subject:date:message-id :in-reply-to:references; bh=MfFNZP6uPLkgEwl3XOuqPRBEvqyyufFyb9vWcSRq8bg=; b=ThZHhsAmnO1GPwb6ssNuUl8UXHijhU9ixcPuNymQkxUqeXNQrmCZmQ8I/RIA8fxPuG RPjxEGgs3SopJ+gqnzdMF/LpImD3tmosVzt9CUA3ip3TXIicgDGM9/pF7Tvl9yWYgGse ge92H5BaMZi6oSPxr6ptRn242pYBh0rzQGS/zfpF8msQl20LQRf1zPZmRO1qBiUE4cYv w58S5Eyo4amKwDqpPO7uLZW2QXqt2rCwYKcPRaYv6MM44/5YrLXMqjOTOWgIJ19R7eX1 lxk8cqyQNjoWWmBDS/L5aGEt8ikp4Ut72RQs3DrCAqLDxz1wPUK1T5v/7c7tE6fJlOVJ 0I8Q== X-Gm-Message-State: APjAAAUOBY4KdmMiWniwbX7uXP283NHMXgtIDCsOKcrUDCaPD2spMDx3 ykUxn85wZ9MNBI3zk4bUYKBEQnxn X-Google-Smtp-Source: APXvYqwIZl14N67RIoCkj/1F17P9mEcydA51Koe5Pcry/kqLmLPrB13cX0g7L409LAbu937uwMGyRA== X-Received: by 2002:a5d:4145:: with SMTP id c5mr7588746wrq.256.1551979851101; Thu, 07 Mar 2019 09:30:51 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 18:29:47 +0100 Message-Id: <1551979804-6060-41-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1551979804-6060-1-git-send-email-pbonzini@redhat.com> References: <1551979804-6060-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42d Subject: [Qemu-devel] [PULL 40/57] qos-test: vhost-user test node 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: , Cc: thuth@redhat.com, lviver@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Convert tests/virtio-net-test in qgraph test node, virtio-net-test. This test consumes a virtio-net interface and checks that its function return the expected values. Note that this test does not allocate any virtio-net structure, it's all done by the qtest walking graph mechanism. Nevertheless, vhost-user-test is a bit more complex than the other tests, because it requires more complicated setup of back-ends and thus almost each test has a slightly different opts.before function. Signed-off-by: Paolo Bonzini --- tests/Makefile.include | 5 +- tests/vhost-user-test.c | 381 +++++++++++++++++++-------------------------= ---- 2 files changed, 152 insertions(+), 234 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index f45d115..a0b42c9 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -204,7 +204,6 @@ check-qtest-i386-$(CONFIG_USB_XHCI_NEC) +=3D tests/usb-= hcd-xhci-test$(EXESUF) check-qtest-i386-y +=3D tests/cpu-plug-test$(EXESUF) check-qtest-i386-y +=3D tests/q35-test$(EXESUF) check-qtest-i386-y +=3D tests/vmgenid-test$(EXESUF) -check-qtest-i386-$(CONFIG_VHOST_NET_USER) +=3D tests/vhost-user-test$(EXES= UF) check-qtest-i386-$(CONFIG_TPM_CRB) +=3D tests/tpm-crb-swtpm-test$(EXESUF) check-qtest-i386-$(CONFIG_TPM_CRB) +=3D tests/tpm-crb-test$(EXESUF) check-qtest-i386-$(CONFIG_TPM_TIS) +=3D tests/tpm-tis-swtpm-test$(EXESUF) @@ -760,6 +759,7 @@ qos-test-obj-y +=3D tests/libqos/x86_64_pc-machine.o qos-test-obj-y +=3D tests/e1000e-test.o qos-test-obj-y +=3D tests/pci-test.o qos-test-obj-y +=3D tests/sdhci-test.o +qos-test-obj-$(CONFIG_VHOST_NET_USER) +=3D tests/vhost-user-test.o $(chard= ev-obj-y) $(test-io-obj-y) qos-test-obj-y +=3D tests/virtio-test.o qos-test-obj-$(CONFIG_VIRTFS) +=3D tests/virtio-9p-test.o qos-test-obj-y +=3D tests/virtio-blk-test.o @@ -835,9 +835,6 @@ tests/usb-hcd-xhci-test$(EXESUF): tests/usb-hcd-xhci-te= st.o $(libqos-usb-obj-y) tests/cpu-plug-test$(EXESUF): tests/cpu-plug-test.o tests/migration-test$(EXESUF): tests/migration-test.o tests/test-announce-self$(EXESUF): tests/test-announce-self.o -tests/vhost-user-test$(EXESUF): tests/vhost-user-test.o $(test-util-obj-y)= \ - $(qtest-obj-y) $(test-io-obj-y) $(libqos-virtio-obj-y) $(libqos-pc-obj-y)= \ - $(chardev-obj-y) tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_s= cm_helper.o tests/test-qemu-opts$(EXESUF): tests/test-qemu-opts.o $(test-util-obj-y) tests/test-keyval$(EXESUF): tests/test-keyval.o $(test-util-obj-y) $(test-= qapi-obj-y) diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index 2a67a99..92dfeed 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -41,8 +41,7 @@ #define QEMU_CMD_MEMFD " -m %d -object memory-backend-memfd,id=3Dmem,size= =3D%dM," \ " -numa node,memdev=3Dmem" #define QEMU_CMD_CHR " -chardev socket,id=3D%s,path=3D%s%s" -#define QEMU_CMD_NETDEV " -netdev vhost-user,id=3Dnet0,chardev=3D%s,vhostf= orce" -#define QEMU_CMD_NET " -device virtio-net-pci,netdev=3Dnet0" +#define QEMU_CMD_NETDEV " -netdev vhost-user,id=3Dhs0,chardev=3D%s,vhostfo= rce" =20 #define HUGETLBFS_MAGIC 0x958458f6 =20 @@ -136,13 +135,9 @@ enum { }; =20 typedef struct TestServer { - QPCIBus *bus; - QVirtioPCIDevice *dev; - QVirtQueue *vq[VHOST_MAX_VIRTQUEUES]; gchar *socket_path; gchar *mig_path; gchar *chr_name; - const gchar *mem_path; gchar *tmpfs; CharBackend chr; int fds_num; @@ -158,9 +153,9 @@ typedef struct TestServer { bool test_fail; int test_flags; int queues; - QGuestAllocator alloc; } TestServer; =20 +static const char *init_hugepagefs(void); static TestServer *test_server_new(const gchar *name); static void test_server_free(TestServer *server); static void test_server_listen(TestServer *server); @@ -171,64 +166,28 @@ enum test_memfd { TEST_MEMFD_NO, }; =20 -static char *get_qemu_cmd(TestServer *s, - int mem, enum test_memfd memfd, - const char *chr_opts, const char *extra) +static void append_vhost_opts(TestServer *s, GString *cmd_line, + const char *chr_opts) { - if (memfd =3D=3D TEST_MEMFD_AUTO && qemu_memfd_check(0)) { - memfd =3D TEST_MEMFD_YES; - } - - if (memfd =3D=3D TEST_MEMFD_YES) { - return g_strdup_printf(QEMU_CMD_MEMFD QEMU_CMD_CHR - QEMU_CMD_NETDEV QEMU_CMD_NET "%s", mem, mem, - s->chr_name, s->socket_path, - chr_opts, s->chr_name, extra); - } else { - return g_strdup_printf(QEMU_CMD_MEM QEMU_CMD_CHR - QEMU_CMD_NETDEV QEMU_CMD_NET "%s", mem, mem, - s->mem_path, s->chr_name, s->socket_path, - chr_opts, s->chr_name, extra); - } + g_string_append_printf(cmd_line, QEMU_CMD_CHR QEMU_CMD_NETDEV, + s->chr_name, s->socket_path, + chr_opts, s->chr_name); } =20 -static void init_virtio_dev(QTestState *qts, TestServer *s, uint32_t featu= res_mask) +static void append_mem_opts(TestServer *server, GString *cmd_line, + int size, enum test_memfd memfd) { - uint32_t features; - int i; - - s->bus =3D qpci_new_pc(qts, NULL); - g_assert_nonnull(s->bus); - - s->dev =3D qvirtio_pci_device_find(s->bus, VIRTIO_ID_NET); - g_assert_nonnull(s->dev); - - qvirtio_pci_device_enable(s->dev); - qvirtio_start_device(&s->dev->vdev); - - pc_alloc_init(&s->alloc, qts, 0); - - for (i =3D 0; i < s->queues * 2; i++) { - s->vq[i] =3D qvirtqueue_setup(&s->dev->vdev, &s->alloc, i); + if (memfd =3D=3D TEST_MEMFD_AUTO) { + memfd =3D qemu_memfd_check(0) ? TEST_MEMFD_YES : TEST_MEMFD_NO; } =20 - features =3D qvirtio_get_features(&s->dev->vdev); - features =3D features & features_mask; - qvirtio_set_features(&s->dev->vdev, features); - - qvirtio_set_driver_ok(&s->dev->vdev); -} - -static void uninit_virtio_dev(TestServer *s) -{ - int i; + if (memfd =3D=3D TEST_MEMFD_YES) { + g_string_append_printf(cmd_line, QEMU_CMD_MEMFD, size, size); + } else { + const char *root =3D init_hugepagefs() ? : server->tmpfs; =20 - for (i =3D 0; i < s->queues * 2; i++) { - qvirtqueue_cleanup(s->dev->vdev.bus, s->vq[i], &s->alloc); + g_string_append_printf(cmd_line, QEMU_CMD_MEM, size, size, root); } - alloc_destroy(&s->alloc); - - qvirtio_pci_device_free(s->dev); } =20 static bool wait_for_fds(TestServer *s) @@ -465,17 +424,21 @@ static void chr_read(void *opaque, const uint8_t *buf= , int size) static const char *init_hugepagefs(void) { #ifdef CONFIG_LINUX + static const char *hugepagefs; const char *path =3D getenv("QTEST_HUGETLBFS_PATH"); struct statfs fs; int ret; =20 + if (hugepagefs) { + return hugepagefs; + } if (!path) { return NULL; } =20 if (access(path, R_OK | W_OK | X_OK)) { g_test_message("access on path (%s): %s\n", path, strerror(errno)); - abort(); + g_test_fail(); return NULL; } =20 @@ -485,17 +448,18 @@ static const char *init_hugepagefs(void) =20 if (ret !=3D 0) { g_test_message("statfs on path (%s): %s\n", path, strerror(errno)); - abort(); + g_test_fail(); return NULL; } =20 if (fs.f_type !=3D HUGETLBFS_MAGIC) { g_test_message("Warning: path not on HugeTLBFS: %s\n", path); - abort(); + g_test_fail(); return NULL; } =20 - return path; + hugepagefs =3D path; + return hugepagefs; #else return NULL; #endif @@ -520,7 +484,6 @@ static TestServer *test_server_new(const gchar *name) g_assert(tmpfs); =20 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); @@ -598,8 +561,6 @@ static void test_server_free(TestServer *server) } =20 g_free(server->chr_name); - g_assert(server->bus); - qpci_free_pc(server->bus); =20 g_main_loop_unref(server->loop); g_main_context_unref(server->context); @@ -693,70 +654,79 @@ GSourceFuncs test_migrate_source_funcs =3D { .check =3D test_migrate_source_check, }; =20 -static void test_read_guest_mem(const void *arg) +static void vhost_user_test_cleanup(void *s) +{ + TestServer *server =3D s; + + qos_invalidate_command_line(); + test_server_free(server); +} + +static void *vhost_user_test_setup(GString *cmd_line, void *arg) { - enum test_memfd memfd =3D GPOINTER_TO_INT(arg); - TestServer *server =3D NULL; - char *qemu_cmd =3D NULL; - QTestState *s =3D NULL; + TestServer *server =3D test_server_new("vhost-user-test"); + test_server_listen(server); + + append_mem_opts(server, cmd_line, 256, TEST_MEMFD_AUTO); + append_vhost_opts(server, cmd_line, ""); + + g_test_queue_destroy(vhost_user_test_cleanup, server); + + return server; +} =20 - server =3D test_server_new(memfd =3D=3D TEST_MEMFD_YES ? - "read-guest-memfd" : "read-guest-mem"); +static void *vhost_user_test_setup_memfd(GString *cmd_line, void *arg) +{ + TestServer *server =3D test_server_new("vhost-user-test"); test_server_listen(server); =20 - qemu_cmd =3D get_qemu_cmd(server, 256, memfd, "", ""); + append_mem_opts(server, cmd_line, 256, TEST_MEMFD_YES); + append_vhost_opts(server, cmd_line, ""); + + g_test_queue_destroy(vhost_user_test_cleanup, server); =20 - s =3D qtest_start(qemu_cmd); - g_free(qemu_cmd); + return server; +} =20 - init_virtio_dev(global_qtest, server, 1u << VIRTIO_NET_F_MAC); +static void test_read_guest_mem(void *obj, void *arg, QGuestAllocator *all= oc) +{ + TestServer *server =3D arg; =20 if (!wait_for_fds(server)) { - goto exit; + return; } =20 read_guest_mem_server(global_qtest, server); - -exit: - uninit_virtio_dev(server); - - qtest_quit(s); - test_server_free(server); } =20 -static void test_migrate(void) +static void test_migrate(void *obj, void *arg, QGuestAllocator *alloc) { - TestServer *s =3D test_server_new("src"); + TestServer *s =3D arg; TestServer *dest =3D test_server_new("dest"); + GString *dest_cmdline =3D g_string_new(qos_get_current_command_line()); char *uri =3D g_strdup_printf("%s%s", "unix:", dest->mig_path); - QTestState *from, *to; + QTestState *to; GSource *source; - gchar *cmd, *tmp; QDict *rsp; guint8 *log; guint64 size; =20 - test_server_listen(s); - test_server_listen(dest); - - cmd =3D get_qemu_cmd(s, 256, TEST_MEMFD_AUTO, "", ""); - from =3D qtest_start(cmd); - g_free(cmd); - - init_virtio_dev(from, s, 1u << VIRTIO_NET_F_MAC); if (!wait_for_fds(s)) { - goto exit; + return; } =20 size =3D get_log_size(s); g_assert_cmpint(size, =3D=3D, (256 * 1024 * 1024) / (VHOST_LOG_PAGE * = 8)); =20 - tmp =3D g_strdup_printf(" -incoming %s", uri); - cmd =3D get_qemu_cmd(dest, 256, TEST_MEMFD_AUTO, "", tmp); - g_free(tmp); - to =3D qtest_init(cmd); - g_free(cmd); - init_virtio_dev(to, dest, 1u << VIRTIO_NET_F_MAC); + test_server_listen(dest); + g_string_append_printf(dest_cmdline, " -incoming %s", uri); + append_mem_opts(dest, dest_cmdline, 256, TEST_MEMFD_AUTO); + append_vhost_opts(dest, dest_cmdline, ""); + to =3D qtest_init(dest_cmdline->str); + + /* This would be where you call qos_allocate_objects(to, NULL), if you= want + * to talk to the QVirtioNet object on the destination. + */ =20 source =3D g_source_new(&test_migrate_source_funcs, sizeof(TestMigrateSource)); @@ -797,18 +767,11 @@ static void test_migrate(void) g_assert(wait_for_fds(dest)); read_guest_mem_server(to, dest); =20 - uninit_virtio_dev(dest); - qtest_quit(to); - g_source_destroy(source); g_source_unref(source); =20 -exit: - uninit_virtio_dev(s); - + qtest_quit(to); test_server_free(dest); - qtest_quit(from); - test_server_free(s); g_free(uri); } =20 @@ -856,20 +819,26 @@ connect_thread(gpointer data) return NULL; } =20 -static void test_reconnect_subprocess(void) +static void *vhost_user_test_setup_reconnect(GString *cmd_line, void *arg) { TestServer *s =3D test_server_new("reconnect"); - GSource *src; - char *cmd; =20 g_thread_new("connect", connect_thread, s); - cmd =3D get_qemu_cmd(s, 256, TEST_MEMFD_AUTO, ",server", ""); - qtest_start(cmd); - g_free(cmd); + append_mem_opts(s, cmd_line, 256, TEST_MEMFD_AUTO); + append_vhost_opts(s, cmd_line, ",server"); + + g_test_queue_destroy(vhost_user_test_cleanup, s); + + return s; +} + +static void test_reconnect(void *obj, void *arg, QGuestAllocator *alloc) +{ + TestServer *s =3D arg; + GSource *src; =20 - init_virtio_dev(global_qtest, s, 1u << VIRTIO_NET_F_MAC); if (!wait_for_fds(s)) { - goto exit; + return; } =20 wait_for_rings_started(s, 2); @@ -883,159 +852,111 @@ static void test_reconnect_subprocess(void) g_source_unref(src); g_assert(wait_for_fds(s)); wait_for_rings_started(s, 2); - -exit: - uninit_virtio_dev(s); - - qtest_end(); - test_server_free(s); - return; } =20 -static void test_reconnect(void) -{ - gchar *path =3D g_strdup_printf("/%s/vhost-user/reconnect/subprocess", - qtest_get_arch()); - g_test_trap_subprocess(path, 0, 0); - g_test_trap_assert_passed(); - g_free(path); -} - -static void test_connect_fail_subprocess(void) +static void *vhost_user_test_setup_connect_fail(GString *cmd_line, void *a= rg) { TestServer *s =3D test_server_new("connect-fail"); - char *cmd; =20 s->test_fail =3D true; - g_thread_new("connect", connect_thread, s); - cmd =3D get_qemu_cmd(s, 256, TEST_MEMFD_AUTO, ",server", ""); - qtest_start(cmd); - g_free(cmd); - - init_virtio_dev(global_qtest, s, 1u << VIRTIO_NET_F_MAC); - if (!wait_for_fds(s)) { - goto exit; - } - wait_for_rings_started(s, 2); =20 -exit: - uninit_virtio_dev(s); + g_thread_new("connect", connect_thread, s); + append_mem_opts(s, cmd_line, 256, TEST_MEMFD_AUTO); + append_vhost_opts(s, cmd_line, ",server"); =20 - qtest_end(); - test_server_free(s); -} + g_test_queue_destroy(vhost_user_test_cleanup, s); =20 -static void test_connect_fail(void) -{ - gchar *path =3D g_strdup_printf("/%s/vhost-user/connect-fail/subproces= s", - qtest_get_arch()); - g_test_trap_subprocess(path, 0, 0); - g_test_trap_assert_passed(); - g_free(path); + return s; } =20 -static void test_flags_mismatch_subprocess(void) +static void *vhost_user_test_setup_flags_mismatch(GString *cmd_line, void = *arg) { TestServer *s =3D test_server_new("flags-mismatch"); - char *cmd; =20 s->test_flags =3D TEST_FLAGS_DISCONNECT; - g_thread_new("connect", connect_thread, s); - cmd =3D get_qemu_cmd(s, 256, TEST_MEMFD_AUTO, ",server", ""); - qtest_start(cmd); - g_free(cmd); =20 - init_virtio_dev(global_qtest, s, 1u << VIRTIO_NET_F_MAC); - if (!wait_for_fds(s)) { - goto exit; - } - wait_for_rings_started(s, 2); + g_thread_new("connect", connect_thread, s); + append_mem_opts(s, cmd_line, 256, TEST_MEMFD_AUTO); + append_vhost_opts(s, cmd_line, ",server"); =20 -exit: - uninit_virtio_dev(s); + g_test_queue_destroy(vhost_user_test_cleanup, s); =20 - qtest_end(); - test_server_free(s); + return s; } =20 -static void test_flags_mismatch(void) +static void test_vhost_user_started(void *obj, void *arg, QGuestAllocator = *alloc) { - gchar *path =3D g_strdup_printf("/%s/vhost-user/flags-mismatch/subproc= ess", - qtest_get_arch()); - g_test_trap_subprocess(path, 0, 0); - g_test_trap_assert_passed(); - g_free(path); -} + TestServer *s =3D arg; =20 + if (!wait_for_fds(s)) { + return; + } + wait_for_rings_started(s, 2); +} =20 -static void test_multiqueue(void) +static void *vhost_user_test_setup_multiqueue(GString *cmd_line, void *arg) { - TestServer *s =3D test_server_new("mq"); - char *cmd; - uint32_t features_mask =3D ~(QVIRTIO_F_BAD_FEATURE | - (1u << VIRTIO_RING_F_INDIRECT_DESC) | - (1u << VIRTIO_RING_F_EVENT_IDX)); + TestServer *s =3D vhost_user_test_setup(cmd_line, arg); + s->queues =3D 2; - test_server_listen(s); + g_string_append_printf(cmd_line, + " -set netdev.hs0.queues=3D%d" + " -global virtio-net-pci.vectors=3D%d", + s->queues, s->queues * 2 + 2); =20 - if (qemu_memfd_check(0)) { - cmd =3D g_strdup_printf( - QEMU_CMD_MEMFD QEMU_CMD_CHR QEMU_CMD_NETDEV ",queues=3D%d " - "-device virtio-net-pci,netdev=3Dnet0,mq=3Don,vectors=3D%d", - 256, 256, s->chr_name, - s->socket_path, "", s->chr_name, - s->queues, s->queues * 2 + 2); - } else { - 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", - 256, 256, s->mem_path, s->chr_name, - s->socket_path, "", s->chr_name, - s->queues, s->queues * 2 + 2); - } - qtest_start(cmd); - g_free(cmd); + return s; +} =20 - init_virtio_dev(global_qtest, s, features_mask); +static void test_multiqueue(void *obj, void *arg, QGuestAllocator *alloc) +{ + TestServer *s =3D arg; =20 wait_for_rings_started(s, s->queues * 2); - - uninit_virtio_dev(s); - - qtest_end(); - - test_server_free(s); } =20 -int main(int argc, char **argv) +static void register_vhost_user_test(void) { - g_test_init(&argc, &argv, NULL); + QOSGraphTestOptions opts =3D { + .before =3D vhost_user_test_setup, + .subprocess =3D true, + }; =20 - module_call_init(MODULE_INIT_QOM); qemu_add_opts(&qemu_chardev_opts); =20 + qos_add_test("vhost-user/read-guest-mem/memfile", + "virtio-net", + test_read_guest_mem, &opts); + if (qemu_memfd_check(0)) { - qtest_add_data_func("/vhost-user/read-guest-mem/memfd", - GINT_TO_POINTER(TEST_MEMFD_YES), - test_read_guest_mem); + opts.before =3D vhost_user_test_setup_memfd; + qos_add_test("vhost-user/read-guest-mem/memfd", + "virtio-net", + test_read_guest_mem, &opts); } - qtest_add_data_func("/vhost-user/read-guest-mem/memfile", - GINT_TO_POINTER(TEST_MEMFD_NO), test_read_guest_me= m); - qtest_add_func("/vhost-user/migrate", test_migrate); - qtest_add_func("/vhost-user/multiqueue", test_multiqueue); + + qos_add_test("vhost-user/migrate", + "virtio-net", + test_migrate, &opts); =20 /* keeps failing on build-system since Aug 15 2017 */ if (getenv("QTEST_VHOST_USER_FIXME")) { - qtest_add_func("/vhost-user/reconnect/subprocess", - test_reconnect_subprocess); - qtest_add_func("/vhost-user/reconnect", test_reconnect); - qtest_add_func("/vhost-user/connect-fail/subprocess", - test_connect_fail_subprocess); - qtest_add_func("/vhost-user/connect-fail", test_connect_fail); - qtest_add_func("/vhost-user/flags-mismatch/subprocess", - test_flags_mismatch_subprocess); - qtest_add_func("/vhost-user/flags-mismatch", test_flags_mismatch); + opts.before =3D vhost_user_test_setup_reconnect; + qos_add_test("vhost-user/reconnect", "virtio-net", + test_reconnect, &opts); + + opts.before =3D vhost_user_test_setup_connect_fail; + qos_add_test("vhost-user/connect-fail", "virtio-net", + test_vhost_user_started, &opts); + + opts.before =3D vhost_user_test_setup_flags_mismatch; + qos_add_test("vhost-user/flags-mismatch", "virtio-net", + test_vhost_user_started, &opts); } =20 - return g_test_run(); + opts.before =3D vhost_user_test_setup_multiqueue; + opts.edge.extra_device_opts =3D "mq=3Don"; + qos_add_test("vhost-user/multiqueue", + "virtio-net", + test_multiqueue, &opts); } +libqos_init(register_vhost_user_test); --=20 1.8.3.1