From: Eric Blake <eblake@redhat.com>
Date: Tue, 4 Dec 2012 22:45:11 +0000 (-0700)
Subject: rpc: fix build failure with older dbus
X-Git-Tag: v1.0.1-rc1~86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2215befc8bc3853bec53a3c61aeacb215b5353c5;p=thirdparty%2Flibvirt.git

rpc: fix build failure with older dbus

RHEL 6.3 uses dbus-devel-1.2.24, which lacked support for the
DBUS_TYPE_UNIX_FD define (contrast with Fedora 18 using 1.6.8).
But since it is an older dbus, it also lacks support for shutdown
inhibitions as provided by newer systemd.

Compilation failure introduced in commit 31330926.

* src/rpc/virnetserver.c (virNetServerAddShutdownInhibition):
Compile out if dbus is too old.
---

diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
index ae1dfa2027..6a5a53ac25 100644
--- a/src/rpc/virnetserver.c
+++ b/src/rpc/virnetserver.c
@@ -720,7 +720,7 @@ void virNetServerAutoShutdown(virNetServerPtr srv,
 }
 
 
-#ifdef HAVE_DBUS
+#if defined(HAVE_DBUS) && defined(DBUS_TYPE_UNIX_FD)
 static void virNetServerGotInhibitReply(DBusPendingCall *pending,
                                         void *opaque)
 {
@@ -809,7 +809,7 @@ void virNetServerAddShutdownInhibition(virNetServerPtr srv)
 
     VIR_DEBUG("srv=%p inhibitions=%zu", srv, srv->autoShutdownInhibitions);
 
-#ifdef HAVE_DBUS
+#if defined(HAVE_DBUS) && defined(DBUS_TYPE_UNIX_FD)
     if (srv->autoShutdownInhibitions == 1)
         virNetServerCallInhibit(srv,
                                 "shutdown",