External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-11-10 07:20:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: Unify virSystemdHas{Machined,Logind}

Browse Source 
When checking for machined we do not really care whether systemd itself
is running, we just need machined to be either running or socket
activated by systemd. That is, exactly the same we do for logind.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Jiri Denemark 2024-01-25 12:38:00 +01:00
parent f2a5494fbd
commit 3869c2a281
1 changed files with 34 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/util/virsystemd.c
View File

@ -141,57 +141,35 @@ void virSystemdHasLogindResetCachedValue(void)
} }
/* -2 = machine1 is not supported on this machine /**
* -1 = error * virSystemdHasService:
* 0 = machine1 is available *
* Check whether a DBus @service is enabled and either the service itself is
* running or will be started on demand by a running systemd1 service.
*
* Returns
* -2 when service is not supported on this machine
* -1 on error
* 0 when service is available
*/ */
int static int
virSystemdHasMachined(void) virSystemdHasService(const char *service,
int *cached)
{ {
int ret; int ret;
int val; int val;
val = g_atomic_int_get(&virSystemdHasMachinedCachedValue); val = g_atomic_int_get(cached);
if (val != -1) if (val != -1)
return val; return val;
if ((ret = virGDBusIsServiceEnabled("org.freedesktop.machine1")) < 0) { if ((ret = virGDBusIsServiceEnabled(service)) < 0) {
if (ret == -2) if (ret == -2)
g_atomic_int_set(&virSystemdHasMachinedCachedValue, -2); g_atomic_int_set(cached, -2);
return ret; return ret;
} }
if ((ret = virGDBusIsServiceRegistered("org.freedesktop.systemd1")) == -1) if ((ret = virGDBusIsServiceRegistered(service)) == -1)
return ret;
g_atomic_int_set(&virSystemdHasMachinedCachedValue, ret);
return ret;
}
int
virSystemdHasLogind(void)
{
int ret;
int val;
val = g_atomic_int_get(&virSystemdHasLogindCachedValue);
if (val != -1)
return val;
ret = virGDBusIsServiceEnabled("org.freedesktop.login1");
if (ret < 0) {
if (ret == -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 = virGDBusIsServiceRegistered("org.freedesktop.login1")) == -1)
return ret; return ret;
if (ret == -2) { if (ret == -2) {
@ -199,11 +177,27 @@ virSystemdHasLogind(void)
return ret; return ret;
} }
g_atomic_int_set(&virSystemdHasLogindCachedValue, ret); g_atomic_int_set(cached, ret);
return ret; return ret;
} }
int
virSystemdHasMachined(void)
{
return virSystemdHasService("org.freedesktop.machine1",
&virSystemdHasMachinedCachedValue);
}
int
virSystemdHasLogind(void)
{
return virSystemdHasService("org.freedesktop.login1",
&virSystemdHasLogindCachedValue);
}
/** /**
* virSystemdGetMachineByPID: * virSystemdGetMachineByPID:
* @conn: dbus connection * @conn: dbus connection