From nobody Sun May 5 09:21:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1628009278; cv=none; d=zohomail.com; s=zohoarc; b=E9FR4NKK5bisiEutzBpypwARTaf27bxn8KkcqqLFyJPoB77UUJKcYCUin9QJG1FBQjK7bF6bAlCk5i+Br3XQ/E1Np7PN9Xe1/8csOk34u8AGtAhub/lvJgS+xkEeIyzVsvFCPVGDhC52H+a4QqRXkXe3GpjZP3kbYDLRKBklWFM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628009278; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=I3sNYXDveSPQKEGjJwMEckakQNuzYunrGiwkcKGpC9M=; b=VjyK2H2CXsRKhNTwkswDJHjl1udB7v6poj+8MhZEwbVw8o6IdH5QTtmkdu2GZHwWrjp8r2EwcG/wlgIZ/dYqwT745pTTBSxicKBpP7ISA+PvpJ8gb2kTDCzntxvau/9fw9h93X7/D1YmgjL9AdwPRyI9a2sB5RUGXqrDQmAWUy8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 162800927884179.90472021330675; Tue, 3 Aug 2021 09:47:58 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-65-XPgNP7y1Mo2r2fnEQqP-5w-1; Tue, 03 Aug 2021 12:47:37 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4A85393937; Tue, 3 Aug 2021 16:47:28 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2F17A136F5; Tue, 3 Aug 2021 16:47:28 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id ED79450046; Tue, 3 Aug 2021 16:47:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 173FDrhF011120 for ; Tue, 3 Aug 2021 11:13:53 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0F6521F5; Tue, 3 Aug 2021 15:13:53 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8E4D319C44 for ; Tue, 3 Aug 2021 15:13:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628009277; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=I3sNYXDveSPQKEGjJwMEckakQNuzYunrGiwkcKGpC9M=; b=ZWJc8fkYl0v21EXPSOww3qKlthYPkKxWZ1ciVZ8IYC5LXQRxt7G8CZNFdJMFez3yVQOt9r 2oj9qxxgdVZA/JN7HPIuFwydQPwn9q+OwT8+ITX7loExPxqWaTVpu32kB7zC5ZBJVLRuZU u/jHzeb1MqMDLSgl3laxRpHOv/r5ovY= X-MC-Unique: XPgNP7y1Mo2r2fnEQqP-5w-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 1/6] virProcessKillPainfullyDelay: use 'rc' variable Date: Tue, 3 Aug 2021 17:13:40 +0200 Message-Id: <875d3c19c9d9013354c46ffd7be88d8648703ee4.1628003420.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1628009280910100001 Use 'rc' to store the return value of virProcessKill, to separate the value check from the function call. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/util/virprocess.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 67dd599b3e..d58e983b56 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -395,6 +395,8 @@ virProcessKillPainfullyDelay(pid_t pid, bool force, uns= igned int extradelay) */ for (i =3D 0; i < polldelay; i++) { int signum; + int rc; + if (i =3D=3D 0) { signum =3D SIGTERM; /* kindly suggest it should exit */ } else if (i =3D=3D 50 && force) { @@ -413,7 +415,9 @@ virProcessKillPainfullyDelay(pid_t pid, bool force, uns= igned int extradelay) signum =3D 0; /* Just check for existence */ } =20 - if (virProcessKill(pid, signum) < 0) { + rc =3D virProcessKill(pid, signum); + + if (rc < 0) { if (errno !=3D ESRCH) { virReportSystemError(errno, _("Failed to terminate process %lld w= ith SIG%s"), --=20 2.31.1 From nobody Sun May 5 09:21:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1628009256; cv=none; d=zohomail.com; s=zohoarc; b=M7okwC55+SmnFuF4p4fB5Yzg2EnStdlFXcxseAS5FoEROqAVsJbQpvdWqSJcdqI/uFTt0g1jXyJmVSapUo/ehY4TI4tURXzCmOymWrBwO2UBJDWItT4pAKL5g9lajazdyqfncfddO8sVduC4ChYwxIF3evliF4d/4W3BA9y4CYs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628009256; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0duwPeip9/+J4BSgFfsITgNsIKU6DAmT4Rwip31H1ww=; b=ED3uu4LD4sBigGLqBhcHluR/O0o73Zz/bz5RgRKYcSkh9hJ+VqwY0Vp6UIfcInTLVA/iHhWU+f6MJfS8OrwAuHizDnTT20uwKg28JwKXxZy/srfz6xO3hkqER+BA/kejYY8mKv4vWrGYvOOAWHNOUbU4jPqDth16ynZdaLj58ZE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1628009256947120.83145922469839; Tue, 3 Aug 2021 09:47:36 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-321-FtkXEb6IOVGGH9khRqVvEw-1; Tue, 03 Aug 2021 12:47:33 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D10B087D544; Tue, 3 Aug 2021 16:47:25 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B621B60C25; Tue, 3 Aug 2021 16:47:25 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 8512550039; Tue, 3 Aug 2021 16:47:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 173FDrBn011125 for ; Tue, 3 Aug 2021 11:13:53 -0400 Received: by smtp.corp.redhat.com (Postfix) id D18DE4536; Tue, 3 Aug 2021 15:13:53 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5C86419C44 for ; Tue, 3 Aug 2021 15:13:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628009256; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=0duwPeip9/+J4BSgFfsITgNsIKU6DAmT4Rwip31H1ww=; b=bnjvpqUmtk4jCy7W3MvfLLbpWyitpmghwMIwe028uJ2fACqbAXZtTXB/Lwh/4jQ5YAtTAX KR1hrRvwhQcNxWdWx2S4RDgvcXn9HOrPj0WyStzpAtW/ZOAvOhNk1nB8AoAcA2yvvHxcU7 +4fumkd2b4UczVNR0DPOLZ3GuZxh81c= X-MC-Unique: FtkXEb6IOVGGH9khRqVvEw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 2/6] util: Introduce virProcessGroupKill Date: Tue, 3 Aug 2021 17:13:41 +0200 Message-Id: <341314b81d67f91eaa78ca933507feff7459ddf8.1628003420.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1628009258523100012 Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/util/virprocess.c | 17 +++++++++++++++++ src/util/virprocess.h | 1 + 2 files changed, 18 insertions(+) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index d58e983b56..c01c8e267b 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -361,6 +361,23 @@ int virProcessKill(pid_t pid, int sig) } =20 =20 +/* send signal to a process group */ +int virProcessGroupKill(pid_t pid, int sig) +{ + if (pid <=3D 1) { + errno =3D ESRCH; + return -1; + } + +#ifdef WIN32 + errno =3D ENOSYS; + return -1; +#else + return killpg(pid, sig); +#endif +} + + /* * Try to kill the process and verify it has exited * diff --git a/src/util/virprocess.h b/src/util/virprocess.h index d16e8b23bb..0359d7fd9f 100644 --- a/src/util/virprocess.h +++ b/src/util/virprocess.h @@ -52,6 +52,7 @@ virProcessWait(pid_t pid, int *exitstatus, bool raw) G_GNUC_WARN_UNUSED_RESULT; =20 int virProcessKill(pid_t pid, int sig); +int virProcessGroupKill(pid_t pid, int sig); =20 int virProcessKillPainfully(pid_t pid, bool force); int virProcessKillPainfullyDelay(pid_t pid, --=20 2.31.1 From nobody Sun May 5 09:21:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1628009266; cv=none; d=zohomail.com; s=zohoarc; b=AQV+m/JcqhqSmN8D2mezJH/gJrykK++TeqaKXBnCaHplLTM6NbXR7GZmNxv/0rP/Fa65dFEsCrcCn+2/oGs7lzaJWuTmMFpquqr5kgYAiEkkgG/yk4ag5YxH+metcXzq4caHABs60lFJqkdhzZg2sTdo7DE6V1uKlg/vmVbg9eA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628009266; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=LbinHCWhC6/E8LgKF6TUv6vaXy3vRZfRWQSJz6abw84=; b=mSWIAro5ZxzPO4W/YuIsSatb1ugRfA1rR1LWswxwPnWTKp6rg2xZsNuUQ6LzlMbQSqnK+rUA+WtgbAwgtGwvs1CIIHH+9J+U1vipWIhkrOc7z/KW5+EKlDxLC1gxZ9vtLVMQwYlxstJgaFRHwPCIlDJJ7lNifXb08wk677YzXjc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1628009266001602.5488632551871; Tue, 3 Aug 2021 09:47:46 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-539-2Xb2ahBPPh6IVR9xOXzgOg-1; Tue, 03 Aug 2021 12:47:38 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 62068185303C; Tue, 3 Aug 2021 16:47:31 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 37A7D69323; Tue, 3 Aug 2021 16:47:31 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id F007F50051; Tue, 3 Aug 2021 16:47:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 173FDs0G011130 for ; Tue, 3 Aug 2021 11:13:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9F5CD4536; Tue, 3 Aug 2021 15:13:54 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2A42619C44 for ; Tue, 3 Aug 2021 15:13:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628009264; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=LbinHCWhC6/E8LgKF6TUv6vaXy3vRZfRWQSJz6abw84=; b=YZls5dwU4sHlkK8DR3gh9BUKkGeRXti3X4Pxn7U+gfQzToMJfS2fzce/dXA14ypXJ9eyCw pjU2ZIZk8KTlrFOwqa7+L/fAoKoHws3NwTHCtq8Qb6SEBTdZjDSDtdt7T6nBd32Y5yuHCH eeEzrBEfrfLhZY+gABviRP0xlLWE6po= X-MC-Unique: 2Xb2ahBPPh6IVR9xOXzgOg-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 3/6] util: introduce virProcessGroupGet Date: Tue, 3 Aug 2021 17:13:42 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1628009267679100001 Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/util/virprocess.c | 17 +++++++++++++++++ src/util/virprocess.h | 1 + 2 files changed, 18 insertions(+) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index c01c8e267b..bbfa4dbdf0 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -378,6 +378,23 @@ int virProcessGroupKill(pid_t pid, int sig) } =20 =20 +/* get process group from a pid */ +pid_t virProcessGroupGet(pid_t pid) +{ + if (pid <=3D 1) { + errno =3D ESRCH; + return -1; + } + +#ifdef WIN32 + errno =3D ENOSYS; + return -1; +#else + return getpgid(pid); +#endif +} + + /* * Try to kill the process and verify it has exited * diff --git a/src/util/virprocess.h b/src/util/virprocess.h index 0359d7fd9f..9d7c0f479a 100644 --- a/src/util/virprocess.h +++ b/src/util/virprocess.h @@ -53,6 +53,7 @@ virProcessWait(pid_t pid, int *exitstatus, bool raw) =20 int virProcessKill(pid_t pid, int sig); int virProcessGroupKill(pid_t pid, int sig); +pid_t virProcessGroupGet(pid_t pid); =20 int virProcessKillPainfully(pid_t pid, bool force); int virProcessKillPainfullyDelay(pid_t pid, --=20 2.31.1 From nobody Sun May 5 09:21:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1628009443; cv=none; d=zohomail.com; s=zohoarc; b=mu9BBDvMoKKb0sJY6BNP/LazWj7NSL+gEcwkOPmOVlEqtyiDRTqCNUWxhcA/9aEMJv5ofdHdOfYm4iVIer10aGE1W8iKkv4PHyIM/H0p/hNVD1/08c/v/4BYdFUWMib0yZrsx3iocJi+0FKNoz095+i3a2hTZTAq+lYIH73ajXs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628009443; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Kit7l7zVVNCa4TmNrUV1DLC245SM29mUMsSETkPXChw=; b=h1YZWwgh51Q5ceqZfioSIagWC5p9I113gpL/7YE24fGymLxkPh4tt1PwclFCU0MMW5ORDf31KShZ5Y+js7WT+GkSvr00cGsb+hVddIfbb27mvbXm9UtJeOJ33XmFDNe1j9XQEtEiUigswzgFzjtFc7/Yf8qHRbAZi3Pv4mpAjck= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1628009443896270.4665537298963; Tue, 3 Aug 2021 09:50:43 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-527-13AX4lguP_2TURiaDcj6mg-1; Tue, 03 Aug 2021 12:47:37 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 638BF100F781; Tue, 3 Aug 2021 16:47:28 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4449B175B6; Tue, 3 Aug 2021 16:47:28 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 0FA7B50045; Tue, 3 Aug 2021 16:47:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 173FDtGE011135 for ; Tue, 3 Aug 2021 11:13:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6E5614536; Tue, 3 Aug 2021 15:13:55 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id ECA5019C44 for ; Tue, 3 Aug 2021 15:13:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628009442; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Kit7l7zVVNCa4TmNrUV1DLC245SM29mUMsSETkPXChw=; b=BeZj4BvYF2Z3mpd+OWHF0ANOJJmELFLiu9sC0YHBHlfjENtz174q4ToZ0tUMWqJZ0iIfIL AzuplTQJBhv8VeAey/rHqZ12kgNKP2COZ2LYDGylk8IeelwrAmpmkgEdRy56WsXDhwfdoJ NT8T4NZZn1A6ZU/xvG4jX+pjDqF6lpw= X-MC-Unique: 13AX4lguP_2TURiaDcj6mg-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 4/6] util: virPidFileForceCleanupPath: add group argument Date: Tue, 3 Aug 2021 17:13:43 +0200 Message-Id: <5ef1080f78bc11dc010a25f00ddf770fc63b6d66.1628003420.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1628009444944100001 Add a version of virPidFileForceCleanupPath that takes a 'group' bool argument and propagate it all the way down to virProcessKillPainfullyDelay. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/libvirt_private.syms | 1 + src/qemu/qemu_process.c | 3 ++- src/util/virpidfile.c | 8 +++++++- src/util/virpidfile.h | 2 ++ src/util/virprocess.c | 8 ++++---- src/util/virprocess.h | 3 ++- 6 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 6961cdb137..e2e4c9482d 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3038,6 +3038,7 @@ virPidFileConstructPath; virPidFileDelete; virPidFileDeletePath; virPidFileForceCleanupPath; +virPidFileForceCleanupPathFull; virPidFileRead; virPidFileReadIfAlive; virPidFileReadPath; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 521fda57da..6ef8ebd83e 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7700,7 +7700,8 @@ qemuProcessKill(virDomainObj *vm, unsigned int flags) * to be safe against stalls by the kernel freeing up the resources */ return virProcessKillPainfullyDelay(vm->pid, !!(flags & VIR_QEMU_PROCESS_KILL_F= ORCE), - vm->def->nhostdevs * 2); + vm->def->nhostdevs * 2, + false); } =20 =20 diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c index c6389c1869..b75f441008 100644 --- a/src/util/virpidfile.c +++ b/src/util/virpidfile.c @@ -514,7 +514,7 @@ virPidFileConstructPath(bool privileged, * Returns 0 if the pidfile was successfully cleaned up, -1 otherwise. */ int -virPidFileForceCleanupPath(const char *path) +virPidFileForceCleanupPathFull(const char *path, bool group) { pid_t pid =3D 0; int fd =3D -1; @@ -544,3 +544,9 @@ virPidFileForceCleanupPath(const char *path) =20 return 0; } + +int +virPidFileForceCleanupPath(const char *path) +{ + return virPidFileForceCleanupPathFull(path, false); +} diff --git a/src/util/virpidfile.h b/src/util/virpidfile.h index 370a59892e..fd8013c41e 100644 --- a/src/util/virpidfile.h +++ b/src/util/virpidfile.h @@ -73,4 +73,6 @@ int virPidFileConstructPath(bool privileged, const char *progname, char **pidfile); =20 +int virPidFileForceCleanupPathFull(const char *path, + bool group) ATTRIBUTE_NONNULL(1); int virPidFileForceCleanupPath(const char *path) ATTRIBUTE_NONNULL(1); diff --git a/src/util/virprocess.c b/src/util/virprocess.c index bbfa4dbdf0..a92aa8aac9 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -406,15 +406,15 @@ pid_t virProcessGroupGet(pid_t pid) * wait longer than the default. */ int -virProcessKillPainfullyDelay(pid_t pid, bool force, unsigned int extradela= y) +virProcessKillPainfullyDelay(pid_t pid, bool force, unsigned int extradela= y, bool group) { size_t i; /* This is in 1/5th seconds since polling is on a 0.2s interval */ unsigned int polldelay =3D (force ? 200 : 75) + (extradelay*5); const char *signame =3D "TERM"; =20 - VIR_DEBUG("vpid=3D%lld force=3D%d extradelay=3D%u", - (long long)pid, force, extradelay); + VIR_DEBUG("vpid=3D%lld force=3D%d extradelay=3D%u group=3D%d", + (long long)pid, force, extradelay, group); =20 /* This loop sends SIGTERM, then waits a few iterations (10 seconds) * to see if it dies. If the process still hasn't exited, and @@ -474,7 +474,7 @@ virProcessKillPainfullyDelay(pid_t pid, bool force, uns= igned int extradelay) =20 int virProcessKillPainfully(pid_t pid, bool force) { - return virProcessKillPainfullyDelay(pid, force, 0); + return virProcessKillPainfullyDelay(pid, force, 0, false); } =20 #if WITH_SCHED_GETAFFINITY diff --git a/src/util/virprocess.h b/src/util/virprocess.h index 9d7c0f479a..9910331a0c 100644 --- a/src/util/virprocess.h +++ b/src/util/virprocess.h @@ -58,7 +58,8 @@ pid_t virProcessGroupGet(pid_t pid); int virProcessKillPainfully(pid_t pid, bool force); int virProcessKillPainfullyDelay(pid_t pid, bool force, - unsigned int extradelay); + unsigned int extradelay, + bool group); =20 int virProcessSetAffinity(pid_t pid, virBitmap *map, bool quiet); =20 --=20 2.31.1 From nobody Sun May 5 09:21:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1628009267; cv=none; d=zohomail.com; s=zohoarc; b=NDAVdSmB7Cc+zvTeE2AF9tNUpfCXNnPahFel091GvErZjXLOr8xhreT0ZpLtxvKZrLMzOrRhWqXYtAzg/fTO3sE/6PxkSBpum352ub1OyZ57f2U3JkQuNtTCD1bvil3iXfxpHZbMsUD4qwjnbkJxsBZOAEI3/QEXpCrkjzCW604= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628009267; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=k4IPE/lfAJ+YhOHQ149l2YsEPKgDnctQz+S8PywkQbM=; b=lLlrG3qN+TKWrzx05TFUAOa9ZDzuUzfzpALR71svyEDhUReIhBcqex1Yr5K1pcPSNM2Kt0A4+PfZBhCdHH/C0vjxwcSOc5KT3S/M/THbA04lyvHmQl4I7Z6ofXdIoL6RP4pZRxxe/9kY7p/qZ7wXEqG84UtR9uG32CeFuDvT7jE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1628009267771266.77233050094696; Tue, 3 Aug 2021 09:47:47 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-467-3RCzFKPlMT29R6Cc3KAY7Q-1; Tue, 03 Aug 2021 12:47:43 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EF2DC87D546; Tue, 3 Aug 2021 16:47:33 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CDDDB1383C; Tue, 3 Aug 2021 16:47:33 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 7923C5004F; Tue, 3 Aug 2021 16:47:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 173FDu6E011140 for ; Tue, 3 Aug 2021 11:13:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3BFD44536; Tue, 3 Aug 2021 15:13:56 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id BB5D019C44 for ; Tue, 3 Aug 2021 15:13:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628009266; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=k4IPE/lfAJ+YhOHQ149l2YsEPKgDnctQz+S8PywkQbM=; b=NM7MX8SSMEkheQ7F5fPzE5ysM0oKo84S6AZQIYDNI62CPOIQVQ7YpD9Wbhd4Crl2GJThsr oXQIsCC/UeROxhoIGLYf6/wzKRoMbZA1lhTF84ug93skaRoXpr7NhDbfW/qbLMmM2hlkix 6+WGnWXNjhds0FRr1KtOKcGSLOLZrZs= X-MC-Unique: 3RCzFKPlMT29R6Cc3KAY7Q-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 5/6] qemu: virtiofs: kill the whole process group Date: Tue, 3 Aug 2021 17:13:44 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1628009269898100001 Send TERM/KILL to virtiofsd and its child processes too and do not exit until they are all dead. https://bugzilla.redhat.com/show_bug.cgi?id=3D1940276 Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik Tested-by: Masayoshi Mizuma --- src/qemu/qemu_virtiofs.c | 2 +- src/util/virpidfile.c | 7 ++++++- src/util/virprocess.c | 5 ++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_virtiofs.c b/src/qemu/qemu_virtiofs.c index edaedf0304..15c05479c8 100644 --- a/src/qemu/qemu_virtiofs.c +++ b/src/qemu/qemu_virtiofs.c @@ -281,7 +281,7 @@ qemuVirtioFSStop(virQEMUDriver *driver G_GNUC_UNUSED, if (!(pidfile =3D qemuVirtioFSCreatePidFilename(vm, fs->info.alias))) goto cleanup; =20 - if (virPidFileForceCleanupPath(pidfile) < 0) { + if (virPidFileForceCleanupPathFull(pidfile, true) < 0) { VIR_WARN("Unable to kill virtiofsd process"); } else { if (QEMU_DOMAIN_FS_PRIVATE(fs)->vhostuser_fs_sock) diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c index b75f441008..7069f8343d 100644 --- a/src/util/virpidfile.c +++ b/src/util/virpidfile.c @@ -529,10 +529,15 @@ virPidFileForceCleanupPathFull(const char *path, bool= group) if (fd < 0) { virResetLastError(); =20 + if (pid > 1 && group) + pid =3D virProcessGroupGet(pid); + /* Only kill the process if the pid is valid one. 0 means * there is somebody else doing the same pidfile cleanup * machinery. */ - if (pid) + if (group) + virProcessKillPainfullyDelay(pid, true, 0, true); + else if (pid) virProcessKillPainfully(pid, true); =20 if (virPidFileDeletePath(path) < 0) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index a92aa8aac9..d946ac37f4 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -449,7 +449,10 @@ virProcessKillPainfullyDelay(pid_t pid, bool force, un= signed int extradelay, boo signum =3D 0; /* Just check for existence */ } =20 - rc =3D virProcessKill(pid, signum); + if (group) + rc =3D virProcessGroupKill(pid, signum); + else + rc =3D virProcessKill(pid, signum); =20 if (rc < 0) { if (errno !=3D ESRCH) { --=20 2.31.1 From nobody Sun May 5 09:21:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1628009268; cv=none; d=zohomail.com; s=zohoarc; b=fwepWjwAjepawce9hzhmopSwc6TTPxLi8HILk++QtKCR1U52e5dfqazJwQZzdcOo+beDHZ06rlg/SmrGBTPCy2ln9/edDhoBcFiUM1Gqnx8c5EEFRwX83lEhv1H8mUiy4P0OfhqQqsMiHyCgL3A30uLM++xY4igrtn2E8iSk3UY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628009268; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=RJ3BFN54NFX/6Quycfz+9y2ldtCA3hEp0XP4ZKNln+4=; b=EcorFcvgZ2lfE4QDGwMPZiFBuIwIXLQQG/2IznSDXGE2HeA0AOexLrKJ9k/+LfflOT3PeBVSbTedWoY3ScKCf8uyUuPVqHvbV6Xgv73qe7cu+bCd4Ac3O9MM9o9rYFTdgPgoZurtmWkQp8UpP9QdYBY373e1XjreQemIFEWHHEQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1628009268609291.6463284895051; Tue, 3 Aug 2021 09:47:48 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-527-zU5KdDp6MkiD5I7nA1sUzA-1; Tue, 03 Aug 2021 12:47:38 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6795F100F797; Tue, 3 Aug 2021 16:47:28 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4BAE517C58; Tue, 3 Aug 2021 16:47:28 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 1A4E750049; Tue, 3 Aug 2021 16:47:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 173FDvF1011145 for ; Tue, 3 Aug 2021 11:13:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id 09F334536; Tue, 3 Aug 2021 15:13:57 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id 88BFE19C44 for ; Tue, 3 Aug 2021 15:13:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628009267; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=RJ3BFN54NFX/6Quycfz+9y2ldtCA3hEp0XP4ZKNln+4=; b=FVW1LVhQLBoUlW5c8pQDE6wmcw6Ak3O32hZKEzteUkix+7A9ichb6Mm1dFG/jIrj4E7gYR /+LUdDBlQ2ETna/1PMFA4uSwTCiDduWKpYYEPHeCqzLopsvu0iRVv9sAKP29c0ppNRG8SZ wwRN04C7UZ4mkXwZ2d5QAlyCXH5l60Y= X-MC-Unique: zU5KdDp6MkiD5I7nA1sUzA-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 6/6] util: fix typo Date: Tue, 3 Aug 2021 17:13:45 +0200 Message-Id: <7d40859ad4871c684f1413963b16fb7c32c7f086.1628003420.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1628009270238100003 Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/util/virprocess.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index d946ac37f4..9b428bc623 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -402,7 +402,7 @@ pid_t virProcessGroupGet(pid_t pid) * was killed forcibly, -1 if it is still alive, * or another error occurred. * - * Callers can proide an extra delay in seconds to + * Callers can provide an extra delay in seconds to * wait longer than the default. */ int --=20 2.31.1