提交 6077be46 编写于 作者: J Ján Tomko

Fix virsystemdtest without SYSTEMD_DAEMON

Commit 48976981 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.
上级 48976981
......@@ -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 */
......@@ -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);
......
......@@ -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)
{
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册