From: Gao feng <gaofeng@cn.fujitsu.com>
Date: Wed, 9 Jan 2013 11:01:11 +0000 (+0800)
Subject: libvirt: lxc: fix incorrect parameter of lxcContainerMountProcFuse
X-Git-Tag: v1.0.2-rc1~242
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae9874e471fc61d9d654247c2fd24d9baa455afa;p=thirdparty%2Flibvirt.git

libvirt: lxc: fix incorrect parameter of lxcContainerMountProcFuse

when we has no host's src mapped to container.
there is no .oldroot dir,so libvirt lxc will fail
to start when mouting meminfo.

in this case,the parameter srcprefix of function
lxcContainerMountProcFuse should be NULL.and make
this method handle NULL correctly.

Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
---

diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index d234426ff8..9f229238a6 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -605,7 +605,7 @@ static int lxcContainerMountProcFuse(virDomainDefPtr def,
 
     if ((ret = virAsprintf(&meminfo_path,
                            "%s/%s/%s/meminfo",
-                           srcprefix, LXC_STATE_DIR,
+                           srcprefix ? srcprefix : "", LXC_STATE_DIR,
                            def->name)) < 0)
         return ret;
 
@@ -2059,7 +2059,7 @@ static int lxcContainerSetupExtraMounts(virDomainDefPtr vmDef,
         goto cleanup;
 
     /* Mounts /proc/meminfo etc sysinfo */
-    if (lxcContainerMountProcFuse(vmDef, "/.oldroot") < 0)
+    if (lxcContainerMountProcFuse(vmDef, NULL) < 0)
         goto cleanup;
 
     /* Now we can re-mount the cgroups controllers in the