Fix conditional check for DBus

The DBus conditional was renamed way back:

  commit da77f04ed5fa0731d50b947be8c739bdbf8121ad
  Author: Daniel P. Berrange <berrange@redhat.com>
  Date:   Thu Sep 20 15:05:39 2012 +0100

    Convert HAVE_DBUS to WITH_DBUS

but the shutdown inhibit code was not updated. Thus libvirt
was never inhibiting shutdown by a logged in user when VMs
are running.

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index db239f0d47e8e8710bdea501c79c782aa85d669d..a558458732bdb8175f34796c82d2c14391d86cb6 100644 (file)
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -795,7 +795,7 @@ static void daemonInhibitCallback(bool inhibit, void *opaque)
 }
 
 
-#ifdef HAVE_DBUS
+#ifdef WITH_DBUS
 static DBusConnection *sessionBus;
 static DBusConnection *systemBus;
 
@@ -887,7 +887,7 @@ static void daemonRunStateInit(void *opaque)
 
     driversInitialized = true;
 
-#ifdef HAVE_DBUS
+#ifdef WITH_DBUS
     /* Tie the non-privileged libvirtd to the session/shutdown lifecycle */
     if (!virNetDaemonIsPrivileged(dmn)) {
 

diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c
index fabacf20395dd5f6cdaa8fcd09c7e25059a09ca0..782417ef66f017bacbe490f48fbf47e3d03a36b8 100644 (file)
--- a/src/rpc/virnetdaemon.c
+++ b/src/rpc/virnetdaemon.c
@@ -437,7 +437,7 @@ virNetDaemonAutoShutdown(virNetDaemonPtr dmn,
 }
 
 
-#if defined(HAVE_DBUS) && defined(DBUS_TYPE_UNIX_FD)
+#if defined(WITH_DBUS) && defined(DBUS_TYPE_UNIX_FD)
 static void
 virNetDaemonGotInhibitReply(DBusPendingCall *pending,
                             void *opaque)
@@ -529,7 +529,7 @@ virNetDaemonAddShutdownInhibition(virNetDaemonPtr dmn)
 
     VIR_DEBUG("dmn=%p inhibitions=%zu", dmn, dmn->autoShutdownInhibitions);
 
-#if defined(HAVE_DBUS) && defined(DBUS_TYPE_UNIX_FD)
+#if defined(WITH_DBUS) && defined(DBUS_TYPE_UNIX_FD)
     if (dmn->autoShutdownInhibitions == 1)
         virNetDaemonCallInhibit(dmn,
                                 "shutdown",