aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tests/qtest/libqtest.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c
index 4a4697c0d1..2e49618454 100644
--- a/tests/qtest/libqtest.c
+++ b/tests/qtest/libqtest.c
@@ -19,6 +19,9 @@
#include <sys/socket.h>
#include <sys/wait.h>
#include <sys/un.h>
+#ifdef __linux__
+#include <sys/prctl.h>
+#endif /* __linux__ */
#include "libqtest.h"
#include "libqmp.h"
@@ -301,6 +304,20 @@ QTestState *qtest_init_without_qmp_handshake(const char *extra_args)
s->expected_status = 0;
s->qemu_pid = fork();
if (s->qemu_pid == 0) {
+#ifdef __linux__
+ /*
+ * Although we register a ABRT handler to kill off QEMU
+ * when g_assert() triggers, we want an extra safety
+ * net. The QEMU process might be non-functional and
+ * thus not have responded to SIGTERM. The test script
+ * might also have crashed with SEGV, in which case the
+ * cleanup handlers won't ever run.
+ *
+ * This PR_SET_PDEATHSIG setup will ensure any remaining
+ * QEMU will get terminated with SIGKILL in these cases.
+ */
+ prctl(PR_SET_PDEATHSIG, SIGKILL, 0, 0, 0);
+#endif /* __linux__ */
if (!g_setenv("QEMU_AUDIO_DRV", "none", true)) {
exit(1);
}