From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Laurent Vivier" <lvivier@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Alex Bennée" <alex.bennee@linaro.org>,
qemu-arm@nongnu.org, "Stefan Hajnoczi" <stefanha@gmail.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Joel Stanley" <joel@jms.id.au>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Beraldo Leal" <bleal@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>
Subject: [PATCH 2/4] qtest: kill orphaned qtest QEMU processes on FreeBSD
Date: Tue, 12 Sep 2023 19:41:28 +0100 [thread overview]
Message-ID: <20230912184130.3056054-3-berrange@redhat.com> (raw)
In-Reply-To: <20230912184130.3056054-1-berrange@redhat.com>
On Linux we use PR_SET_PDEATHSIG to kill orphaned QEMU processes
if we fail to call qtest_quit(), or the test program aborts/segvs.
This prevents meson from hanging forever due to the orphaned
process keeping stdout open.
On FreeBSD we can achieve the same using PROC_PDEATHSIG_CTL, which
gives us the equivalent protection against hangs.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
tests/qtest/libqtest.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c
index 34b9c14b75..b1eba71ffe 100644
--- a/tests/qtest/libqtest.c
+++ b/tests/qtest/libqtest.c
@@ -24,6 +24,9 @@
#ifdef __linux__
#include <sys/prctl.h>
#endif /* __linux__ */
+#ifdef __FreeBSD__
+#include <sys/procctl.h>
+#endif /* __FreeBSD__ */
#include "libqtest.h"
#include "libqmp.h"
@@ -414,6 +417,10 @@ static QTestState *G_GNUC_PRINTF(1, 2) qtest_spawn_qemu(const char *fmt, ...)
*/
prctl(PR_SET_PDEATHSIG, SIGKILL, 0, 0, 0);
#endif /* __linux__ */
+#ifdef __FreeBSD__
+ int sig = SIGKILL;
+ procctl(P_PID, getpid(), PROC_PDEATHSIG_CTL, &sig);
+#endif /* __FreeBSD__ */
if (!g_setenv("QEMU_AUDIO_DRV", "none", true)) {
exit(1);
}
--
2.41.0
next prev parent reply other threads:[~2023-09-12 18:41 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-12 18:41 [PATCH 0/4] ci: fix hang of FreeBSD CI jobs Daniel P. Berrangé
2023-09-12 18:41 ` [PATCH 1/4] microbit: add missing qtest_quit() call Daniel P. Berrangé
2023-09-12 19:10 ` Richard Henderson
2023-09-13 8:06 ` Daniel P. Berrangé
2023-09-12 18:41 ` Daniel P. Berrangé [this message]
2023-09-12 19:05 ` [PATCH 2/4] qtest: kill orphaned qtest QEMU processes on FreeBSD Richard Henderson
2023-09-12 18:41 ` [PATCH 3/4] gitlab: make Cirrus CI timeout explicit Daniel P. Berrangé
2023-09-13 5:54 ` Philippe Mathieu-Daudé
2023-09-12 18:41 ` [PATCH 4/4] gitlab: make Cirrus CI jobs gating Daniel P. Berrangé
2023-09-12 19:00 ` [PATCH 0/4] ci: fix hang of FreeBSD CI jobs Stefan Hajnoczi
2023-09-12 20:03 ` Thomas Huth
2023-09-13 8:48 ` Alex Bennée
2023-09-13 9:00 ` Daniel P. Berrangé
2023-09-13 9:02 ` Thomas Huth
2023-09-13 9:53 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230912184130.3056054-3-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=bleal@redhat.com \
--cc=joel@jms.id.au \
--cc=lvivier@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@gmail.com \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.