Fix virsystemdtest without SYSTEMD_DAEMON

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.

diff --git a/src/util/virdbus.c b/src/util/virdbus.c
index 0cd38587f89318c6093a6fb9348cf880f834e591..4217aea0a930d5856122059184694f674657620c 100644 (file)
--- a/src/util/virdbus.c
+++ b/src/util/virdbus.c
@@ -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 */

diff --git a/src/util/virdbus.h b/src/util/virdbus.h
index 0f2182180fb4d73b549b3f26d92dd2707870760d..a4987b8adc1e13b5a9375fa90449665de57ba0b1 100644 (file)
--- a/src/util/virdbus.h
+++ b/src/util/virdbus.h
@@ -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);

diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c
index e67956ff9fa5f119387e165481862aa4867188ad..ad15a1814a82dc680004f1d8770cedb455ab5fd6 100644 (file)
--- a/src/util/virsystemd.c
+++ b/src/util/virsystemd.c
@@ -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)
 {