Misc daemon fixes (John Levon)

diff --git a/ChangeLog b/ChangeLog
index ebad9268c21ae9cfa20ee628c0628c2851942a24..0af52424879799f4a40c27ef8ad09159a3ae198a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Dec 18 11:50:58 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
+
+       Misc daemon bug fixes (John Levon)
+       * qemud/qemud.c: Fix conditional for node devices
+       * qemud/remote.c: Remove unneccessary path.h include
+
 Thu Dec 18 07:47:58 +0100 2008 Jim Meyering <meyering@redhat.com>
 
        docs/virsh.pod: typo fix

diff --git a/qemud/qemud.c b/qemud/qemud.c
index ed9c594a36cf07b93636f92c9b9bf58de2a3bca0..5dcb1e0a191bfe5028c6f2b05d9a0744436e0b18 100644 (file)
--- a/qemud/qemud.c
+++ b/qemud/qemud.c
@@ -28,7 +28,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <paths.h>
 #include <limits.h>
 #include <sys/socket.h>
 #include <sys/un.h>
@@ -801,7 +800,8 @@ static struct qemud_server *qemudInitialize(int sigread) {
 #ifdef WITH_STORAGE_DIR
     storageRegister();
 #endif
-#if defined(HAVE_HAL) || defined(HAVE_DEVKIT)
+#if defined(WITH_NODE_DEVICES) && \
+    (defined(HAVE_HAL) || defined(HAVE_DEVKIT))
     nodedevRegister();
 #endif
 #ifdef WITH_QEMU

diff --git a/qemud/remote.c b/qemud/remote.c
index 0488e6cf0f0caf0d3c991154625772bf914e9c31..ab083a6edbee5bbf0de2ac0057d342c669f495ba 100644 (file)
--- a/qemud/remote.c
+++ b/qemud/remote.c
@@ -27,7 +27,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <paths.h>
 #include <limits.h>
 #include <sys/socket.h>
 #include <sys/un.h>