提交 ae9874e4 编写于 作者: G Gao feng 提交者: Michal Privoznik

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: NGao feng <gaofeng@cn.fujitsu.com>
上级 aedfcce3
......@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册