From nobody Fri Oct 18 04:20:23 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1706821557997784.3185452405161; Thu, 1 Feb 2024 13:05:57 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id E1A811D10; Thu, 1 Feb 2024 16:05:56 -0500 (EST) Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 0F9C71D66; Thu, 1 Feb 2024 16:03:46 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id E2F101D48; Thu, 1 Feb 2024 16:03:34 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 40C7A1D0D for ; Thu, 1 Feb 2024 16:03:03 -0500 (EST) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-479-bDylM7-3OIez5On0_GAgvw-1; Thu, 01 Feb 2024 16:03:01 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3FC6C28B6ABC for ; Thu, 1 Feb 2024 21:03:00 +0000 (UTC) Received: from orkuz (unknown [10.45.226.109]) by smtp.corp.redhat.com (Postfix) with ESMTP id 00C9EC259DD for ; Thu, 1 Feb 2024 21:02:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: bDylM7-3OIez5On0_GAgvw-1 From: Jiri Denemark To: devel@lists.libvirt.org Subject: [libvirt PATCH 1/7] util: Refactor virSystemdHas{Machined,Logind} Date: Thu, 1 Feb 2024 22:02:43 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: LVDEZCRESL4JKD4WWK2UQS2PXGUR2T44 X-Message-ID-Hash: LVDEZCRESL4JKD4WWK2UQS2PXGUR2T44 X-MailFrom: jdenemar@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1706821559300100001 To reduce code duplication both function now use a common virSystemdHasService helper. Signed-off-by: Jiri Denemark --- src/util/virsystemd.c | 76 ++++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 40 deletions(-) diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index cd4de0eef8..21892aca02 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -141,66 +141,62 @@ void virSystemdHasLogindResetCachedValue(void) } =20 =20 -/* -2 =3D machine1 is not supported on this machine - * -1 =3D error - * 0 =3D machine1 is available +/** + * virSystemdHasService: + * + * Check whether a DBus @service is enabled and either the service itself = or + * systemd1 service is registered. If @requireSystemd =3D=3D true, the sys= temd1 + * service has to be registered even if @service is registered. + * + * Returns + * -2 when service is not supported on this machine + * -1 on error + * 0 when service is available */ -int -virSystemdHasMachined(void) +static int +virSystemdHasService(const char *service, + bool requireSystemd, + int *cached) { int ret; int val; =20 - val =3D g_atomic_int_get(&virSystemdHasMachinedCachedValue); + val =3D g_atomic_int_get(cached); if (val !=3D -1) return val; =20 - if ((ret =3D virGDBusIsServiceEnabled("org.freedesktop.machine1")) < 0= ) { + if ((ret =3D virGDBusIsServiceEnabled(service)) < 0) { if (ret =3D=3D -2) - g_atomic_int_set(&virSystemdHasMachinedCachedValue, -2); + g_atomic_int_set(cached, -2); return ret; } =20 - if ((ret =3D virGDBusIsServiceRegistered("org.freedesktop.systemd1")) = =3D=3D -1) + if ((ret =3D virGDBusIsServiceRegistered(service)) =3D=3D -1) return ret; - g_atomic_int_set(&virSystemdHasMachinedCachedValue, ret); + + if (requireSystemd || ret =3D=3D -2) { + if ((ret =3D virGDBusIsServiceRegistered("org.freedesktop.systemd1= ")) =3D=3D -1) + return ret; + } + + g_atomic_int_set(cached, ret); return ret; } =20 + int -virSystemdHasLogind(void) +virSystemdHasMachined(void) { - int ret; - int val; - - val =3D g_atomic_int_get(&virSystemdHasLogindCachedValue); - if (val !=3D -1) - return val; - - ret =3D virGDBusIsServiceEnabled("org.freedesktop.login1"); - if (ret < 0) { - if (ret =3D=3D -2) - g_atomic_int_set(&virSystemdHasLogindCachedValue, -2); - return ret; - } - - /* - * Want to use logind if: - * - logind is already running - * Or - * - logind is not running, but this is a systemd host - * (rely on dbus activation) - */ - if ((ret =3D virGDBusIsServiceRegistered("org.freedesktop.login1")) = =3D=3D -1) - return ret; + return virSystemdHasService("org.freedesktop.machine1", true, + &virSystemdHasMachinedCachedValue); +} =20 - if (ret =3D=3D -2) { - if ((ret =3D virGDBusIsServiceRegistered("org.freedesktop.systemd1= ")) =3D=3D -1) - return ret; - } =20 - g_atomic_int_set(&virSystemdHasLogindCachedValue, ret); - return ret; +int +virSystemdHasLogind(void) +{ + return virSystemdHasService("org.freedesktop.login1", false, + &virSystemdHasLogindCachedValue); } =20 =20 --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org