From: Daniel P. Berrange <berrange@redhat.com>
Date: Thu, 7 Mar 2013 18:49:45 +0000 (+0000)
Subject: Daemonize fuse thread in libvirt_lxc
X-Git-Tag: v1.0.4-rc1~111
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e31f32c6a3e028af3b3db2fcbb755a908b4a4b43;p=thirdparty%2Flibvirt.git

Daemonize fuse thread in libvirt_lxc

In some startup failure modes, the fuse thread may get itself
wedged. This will cause the entire libvirt_lxc process to
hang trying to the join the thread. There is no compelling
reason to wait for the thread to exit if the whole process
is exiting, so just daemonize the fuse thread instead.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c
index b6808da86b..c4be58ebdd 100644
--- a/src/lxc/lxc_fuse.c
+++ b/src/lxc/lxc_fuse.c
@@ -320,7 +320,7 @@ int lxcSetupFuse(virLXCFusePtr *f, virDomainDefPtr def)
         goto cleanup1;
     }
 
-    if (virThreadCreate(&fuse->thread, true, lxcFuseRun,
+    if (virThreadCreate(&fuse->thread, false, lxcFuseRun,
                         (void *)fuse) < 0) {
         lxcFuseDestroy(fuse);
         goto cleanup1;
@@ -351,8 +351,6 @@ void lxcFreeFuse(virLXCFusePtr *f)
             fuse_exit(fuse->fuse);
         virMutexUnlock(&fuse->lock);
 
-        virThreadJoin(&fuse->thread);
-
         VIR_FREE(fuse->mountpoint);
         VIR_FREE(*f);
     }