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

Split out most of virDBusIsServiceEnabled

Browse Source 
Introduce virDBusIsServiceInList which can be used to call other
methods for listing services (ListNames), not just ListActivatableNames.

No functional change, fixed the 'Retruns' typo.
This commit is contained in:
Ján Tomko 2014-03-03 16:16:08 +01:00
parent d7e0f1133e
commit 65a4cb03c7
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/util/virdbus.c
View File

@ -1256,13 +1256,7 @@ int virDBusMessageRead(DBusMessage *msg,
return ret;
}
/**
* virDBusIsServiceEnabled:
* @name: service name
*
* Retruns 0 if service is available, -1 on fatal error, or -2 if service is not available
*/
int virDBusIsServiceEnabled(const char *name)
static int virDBusIsServiceInList(const char *listMethod, const char *name)
{
DBusConnection *conn;
DBusMessage *reply = NULL;
@ -1280,7 +1274,7 @@ int virDBusIsServiceEnabled(const char *name)
"org.freedesktop.DBus",
"/org/freedesktop/DBus",
"org.freedesktop.DBus",
"ListActivatableNames",
listMethod,
NULL) < 0)
return ret;
@ -1305,13 +1299,25 @@ int virDBusIsServiceEnabled(const char *name)
}
}
VIR_DEBUG("Service %s is %s", name, ret ? "unavailable" : "available");
cleanup:
dbus_message_unref(reply);
return ret;
}
/**
* virDBusIsServiceEnabled:
* @name: service name
*
* Returns 0 if service is available, -1 on fatal error, or -2 if service is not available
*/
int virDBusIsServiceEnabled(const char *name)
{
int ret = virDBusIsServiceInList("ListActivatableNames", name);
VIR_DEBUG("Service %s is %s", name, ret ? "unavailable" : "available");
return ret;
}
#else /* ! WITH_DBUS */
void virDBusSetSharedBus(bool shared ATTRIBUTE_UNUSED)