]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
lxc: Rename daemon to dmn
authorMartin Kletzander <mkletzan@redhat.com>
Tue, 16 Jun 2015 12:59:33 +0000 (14:59 +0200)
committerMartin Kletzander <mkletzan@redhat.com>
Tue, 16 Jun 2015 12:59:33 +0000 (14:59 +0200)
On older systems it shadows global declaration of daemon() function.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
src/lxc/lxc_controller.c

index 5f59867408a374c1d4ffefdda347b237454b2a71..828b8a8c0ee38c39df487e12b9658de5e1a06af4 100644 (file)
@@ -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) {