External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 14:15:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix virsystemdtest without SYSTEMD_DAEMON

Browse Source 
Commit 4897698 fixed the build without dbus by only building
the virSystemdPMSupportTarget with SYSTEMD_DAEMON.

Introduce a virDBusMessageUnref wrapper for dbus_message_unref
to let virsystemd.c build without dbus, while still allowing
virsystemdtest to run without SYSTEM_DAEMON.
This commit is contained in:
Ján Tomko 2014-04-14 19:45:47 +02:00
parent 4897698110
commit 6077be466e
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/util/virdbus.c
View File

@ -1614,6 +1614,11 @@ int virDBusIsServiceRegistered(const char *name)
return ret;
}
void virDBusMessageUnref(DBusMessage *msg)
{
dbus_message_unref(msg);
}
#else /* ! WITH_DBUS */
void virDBusSetSharedBus(bool shared ATTRIBUTE_UNUSED)
{
@ -1751,4 +1756,8 @@ int virDBusIsServiceRegistered(const char *name ATTRIBUTE_UNUSED)
return -2;
}
void virDBusMessageUnref(DBusMessage *msg ATTRIBUTE_UNUSED)
{
/* nothing */
}
#endif /* ! WITH_DBUS */

1
src/util/virdbus.h
View File

@ -74,6 +74,7 @@ int virDBusCall(DBusConnection *conn,
DBusError *error);
int virDBusMessageRead(DBusMessage *msg,
const char *types, ...);
void virDBusMessageUnref(DBusMessage *msg);
int virDBusIsServiceEnabled(const char *name);
int virDBusIsServiceRegistered(const char *name);

11
src/util/virsystemd.c
View File

@ -326,7 +326,6 @@ virSystemdNotifyStartup(void)
#endif
}
#ifdef WITH_SYSTEMD_DAEMON
static int
virSystemdPMSupportTarget(const char *methodName, bool *result)
{
@ -365,19 +364,11 @@ virSystemdPMSupportTarget(const char *methodName, bool *result)
ret = 0;
cleanup:
dbus_message_unref(message);
virDBusMessageUnref(message);
VIR_FREE(response);
return ret;
}
#else /* ! WITH_SYSTEMD_DAEMON */
static int
virSystemdPMSupportTarget(const char *methodName ATTRIBUTE_UNUSED,
bool *result ATTRIBUTE_UNUSED)
{
return -2;
}
#endif /* ! WITH_SYSTEMD_DAEMON */
int virSystemdCanSuspend(bool *result)
{