[libvirt] [PATCH] lxc: Rename daemon to dmn

Martin Kletzander mkletzan at redhat.com
Tue Jun 16 13:02:59 UTC 2015


On older systems it shadows global declaration of daemon() function.

Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
---
Pushed as a build-breaker

 src/lxc/lxc_controller.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index 5f59867408a3..828b8a8c0ee3 100644
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -987,7 +987,7 @@ static bool wantReboot;
 static virMutex lock = VIR_MUTEX_INITIALIZER;


-static void virLXCControllerSignalChildIO(virNetDaemonPtr daemon,
+static void virLXCControllerSignalChildIO(virNetDaemonPtr dmn,
                                           siginfo_t *info ATTRIBUTE_UNUSED,
                                           void *opaque)
 {
@@ -998,7 +998,7 @@ static void virLXCControllerSignalChildIO(virNetDaemonPtr daemon,
     ret = waitpid(-1, &status, WNOHANG);
     VIR_DEBUG("Got sig child %d vs %lld", ret, (unsigned long long)ctrl->initpid);
     if (ret == ctrl->initpid) {
-        virNetDaemonQuit(daemon);
+        virNetDaemonQuit(dmn);
         virMutexLock(&lock);
         if (WIFSIGNALED(status) &&
             WTERMSIG(status) == SIGHUP) {
--
2.4.3




More information about the libvir-list mailing list