From nobody Sat Feb 7 21:21:49 2026 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=1565708900; cv=none; d=zoho.com; s=zohoarc; b=NLGxrT/2DznMbQ3wetmrSz1hZBT8NzcZWirJzeqUXeP/TWxTsG7UQwDVtKnTZuPZ1v6XAKc30Zcq3Zw7zCdeHAc0rak8WOrqav5AhpsPHkNrnzBBd+0ccTDZu2Tt/5iNIjPd5n9Tdp6BI+5Yc1VuQh1bBW0r+0RbZUgIBsAd/Cc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565708900; 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=yGLpMmB/va4IrR0q4KAULDro7sIBGsk9AeVq3VtIyhc=; b=mDpqz82MgriZeajc1/ov1h4g93vN3hTAQZHj186Sgzc0xgjhf6jnKM9UEOXtoEwn6AyP49yDfL/CBV/EqA1SnsXACdHFkOmWZTnl8O3TZFoWyHrMicRuZTT8Yh8GID9JJNw0r+GtSY9h5HiTuEH9Hs5t9i83e/s+gfJLUyp6Zek= 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 1565708900921557.1226540631346; Tue, 13 Aug 2019 08:08:20 -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 BA8B0C05AA6B; Tue, 13 Aug 2019 15:08:19 +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 D7D336E08F; Tue, 13 Aug 2019 15:08:18 +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 F219A1800202; Tue, 13 Aug 2019 15:08:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7DF8B1j008272 for ; Tue, 13 Aug 2019 11:08:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id B2314891CC; Tue, 13 Aug 2019 15:08:11 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3C40460BE2 for ; Tue, 13 Aug 2019 15:08:11 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 13 Aug 2019 17:08:04 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/3] util: introduce virSystemdHasLogind 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.32]); Tue, 13 Aug 2019 15:08:20 +0000 (UTC) Split it out from virSystemdPMSupportTarget. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/util/virsystemd.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 26b751311f..b401eda6a2 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -174,6 +174,21 @@ virSystemdHasMachined(void) return ret; } =20 +static int +virSystemdHasLogind(void) +{ + int ret; + + ret =3D virDBusIsServiceEnabled("org.freedesktop.login1"); + if (ret < 0) + return ret; + + if ((ret =3D virDBusIsServiceRegistered("org.freedesktop.login1")) < 0) + return ret; + + return ret; +} + =20 char * virSystemdGetMachineNameByPID(pid_t pid) @@ -547,11 +562,7 @@ virSystemdPMSupportTarget(const char *methodName, bool= *result) DBusMessage *message =3D NULL; char *response; =20 - ret =3D virDBusIsServiceEnabled("org.freedesktop.login1"); - if (ret < 0) - return ret; - - if ((ret =3D virDBusIsServiceRegistered("org.freedesktop.login1")) < 0) + if ((ret =3D virSystemdHasLogind()) < 0) return ret; =20 if (!(conn =3D virDBusGetSystemBus())) --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Feb 7 21:21:49 2026 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=1565708900; cv=none; d=zoho.com; s=zohoarc; b=E2XUu0Q552f/EidJBX2JTIIbpzl5BoxVrV9Ae5/S99fxdL67SFnyPE9SGjPdvKLlt7cceAWKZ4FhrEol/JM9nXp5ZzKwJSWndG70xUmXpYLYRLrBJW7gf3ATuQC6OOywED67AAmkE/5cAF2KLVB0vCvHciX2BvbYCMWJyBgDsA0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565708900; 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=6mHCoQrdo19d16GWc7456gBWfkxA14l2pm9FT7W2Xo0=; b=msj1HzgtDxegPFbZCT7F6VIILn1nxXDHyfHy1Aq9vTS3IMKTzsf1VfL40PmrVCenuE+/P9fM8mklyCAl+4AYawpnbQOkEnBs9E+1Q5bJS7lhZvZXatbPatZ9WdEjSLaprxl0PsL/23eVSmFdGHw/wrFql7XUYJHH5CUOd/U0B68= 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 1565708900997438.27982902922497; Tue, 13 Aug 2019 08:08:20 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id B558D3C93A; Tue, 13 Aug 2019 15:08:19 +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 D791C82E38; Tue, 13 Aug 2019 15:08:18 +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 90F74180B536; Tue, 13 Aug 2019 15:08:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7DF8CO2008281 for ; Tue, 13 Aug 2019 11:08:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id 80A0288F14; Tue, 13 Aug 2019 15:08:12 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0AB0560BE2 for ; Tue, 13 Aug 2019 15:08:11 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 13 Aug 2019 17:08:05 +0200 Message-Id: <977fa9fac03980195a5fa58c5de1a71fcc5574be.1565708788.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/3] util: cache the result of whether logind is available 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 13 Aug 2019 15:08:20 +0000 (UTC) Similar to how we cache the availability of machined. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/libvirt_private.syms | 1 + src/util/virsystemd.c | 20 ++++++++++++++++++-- src/util/virsystemdpriv.h | 1 + tests/virsystemdtest.c | 3 +++ 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 7a3feb8efa..5940342087 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3135,6 +3135,7 @@ virSystemdCanSuspend; virSystemdCreateMachine; virSystemdGetActivation; virSystemdGetMachineNameByPID; +virSystemdHasLogindResetCachedValue; virSystemdHasMachinedResetCachedValue; virSystemdMakeScopeName; virSystemdMakeSliceName; diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index b401eda6a2..66d0b7bd53 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -140,6 +140,7 @@ char *virSystemdMakeSliceName(const char *partition) } =20 static int virSystemdHasMachinedCachedValue =3D -1; +static int virSystemdHasLogindCachedValue =3D -1; =20 /* Reset the cache from tests for testing the underlying dbus calls * as well */ @@ -148,6 +149,12 @@ void virSystemdHasMachinedResetCachedValue(void) virSystemdHasMachinedCachedValue =3D -1; } =20 +void virSystemdHasLogindResetCachedValue(void) +{ + virSystemdHasLogindCachedValue =3D -1; +} + + /* -2 =3D machine1 is not supported on this machine * -1 =3D error * 0 =3D machine1 is available @@ -178,14 +185,23 @@ static int virSystemdHasLogind(void) { int ret; + int val; + + val =3D virAtomicIntGet(&virSystemdHasLogindCachedValue); + if (val !=3D -1) + return val; =20 ret =3D virDBusIsServiceEnabled("org.freedesktop.login1"); - if (ret < 0) + if (ret < 0) { + if (ret =3D=3D -2) + virAtomicIntSet(&virSystemdHasLogindCachedValue, -2); return ret; + } =20 - if ((ret =3D virDBusIsServiceRegistered("org.freedesktop.login1")) < 0) + if ((ret =3D virDBusIsServiceRegistered("org.freedesktop.login1")) =3D= =3D -1) return ret; =20 + virAtomicIntSet(&virSystemdHasLogindCachedValue, ret); return ret; } =20 diff --git a/src/util/virsystemdpriv.h b/src/util/virsystemdpriv.h index a49c91e649..736c53d3fa 100644 --- a/src/util/virsystemdpriv.h +++ b/src/util/virsystemdpriv.h @@ -28,3 +28,4 @@ #include "virsystemd.h" =20 void virSystemdHasMachinedResetCachedValue(void); +void virSystemdHasLogindResetCachedValue(void); diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index 340b038095..2dafce2764 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -751,12 +751,15 @@ mymain(void) }; \ if (virTestRun("Test " name " ", testPMSupportHelper, &data) < 0) \ ret =3D -1; \ + virSystemdHasLogindResetCachedValue(); \ if (virTestRun("Test " name " no systemd ", \ testPMSupportHelperNoSystemd, &data) < 0) \ ret =3D -1; \ + virSystemdHasLogindResetCachedValue(); \ if (virTestRun("Test systemd " name " not running ", \ testPMSupportSystemdNotRunning, &data) < 0) \ ret =3D -1; \ + virSystemdHasLogindResetCachedValue(); \ } while (0) =20 TESTS_PM_SUPPORT_HELPER("canSuspend", &virSystemdCanSuspend); --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Feb 7 21:21:49 2026 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=1565708914; cv=none; d=zoho.com; s=zohoarc; b=a0O151H0LBi1KBLRzN3fEl7zcByeEAGHsRZIEhRQ7T61I2ldVktnxG/8tBt67G+sWw4zMZn9EsteGYlk3wJshFKCBJZEIqxRaKzYwGImmlGVF6HvLj8DlYlEB/856TMFL1uAlyVrX4ILHzgIeCPZjp9KLD6SFYCNWXwHEOF3e60= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565708914; 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=aNr9MKGBQ3zGQ9C7DOFRmZ6ZWusCYSD6E+ZbsVbTYyA=; b=F90KxBN9hc/bWwKHBu8ZLoFvLAEwGXBO3XuY/ExT/vBK8XUEaIXCNq3dBE20QUmkwjI0Tlmc+HZYmB9yvvQc0caiSjyVsRhIw5E8ysGcO0VtaV7sPbuTQkmPgmY9dDiOg3mXes8Ysf+MBH0aZQ4wnNPus+a7Tp1M0Whqyfvx0qo= 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 1565708914850935.5488285913422; Tue, 13 Aug 2019 08:08:34 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id A9AAB4E4E6; Tue, 13 Aug 2019 15:08: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 84C4E82E38; Tue, 13 Aug 2019 15:08: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 4AC0324F30; Tue, 13 Aug 2019 15:08:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7DF8DaA008289 for ; Tue, 13 Aug 2019 11:08:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4EE5C88F14; Tue, 13 Aug 2019 15:08:13 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id CC53B60BE2 for ; Tue, 13 Aug 2019 15:08:12 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 13 Aug 2019 17:08:06 +0200 Message-Id: <10244629fb7a2d9ad81aff7d9d15304a4769c0e9.1565708788.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/3] rpc: make virNetDaemonCallInhibit a no-op with no logind 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 13 Aug 2019 15:08:34 +0000 (UTC) As a side effect, this also silences the possible: internal error: Unable to get DBus system bus connection: Failed to connect to socket /run/dbus/system_bus_socket: No such file or directory error, since we check upfront whether dbus is available. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/libvirt_private.syms | 1 + src/rpc/virnetdaemon.c | 3 +++ src/util/virsystemd.c | 2 +- src/util/virsystemd.h | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 5940342087..ff4ddd1c5c 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3135,6 +3135,7 @@ virSystemdCanSuspend; virSystemdCreateMachine; virSystemdGetActivation; virSystemdGetMachineNameByPID; +virSystemdHasLogind; virSystemdHasLogindResetCachedValue; virSystemdHasMachinedResetCachedValue; virSystemdMakeScopeName; diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c index d098cf4ae9..7b68ddbdf2 100644 --- a/src/rpc/virnetdaemon.c +++ b/src/rpc/virnetdaemon.c @@ -508,6 +508,9 @@ virNetDaemonCallInhibit(virNetDaemonPtr dmn, VIR_DEBUG("dmn=3D%p what=3D%s who=3D%s why=3D%s mode=3D%s", dmn, NULLSTR(what), NULLSTR(who), NULLSTR(why), NULLSTR(mode= )); =20 + if (virSystemdHasLogind() < 0) + return; + if (!(systemBus =3D virDBusGetSystemBus())) return; =20 diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 66d0b7bd53..e75c5b835a 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -181,7 +181,7 @@ virSystemdHasMachined(void) return ret; } =20 -static int +int virSystemdHasLogind(void) { int ret; diff --git a/src/util/virsystemd.h b/src/util/virsystemd.h index 96626f8fff..5f1a4413fe 100644 --- a/src/util/virsystemd.h +++ b/src/util/virsystemd.h @@ -57,6 +57,8 @@ int virSystemdTerminateMachine(const char *name); =20 void virSystemdNotifyStartup(void); =20 +int virSystemdHasLogind(void); + int virSystemdCanSuspend(bool *result); =20 int virSystemdCanHibernate(bool *result); --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list