[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 5/9] qtest: kill orphaned qtest QEMU processes on FreeBSD
From: |
Alex Bennée |
Subject: |
[PATCH 5/9] qtest: kill orphaned qtest QEMU processes on FreeBSD |
Date: |
Thu, 14 Sep 2023 16:54:18 +0100 |
From: Daniel P. Berrangé <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>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20230912184130.3056054-3-berrange@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
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.39.2
- Re: [PATCH 2/9] gitlab: fix typo/spelling in comments, (continued)
[PATCH 4/9] microbit: add missing qtest_quit() call, Alex Bennée, 2023/09/14
[PATCH 5/9] qtest: kill orphaned qtest QEMU processes on FreeBSD,
Alex Bennée <=
[PATCH 8/9] tests/avocado: Fix console data loss, Alex Bennée, 2023/09/14