From nobody Sun Apr 27 19:02:48 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1708640789; cv=none;
d=zohomail.com; s=zohoarc;
b=H1SHStxGWF/Jfa/GslKndOCeTNOPIpIQHvLsH5DP/Zcm+eyzheCZMPQitBImFTsA/2AnUztg/7gwmcZhf3c1NcCTBRGfK6Ebd8fdZyKvR/aj7J42KGF/YZlVg3DVtEac66X9PsI+3Q+LpHyXErrme1UJtQZoQRgqz0VrjG4kvh8=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1708640789;
h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=HX02PeSmvlZ6JSpGgvLOAz55jZu9nn1Y4vVQAH0ZIkk=;
b=CA0e0mjmj570HmajaHpQ3+71P5L/OzQx1MwgYNMsBQ2z26Tuf5Lyo7sUEG8vwVVwr8N7wiW1CMu0hwAWMSZJNh7vjGxgr1d/oB0dac84I7qF1b8+V7iGSEVVGUlo5hoimnSM6H7M8vVjjs6zhmAvqqUbWk4Hlg/qDOx3cz3W8JQ=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<gustavo.romero@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1708640789599454.55000680603735;
Thu, 22 Feb 2024 14:26:29 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1rdHUd-0002fp-0X; Thu, 22 Feb 2024 17:24:39 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <gustavo.romero@linaro.org>)
id 1rdHUb-0002fJ-8c
for qemu-devel@nongnu.org; Thu, 22 Feb 2024 17:24:37 -0500
Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <gustavo.romero@linaro.org>)
id 1rdHUZ-0003DS-0c
for qemu-devel@nongnu.org; Thu, 22 Feb 2024 17:24:37 -0500
Received: by mail-pl1-x630.google.com with SMTP id
d9443c01a7336-1d95d67ff45so1013025ad.2
for <qemu-devel@nongnu.org>; Thu, 22 Feb 2024 14:24:34 -0800 (PST)
Received: from amd.. ([2804:7f0:b400:285a:3e7c:3fff:fe7a:e83b])
by smtp.gmail.com with ESMTPSA id
ji7-20020a170903324700b001d7057c2fbasm10457210plb.100.2024.02.22.14.24.30
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 22 Feb 2024 14:24:32 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1708640673; x=1709245473; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=HX02PeSmvlZ6JSpGgvLOAz55jZu9nn1Y4vVQAH0ZIkk=;
b=QiN2jtmpebe+p0wmeE17sgGw81zznSNbeixmUzuHQ1g/cgRWEjUBGDOQqvb3Fl28UG
HeB0DbA0BM15Rk7ATMMi0Bo98f3N1VNoV77nyySi2FN9QP/4B5ikSD8gwKbhLAJO4LYd
HBjaV9D1QWzERZZ7oEW9g0il5mFgKcdap3/Z+mTOLfeiqHAfVA8osFXVNwrk4N+aZVOd
lshj4H9QtacGl2RFHzF6xBtp0kgTq9yh8FIH1josEzsrYqV855SCvgLrdw1Uk1V9XeY/
+dPBN40GtdifzMlTc3bKsmJvSuMdA9OltOweb/yaf722J5Cso/py/nORHlqmwUs6VKVS
hlhQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1708640673; x=1709245473;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=HX02PeSmvlZ6JSpGgvLOAz55jZu9nn1Y4vVQAH0ZIkk=;
b=vJBn3/SR2d7RUU0NlEXiOB2oY34aIYfVzDWBi2J9z4uuFo3RrR3B5/1umMg7ck2XM+
mbeMZBPfOlswdTbkwZfbwJ3rjF1eacpFVSmtjBOyFf2AlJbqcX1Zvdk/W12prrtHL3Mq
Yt03ZgtxfLF9OyTow5Bre8n5r7jJ390LjjxMr885oW2lQlfrxWgf3z6bCyzwAsaJtHXE
m6tEbMJ5JP//qgvyNNwmXajjcbxrReqE/yVlsSySk1Xc0EzsEX+WXE1bs+scV1YZDFRD
ydQXyWsh8BcK0TflPjUzQUjJEWLs0Jw4jcOxi2UgkJmVzrOCCAd/mVw3V9iamy1ym1ni
85/Q==
X-Gm-Message-State: AOJu0YzXQRXrm7lEdgukzeZf/aE6NMSooKozDwcrZRAsGxdzmO7gVgYL
r+DWO6VM0tBKGzvjblkC3Oq5LzXDPhWriJ5nCS7S1Deq0esBnNpjLv+aF65AVYd1vPTYAvX+LtN
r3jw=
X-Google-Smtp-Source:
AGHT+IGc5qrg6HGM7HwUGWC74zdOuc2ILG70JQkm3sSCNjFPzSDIpXwqL2d8dfXydCqs6tFyKBy/Ug==
X-Received: by 2002:a17:902:b20b:b0:1d7:4353:aba5 with SMTP id
t11-20020a170902b20b00b001d74353aba5mr120331plr.58.1708640673193;
Thu, 22 Feb 2024 14:24:33 -0800 (PST)
From: Gustavo Romero <gustavo.romero@linaro.org>
To: qemu-devel@nongnu.org,
philmd@linaro.org
Cc: thuth@redhat.com, lvivier@redhat.com, qemu-arm@nongnu.org,
alex.bennee@linaro.org, pbonzini@redhat.com, anton.kochkov@proton.me,
richard.henderson@linaro.org, peter.maydell@linaro.org,
gustavo.romero@linaro.org
Subject: [PATCH 5/6] tests/qtest: Reorganize common code in ivshmem-test
Date: Thu, 22 Feb 2024 22:22:17 +0000
Message-Id: <20240222222218.2261956-6-gustavo.romero@linaro.org>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20240222222218.2261956-1-gustavo.romero@linaro.org>
References: <20240222222218.2261956-1-gustavo.romero@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.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;
Received-SPF: pass client-ip=2607:f8b0:4864:20::630;
envelope-from=gustavo.romero@linaro.org; helo=mail-pl1-x630.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001,
T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1708640790060100001
This commit reorganizes the ivshmem-test qtest by moving common structs,
functions, and code that can be utilized by other ivshmem qtests into
two new files: ivshmem-utils.h and ivshmem-utils.c.
Enum Reg, struct ServerThread, and mktempshm() have been relocated to
these new files. Two new functions have been introduced to handle the
ivshmem server start/stop: test_ivshmem_server_{start,stop}.
To accommodate the new way for starting/stopping the ivshmem server,
struct ServerThread now includes two new members: 'server', previously
present but not a member of any struct; and 'status', a new member of a
new type, ServerStartStatus, used to track and handle service
termination properly.
Additionally, a new function, mktempsocket(), has been added to help
create a unix socket filename, similar to what mktempshm() does for the
creation of a shm file.
Finally, the ivshmem-test qtest has been adapted to use the new ivhsmem
utils. Adjustments in that sense have also been made to meson.build;
also 'rt' have been removed as a lib dependency for ivhsmem-test.c.
Two lines unrelated to these changes have had their line indentation
also fixed in meson.build.
Message-ID: <20231127052024.435743-3-gustavo.romero@linaro.org>
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
Signed-off-by: Gustavo Romero <gustavo.romero@linaro.org>
Acked-by: Thomas Huth <thuth@redhat.com>
---
tests/qtest/ivshmem-test.c | 113 ++------------------------
tests/qtest/ivshmem-utils.c | 156 ++++++++++++++++++++++++++++++++++++
tests/qtest/ivshmem-utils.h | 56 +++++++++++++
tests/qtest/meson.build | 6 +-
4 files changed, 222 insertions(+), 109 deletions(-)
create mode 100644 tests/qtest/ivshmem-utils.c
create mode 100644 tests/qtest/ivshmem-utils.h
diff --git a/tests/qtest/ivshmem-test.c b/tests/qtest/ivshmem-test.c
index 9bf8e78df6..5ce43e2f76 100644
--- a/tests/qtest/ivshmem-test.c
+++ b/tests/qtest/ivshmem-test.c
@@ -3,17 +3,17 @@
*
* Copyright (c) 2014 SUSE LINUX Products GmbH
* Copyright (c) 2015 Red Hat, Inc.
+ * Copyright (c) 2023 Linaro Ltd.
*
* This work is licensed under the terms of the GNU GPL, version 2 or late=
r.
* See the COPYING file in the top-level directory.
*/
=20
-#include "qemu/osdep.h"
-#include <glib/gstdio.h>
-#include "contrib/ivshmem-server/ivshmem-server.h"
+#include "ivshmem-utils.h"
#include "libqos/libqos-pc.h"
#include "libqos/libqos-spapr.h"
-#include "libqtest.h"
+
+static ServerThread thread;
=20
#define TMPSHMSIZE (1 << 20)
static char *tmpshm;
@@ -45,13 +45,6 @@ typedef struct _IVState {
QPCIDevice *dev;
} IVState;
=20
-enum Reg {
- INTRMASK =3D 0,
- INTRSTATUS =3D 4,
- IVPOSITION =3D 8,
- DOORBELL =3D 12,
-};
-
static const char* reg2str(enum Reg reg) {
switch (reg) {
case INTRMASK:
@@ -241,54 +234,6 @@ static void test_ivshmem_pair(void)
g_free(data);
}
=20
-typedef struct ServerThread {
- GThread *thread;
- IvshmemServer *server;
- int pipe[2]; /* to handle quit */
-} ServerThread;
-
-static void *server_thread(void *data)
-{
- ServerThread *t =3D data;
- IvshmemServer *server =3D t->server;
-
- while (true) {
- fd_set fds;
- int maxfd, ret;
-
- FD_ZERO(&fds);
- FD_SET(t->pipe[0], &fds);
- maxfd =3D t->pipe[0] + 1;
-
- ivshmem_server_get_fds(server, &fds, &maxfd);
-
- ret =3D select(maxfd, &fds, NULL, NULL, NULL);
-
- if (ret < 0) {
- if (errno =3D=3D EINTR) {
- continue;
- }
-
- g_critical("select error: %s\n", strerror(errno));
- break;
- }
- if (ret =3D=3D 0) {
- continue;
- }
-
- if (FD_ISSET(t->pipe[0], &fds)) {
- break;
- }
-
- if (ivshmem_server_handle_fds(server, &fds, maxfd) < 0) {
- g_critical("ivshmem_server_handle_fds() failed\n");
- break;
- }
- }
-
- return NULL;
-}
-
static void setup_vm_with_server(IVState *s, int nvectors)
{
char *cmd;
@@ -304,27 +249,12 @@ static void setup_vm_with_server(IVState *s, int nvec=
tors)
=20
static void test_ivshmem_server(void)
{
- g_autoptr(GError) err =3D NULL;
IVState state1, state2, *s1, *s2;
- ServerThread thread;
- IvshmemServer server;
int ret, vm1, vm2;
int nvectors =3D 2;
guint64 end_time =3D g_get_monotonic_time() + 5 * G_TIME_SPAN_SECOND;
=20
- ret =3D ivshmem_server_init(&server, tmpserver, tmpshm, true,
- TMPSHMSIZE, nvectors,
- g_test_verbose());
- g_assert_cmpint(ret, =3D=3D, 0);
-
- ret =3D ivshmem_server_start(&server);
- g_assert_cmpint(ret, =3D=3D, 0);
-
- thread.server =3D &server;
- g_unix_open_pipe(thread.pipe, FD_CLOEXEC, &err);
- g_assert_no_error(err);
- thread.thread =3D g_thread_new("ivshmem-server", server_thread, &threa=
d);
- g_assert(thread.thread !=3D NULL);
+ test_ivshmem_server_start(&thread, tmpserver, tmpshm, nvectors);
=20
setup_vm_with_server(&state1, nvectors);
s1 =3D &state1;
@@ -367,15 +297,7 @@ static void test_ivshmem_server(void)
cleanup_vm(s2);
cleanup_vm(s1);
=20
- if (qemu_write_full(thread.pipe[1], "q", 1) !=3D 1) {
- g_error("qemu_write_full: %s", g_strerror(errno));
- }
-
- g_thread_join(thread.thread);
-
- ivshmem_server_close(&server);
- close(thread.pipe[1]);
- close(thread.pipe[0]);
+ test_ivshmem_server_stop(&thread);
}
=20
static void test_ivshmem_hotplug_q35(void)
@@ -454,31 +376,10 @@ static void cleanup(void)
=20
static void abrt_handler(void *data)
{
+ test_ivshmem_server_stop(&thread);
cleanup();
}
=20
-static gchar *mktempshm(int size, int *fd)
-{
- while (true) {
- gchar *name;
-
- name =3D g_strdup_printf("/qtest-%u-%u", getpid(), g_test_rand_int=
());
- *fd =3D shm_open(name, O_CREAT|O_RDWR|O_EXCL,
- S_IRWXU|S_IRWXG|S_IRWXO);
- if (*fd > 0) {
- g_assert(ftruncate(*fd, size) =3D=3D 0);
- return name;
- }
-
- g_free(name);
-
- if (errno !=3D EEXIST) {
- perror("shm_open");
- return NULL;
- }
- }
-}
-
int main(int argc, char **argv)
{
int ret, fd;
diff --git a/tests/qtest/ivshmem-utils.c b/tests/qtest/ivshmem-utils.c
new file mode 100644
index 0000000000..c2fc3463dd
--- /dev/null
+++ b/tests/qtest/ivshmem-utils.c
@@ -0,0 +1,156 @@
+/*
+ * Common utilities for testing ivshmem devices
+ *
+ * SPDX-FileCopyrightText: 2012 SUSE LINUX Products GmbH
+ * SPDX-FileCopyrightText: 2021 Red Hat, Inc.
+ * SPDX-FileCopyrightText: 2023 Linaro Ltd.
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ */
+
+#include "ivshmem-utils.h"
+
+gchar *mktempshm(int size, int *fd)
+{
+ while (true) {
+ /* Relative path to the shm filesystem, e.g. '/dev/shm'. */
+ gchar *shm_rel_path;
+
+ shm_rel_path =3D g_strdup_printf("/ivshmem_qtest-%u-%u", getpid(),
+ g_test_rand_int());
+ *fd =3D shm_open(shm_rel_path, O_CREAT | O_RDWR | O_EXCL,
+ S_IRWXU | S_IRWXG | S_IRWXO);
+ if (*fd > 0) {
+ g_assert(ftruncate(*fd, size) =3D=3D 0);
+ return shm_rel_path;
+ }
+
+ g_free(shm_rel_path);
+
+ if (errno !=3D EEXIST) {
+ perror("shm_open");
+ return NULL;
+ }
+ }
+}
+
+gchar *mktempsocket(void)
+{
+ gchar *server_socket_path;
+
+ server_socket_path =3D g_strdup_printf("%s/ivshmem_socket_qtest-%u-%u",
+ g_get_tmp_dir(), getpid(),
+ g_test_rand_int());
+ return server_socket_path;
+}
+
+static void *server_thread(void *data)
+{
+ ServerThread *t =3D data;
+ IvshmemServer *server =3D &t->server;
+
+ while (true) {
+ fd_set fds;
+ int maxfd, ret;
+
+ FD_ZERO(&fds);
+ FD_SET(t->pipe[0], &fds);
+ maxfd =3D t->pipe[0] + 1;
+
+ ivshmem_server_get_fds(server, &fds, &maxfd);
+
+ ret =3D select(maxfd, &fds, NULL, NULL, NULL);
+
+ if (ret < 0) {
+ if (errno =3D=3D EINTR) {
+ continue;
+ }
+
+ g_critical("select error: %s\n", strerror(errno));
+ break;
+ }
+ if (ret =3D=3D 0) {
+ continue;
+ }
+
+ if (FD_ISSET(t->pipe[0], &fds)) {
+ break;
+ }
+
+ if (ivshmem_server_handle_fds(server, &fds, maxfd) < 0) {
+ g_critical("ivshmem_server_handle_fds() failed\n");
+ break;
+ }
+ }
+
+ return NULL;
+}
+
+void test_ivshmem_server_start(ServerThread *thread,
+ const char *server_socket_path,
+ const char *shm_rel_path, unsigned num_vect=
ors)
+{
+ g_autoptr(GError) err =3D NULL;
+ int ret;
+ struct stat shm_st;
+ char *shm_path;
+
+ g_assert(thread !=3D NULL);
+ g_assert(server_socket_path !=3D NULL);
+ g_assert_cmpint(num_vectors, >, 0);
+ g_assert(shm_rel_path !=3D NULL);
+
+ /*
+ * Find out shm size. shm_open() deals with relative paths but stat() =
needs
+ * the full path to the shm file.
+ */
+ shm_path =3D g_strdup_printf("/dev/shm%s", shm_rel_path);
+ ret =3D stat(shm_path, &shm_st);
+ g_assert_cmpint(ret, =3D=3D, 0);
+ g_assert_cmpint(shm_st.st_size, >, 0);
+
+ ret =3D ivshmem_server_init(&thread->server, server_socket_path, shm_r=
el_path,
+ true, shm_st.st_size, num_vectors, g_test_verbose());
+ g_assert_cmpint(ret, =3D=3D, 0);
+ ret =3D ivshmem_server_start(&thread->server);
+ g_assert_cmpint(ret, =3D=3D, 0);
+ thread->status =3D SERVER;
+
+ g_unix_open_pipe(thread->pipe, FD_CLOEXEC, &err);
+ g_assert_no_error(err);
+ thread->status |=3D PIPE;
+
+ thread->thread =3D g_thread_new("ivshmem-server", server_thread, threa=
d);
+ g_assert(thread->thread !=3D NULL);
+ thread->status |=3D THREAD;
+}
+
+void test_ivshmem_server_stop(ServerThread *thread)
+{
+ /*
+ * This function can be called any time on a test error/abort (e.g., i=
t can
+ * be called from the abort handler), including from the
+ * test_ivshmem_server_start(). Therefore, the start steps (server sta=
rted,
+ * pipe created, and thread created) are tracked when the server start=
s and
+ * then checked below accordingly for proper termination.
+ */
+
+ if (thread->status & THREAD) {
+ /* Ask to exit from thread. */
+ if (qemu_write_full(thread->pipe[1], "q", 1) !=3D 1) {
+ g_error("qemu_write_full: %s", g_strerror(errno));
+ }
+
+ /* Wait thread to exit. */
+ g_thread_join(thread->thread);
+ }
+
+ if (thread->status & PIPE) {
+ close(thread->pipe[1]);
+ close(thread->pipe[0]);
+ }
+
+ if (thread->status & SERVER) {
+ ivshmem_server_close(&thread->server);
+ }
+}
diff --git a/tests/qtest/ivshmem-utils.h b/tests/qtest/ivshmem-utils.h
new file mode 100644
index 0000000000..c43661caac
--- /dev/null
+++ b/tests/qtest/ivshmem-utils.h
@@ -0,0 +1,56 @@
+/*
+ * Common utilities for testing ivshmem devices
+ *
+ * SPDX-FileCopyrightText: 2012 SUSE LINUX Products GmbH
+ * SPDX-FileCopyrightText: 2021 Red Hat, Inc.
+ * SPDX-FileCopyrightText: 2023 Linaro Ltd.
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ */
+
+#ifndef QTEST_IVSHMEM_UTILS_H
+#define QTEST_IVSHMEM_UTILS_H
+
+#include "qemu/osdep.h"
+#include <glib/gstdio.h>
+#include "contrib/ivshmem-server/ivshmem-server.h"
+#include "libqtest.h"
+
+enum Reg {
+ INTRMASK =3D 0,
+ INTRSTATUS =3D 4,
+ IVPOSITION =3D 8,
+ DOORBELL =3D 12,
+};
+
+enum ServerStartStatus {
+ SERVER =3D 1, /* Ivshmem server started */
+ THREAD =3D 2, /* Thread for monitoring fds created */
+ PIPE =3D 4, /* Pipe created */
+};
+
+typedef struct ServerThread {
+ GThread *thread;
+ IvshmemServer server;
+ /*
+ * Pipe is used to communicate with the thread, asking it to terminate=
on
+ * receiving 'q'.
+ */
+ int pipe[2];
+ /*
+ * Server statuses are used to keep track of thread/server/pipe start =
since
+ * test_ivshmem_server_stop can be called at any time on a test error,
+ * even from test_ivshmem_server_start itself, therefore, they are use=
d for
+ * proper service termination.
+ */
+ enum ServerStartStatus status;
+} ServerThread;
+
+gchar *mktempshm(int size, int *fd);
+gchar *mktempsocket(void);
+void test_ivshmem_server_start(ServerThread *thread,
+ const char *server_socket_path,
+ const char *shm_rel_path, unsigned num_vect=
ors);
+void test_ivshmem_server_stop(ServerThread *thread);
+
+#endif /* QTEST_IVSHMEM_UTILS_H */
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index 2b89e8634b..bc6457220c 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -59,9 +59,9 @@ qtests_i386 =3D \
(config_all_devices.has_key('CONFIG_PVPANIC_ISA') ? ['pvpanic-test'] : [=
]) + \
(config_all_devices.has_key('CONFIG_PVPANIC_PCI') ? ['pvpanic-pci-test']=
: []) + \
(config_all_devices.has_key('CONFIG_HDA') ? ['intel-hda-test'] : []) + =
\
- (config_all_devices.has_key('CONFIG_I82801B11') ? ['i82801b11-test'] : [=
]) + \
+ (config_all_devices.has_key('CONFIG_I82801B11') ? ['i82801b11-test'] : [=
]) + \
(config_all_devices.has_key('CONFIG_IOH3420') ? ['ioh3420-test'] : []) +=
\
- (config_all_devices.has_key('CONFIG_LPC_ICH9') ? ['lpc-ich9-test'] : [])=
+ \
+ (config_all_devices.has_key('CONFIG_LPC_ICH9') ? ['lpc-ich9-test'] : [])=
+ \
(config_all_devices.has_key('CONFIG_USB_UHCI') ? ['usb-hcd-uhci-test'] :=
[]) + \
(config_all_devices.has_key('CONFIG_USB_UHCI') and =
\
config_all_devices.has_key('CONFIG_USB_EHCI') ? ['usb-hcd-ehci-test'] :=
[]) + \
@@ -319,7 +319,7 @@ qtests =3D {
'cdrom-test': files('boot-sector.c'),
'dbus-vmstate-test': files('migration-helpers.c') + dbus_vmstate1,
'erst-test': files('erst-test.c'),
- 'ivshmem-test': [rt, '../../contrib/ivshmem-server/ivshmem-server.c'],
+ 'ivshmem-test': ['ivshmem-utils.c', '../../contrib/ivshmem-server/ivshme=
m-server.c'],
'migration-test': migration_files,
'pxe-test': files('boot-sector.c'),
'qos-test': [chardev, io, qos_test_ss.apply({}).sources()],
--=20
2.34.1