From nobody Thu Apr 25 21:42:55 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1565709885; cv=none; d=zoho.com; s=zohoarc; b=DRWpgejvCKI+7nsSDiIQKzMGqxw0FfV+y0e5xj48MmXh4guDcNZd8D0/ApZGa3N4w6hOafsXmLbiwaD9x4gPtOAVg3fS92sV2PKe3TBHHhZhGH6VoMoQ2WU27nzs5rPLvu8J2DILv2gI+CrCtC3PXMqcjOv+gafUEMLYLbox3YY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565709885; 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:ARC-Authentication-Results; bh=mj52qAVk/D5R6aQLVhDnoAg5ZG2pEexQjarcCbicw+k=; b=V1AG1GkvVwl4669mJXsBPO2D8Zdm0a5kucw5tJKSqreWExVhxzsDpzmCmtV3PFUq4b1Pd0hWEUMvyO/hHeHE8ANZ43pinOKFWzt6icS448jQjGYNkRjjMSOYKW2L6izq650RscC5rcHr0eT/p6PGWiWXPW/1SJsc95UU67Hcfpg= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1565709885590531.940391974798; Tue, 13 Aug 2019 08:24:45 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 55223923AD; Tue, 13 Aug 2019 15:24:44 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 302E57983C; Tue, 13 Aug 2019 15:24:44 +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 06B96180BA99; Tue, 13 Aug 2019 15:24:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7DFOVMp009108 for ; Tue, 13 Aug 2019 11:24:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8BF9582486; Tue, 13 Aug 2019 15:24:31 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1751E37DE for ; Tue, 13 Aug 2019 15:24:30 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 13 Aug 2019 17:24:24 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/3] util: use VIR_AUTOPTR virNodeSuspendSupportsTargetPMUtils 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 13 Aug 2019 15:24:44 +0000 (UTC) Get rid of the ret variable as well as the cleanup label. Signed-off-by: J=C3=A1n Tomko --- src/util/virnodesuspend.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c index 3fc5b93ac7..af0ed615e1 100644 --- a/src/util/virnodesuspend.c +++ b/src/util/virnodesuspend.c @@ -238,9 +238,8 @@ int virNodeSuspend(unsigned int target, static int virNodeSuspendSupportsTargetPMUtils(unsigned int target, bool *supported) { - virCommandPtr cmd; + VIR_AUTOPTR(virCommand) cmd =3D NULL; int status; - int ret =3D -1; =20 *supported =3D false; =20 @@ -259,18 +258,14 @@ virNodeSuspendSupportsTargetPMUtils(unsigned int targ= et, bool *supported) } =20 if (virCommandRun(cmd, &status) < 0) - goto cleanup; + return -1; =20 /* * Check return code of command =3D=3D 0 for success * (i.e., the PM capability is supported) */ *supported =3D (status =3D=3D 0); - ret =3D 0; - - cleanup: - virCommandFree(cmd); - return ret; + return 0; } #else /* ! WITH_PM_UTILS */ static int --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Apr 25 21:42:55 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1565709888; cv=none; d=zoho.com; s=zohoarc; b=Ubr6VfDZS06jBdtHqlVJ8xc5OWd+lITqojnBCuEXz+mxMkgMl7F8+s8t0Cy3gdBdEQmZxUCM3cuAiaQzdzDg3nmDfhNqsJwsVasFY2PJfrGXHyOUTLbpiIAZ2P1Ba6e1GwdknjejvaRlp6RwLdL6BIJel/K1bJVycO8QaMpa5Xo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565709888; 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:ARC-Authentication-Results; bh=aVP7v1fofeD8lWGNQ9eD0soVQTb3pd2kxik5Y8nyq4s=; b=nV4hRVfzAu9C/jgsdDwH1WJ6nON7UFNv/mwEDUREEkLfuDqflEkrw9jyGw2xGzD88Nq704du45o5qBY+Wl1XHCEpU0QZEdpaW7QDUY7jvMSuyHK8fTRpfGohM2b09ksnAqAZj4pstEx5x44hLsFiCrQ1RfCR08H47/Oo3INXszU= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 156570988896021.409329267290786; Tue, 13 Aug 2019 08:24:48 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 8F750806CF; Tue, 13 Aug 2019 15:24:47 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6BEEB6E6FB; Tue, 13 Aug 2019 15:24:47 +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 2DD05180BA9C; Tue, 13 Aug 2019 15:24:47 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7DFOWol009116 for ; Tue, 13 Aug 2019 11:24:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id 58C8982486; Tue, 13 Aug 2019 15:24:32 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id D84F837DE for ; Tue, 13 Aug 2019 15:24:31 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 13 Aug 2019 17:24:25 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/3] util: do not repeat the pm-is-supported string 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Tue, 13 Aug 2019 15:24:48 +0000 (UTC) Use a 'binary' variable to hold it. Signed-off-by: J=C3=A1n Tomko --- src/util/virnodesuspend.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c index af0ed615e1..62e62bb171 100644 --- a/src/util/virnodesuspend.c +++ b/src/util/virnodesuspend.c @@ -239,22 +239,23 @@ static int virNodeSuspendSupportsTargetPMUtils(unsigned int target, bool *supported) { VIR_AUTOPTR(virCommand) cmd =3D NULL; + const char *binary =3D "pm-is-supported"; int status; =20 *supported =3D false; =20 switch (target) { case VIR_NODE_SUSPEND_TARGET_MEM: - cmd =3D virCommandNewArgList("pm-is-supported", "--suspend", NULL); + cmd =3D virCommandNewArgList(binary, "--suspend", NULL); break; case VIR_NODE_SUSPEND_TARGET_DISK: - cmd =3D virCommandNewArgList("pm-is-supported", "--hibernate", NUL= L); + cmd =3D virCommandNewArgList(binary, "--hibernate", NULL); break; case VIR_NODE_SUSPEND_TARGET_HYBRID: - cmd =3D virCommandNewArgList("pm-is-supported", "--suspend-hybrid"= , NULL); + cmd =3D virCommandNewArgList(binary, "--suspend-hybrid", NULL); break; default: - return ret; + return -1; } =20 if (virCommandRun(cmd, &status) < 0) --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Apr 25 21:42:55 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1565709892; cv=none; d=zoho.com; s=zohoarc; b=AfKP1UAmbD+HJjWYoJTrUzoAQVYrgLyONX0T7LxOuZxMiKNs2ylhBqdK4zcRJop/k8WDr9ygFSrgjFVohVylqn1dml8DzFga5fqW4KmcRn9/duSOELivVwaftOrHWNqYWp4+kzn//IfcbuKPp8ULnIA6G0nDwDtYtMfGwyVqos4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565709892; 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:ARC-Authentication-Results; bh=C6GwDxSrY33fKCk3QvjVrBRV7vLNVBX8WkLSC/v5vxc=; b=ak6UuUo9pMNYLqp+hOS/c0Sj6SQemcx8Fj4QNW0Hf42RwXyLpBb7yMacUfVSAxgCuXbcmdP653eRthlQAQ7L3/aqs1uNjCmGadVuwlI5R3Gb1qeDxNOV+aNP8CCCQNjeIdhlG9TfRey7epzaYvMrlCWU+hKoO70tpQvu5FtnxRc= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1565709892545593.4036527080624; Tue, 13 Aug 2019 08:24:52 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2CF043007C52; Tue, 13 Aug 2019 15:24:51 +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 087097983C; Tue, 13 Aug 2019 15:24:51 +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 C4ECA24F30; Tue, 13 Aug 2019 15:24:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7DFOXiV009124 for ; Tue, 13 Aug 2019 11:24:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id 251B382486; Tue, 13 Aug 2019 15:24:33 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id A40E037DE for ; Tue, 13 Aug 2019 15:24:32 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 13 Aug 2019 17:24:26 +0200 Message-Id: <5f1111facb40b4a2eafde0a996c947dd02b75131.1565709830.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/3] util: be quiet when pm-is-supported is unavailable 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Tue, 13 Aug 2019 15:24:51 +0000 (UTC) Look up the binary name upfront to avoid the error: Cannot find 'pm-is-supported' in path: No such file or directory In that case, we just assume nodesuspend is not available. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Andrea Bolognani --- src/util/virnodesuspend.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c index 62e62bb171..fea2ebcd76 100644 --- a/src/util/virnodesuspend.c +++ b/src/util/virnodesuspend.c @@ -29,6 +29,7 @@ #include "datatypes.h" =20 #include "viralloc.h" +#include "virfile.h" #include "virlog.h" #include "virerror.h" =20 @@ -239,11 +240,15 @@ static int virNodeSuspendSupportsTargetPMUtils(unsigned int target, bool *supported) { VIR_AUTOPTR(virCommand) cmd =3D NULL; - const char *binary =3D "pm-is-supported"; + VIR_AUTOFREE(char *) binary =3D NULL; int status; =20 *supported =3D false; =20 + binary =3D virFindFileInPath("pm-is-supported"); + if (!binary) + return -2; + switch (target) { case VIR_NODE_SUSPEND_TARGET_MEM: cmd =3D virCommandNewArgList(binary, "--suspend", NULL); --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list