From patchwork Thu Sep 14 15:54:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 722555 Delivered-To: patch@linaro.org Received: by 2002:adf:f0d1:0:b0:31d:da82:a3b4 with SMTP id x17csp470498wro; Thu, 14 Sep 2023 08:56:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IELACRBb3UwKIMT5+wXhG/jdMb8lbD8onjC8Ptcs1oOXFmQRHt7DUFe2jK/2Go2uVPlJWWr X-Received: by 2002:a05:620a:1271:b0:76f:382:b551 with SMTP id b17-20020a05620a127100b0076f0382b551mr5390569qkl.35.1694707009638; Thu, 14 Sep 2023 08:56:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694707009; cv=none; d=google.com; s=arc-20160816; b=F2B11CmYoO25HoAv5QieP9W59cfYKMLhZgD322gcS7xsXZRr0yYF/GBqlzo7gPg3ns PL+7XI7B9CgQ5KkJXNmryqxJFYl7+M607KnwPL8kom+Bh4TYD40dZvhLq0iE7SAAtEEC beAyaRHWijXmWTgL5drmQ+CL2a2z4+Ki+36YztBcDrD/ReH+JKfU6sbjYzfI1G1FQ2fD QOBdDNX98sUDW3/8bczolH4qqMCOX9grYE/sl9h5zExZx3fUcJdaBuru1sLApwq67dbc yNNvpWo1ax1Va7aUstHuyW4M1g53VjzKV4rwXLscUl1dgYA1NeYNm544g/Us1TbiDbf1 eakQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=HZcF5/gSkiSoxCO096FcHnSr7utgTrP+2NsmOiiXXQE=; fh=dTNX99E8u+HKtIgcb+NG4ZgPAJUPpWQBipaQJoWWNL4=; b=Vrj1tljfzk5XcLmETuMbFuWGLpqCJ8nZtU80Wgim4rPXX/1nAYGRWIN/BBH+l8HpOh Kvyp/7HmbrZaxFHbFV1kRQSFduKEkA8t7bWSaH2F6n8DoeJyu6bExw8cvfqUI1x6rz11 dJdEHxFCYrRJcIY9xKxQKtWYv149vcvU8+JZLrUA1It12lTNQm2IFUdZchJEvdCPp9yd g6dOeqgQruHARAMNH3VwXFQl/MMXRHk/VfUWlc+6Vyh65W0thbfqYpXeU3Kx5CYa5z1F 9S89ZpAecp6WZOl43otlzjqMUfD69s6q//X2Ud1qedX5pMU+aY30OtCiONL6/miD975L bqxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Jk2Tne8B; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id j11-20020a05620a288b00b0076da43af035si1071609qkp.733.2023.09.14.08.56.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Sep 2023 08:56:49 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Jk2Tne8B; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qgogG-0002Dk-Id; Thu, 14 Sep 2023 11:55:00 -0400 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 ) id 1qgofw-0001XY-IO for qemu-devel@nongnu.org; Thu, 14 Sep 2023 11:54:40 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qgofn-00087l-SK for qemu-devel@nongnu.org; Thu, 14 Sep 2023 11:54:40 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-401d80f4ef8so12536835e9.1 for ; Thu, 14 Sep 2023 08:54:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694706866; x=1695311666; 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=HZcF5/gSkiSoxCO096FcHnSr7utgTrP+2NsmOiiXXQE=; b=Jk2Tne8B38sri77kpoUBAy54D+qM1MvfhPmzYGIrVqbAEgdDdW8E1sxUR8tywyNazh YTzTqIzUET7Zptnv6GJFLXVJNYjdfAZQ84okWmzQr/AGM1yTC/1tYwE6keetUavyOrbu Fqsyj/tkIuSUI3XhvyKIdEQOSUrZSh8iv8FEpyt6XZTIBfLyrqTXO6wGwkLkYZasHApY Ti0wmRIoTpqLUiL+VPYZsjdGL/JJ14iV6HtdNxKrc9ZhgtaKOpPZaAXpLwxMe28/uNTz BGE0j80MY8jJbLhYVKo2BIagER4ohw7wLF5MvLgYarfitgzR0S3mwtC76Nis1l6QUQ3o ryXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694706866; x=1695311666; 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=HZcF5/gSkiSoxCO096FcHnSr7utgTrP+2NsmOiiXXQE=; b=rDaddXZbzJHbkK0AuzyfoY6LzTSAb61rsbkolxwRkHZCprIyK7ndMhKxb+dtxHAFLw ObwjsJGwhuM9LrTy0HfPGxe0BCzEWsQv2ws91JUMB/HF59Mn+AAydMPLnKZvt4Vvpofn vYeXrbLXmTh/5Ddlxs1wUgEy3JCAaXcOgKAY+e5J+QXmhq8e4hpu5XEkBbstYA8bo60s QEVyalKMkAGyBpSVRc7EUV/NcFfTKdidAHFcJwSGWg0zorSTceGES4G3YIshw1X+ndcB hF4BwHCPv+pv/VQccjp4f9LMhWzROc+roR/gDlluZ85IPE3YRfo1Yxjc2Y97b3IklKz7 13Vw== X-Gm-Message-State: AOJu0YwkOhUW8pxWhTrLRUL+H8ei8eotB/OiE/Aa0qa1UxJM9Ja3MjDV 7SeaOVrVv4x8ywEvVIoL10MBEg== X-Received: by 2002:a5d:5148:0:b0:31f:a682:d27f with SMTP id u8-20020a5d5148000000b0031fa682d27fmr5416472wrt.67.1694706866513; Thu, 14 Sep 2023 08:54:26 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a4-20020a5d4d44000000b00317e77106dbsm2075765wru.48.2023.09.14.08.54.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 08:54:23 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 02D6A1FFC0; Thu, 14 Sep 2023 16:54:23 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Cleber Rosa , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Joel Stanley , Wainer dos Santos Moschetta , Beraldo Leal , Richard Henderson , Pavel Dovgalyuk , qemu-arm@nongnu.org, Thomas Huth , Jiaxun Yang , John Snow , Mark Cave-Ayland , Peter Maydell , Laurent Vivier , Aurelien Jarno , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Markus Armbruster , Stefan Hajnoczi Subject: [PATCH 5/9] qtest: kill orphaned qtest QEMU processes on FreeBSD Date: Thu, 14 Sep 2023 16:54:18 +0100 Message-Id: <20230914155422.426639-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230914155422.426639-1-alex.bennee@linaro.org> References: <20230914155422.426639-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.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 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Daniel P. Berrangé 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é" Reviewed-by: Richard Henderson Reviewed-by: Stefan Hajnoczi Reviewed-by: Thomas Huth Message-Id: <20230912184130.3056054-3-berrange@redhat.com> Signed-off-by: Alex Bennée --- 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 #endif /* __linux__ */ +#ifdef __FreeBSD__ +#include +#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); }