External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-30 21:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

libvirt: lxc: fix incorrect parameter of lxcContainerMountProcFuse

Browse Source 
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>
This commit is contained in:
Gao feng 2013-01-09 19:01:11 +08:00 committed by Michal Privoznik
parent aedfcce33e
commit ae9874e471
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lxc/lxc_container.c
View File

@ -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