External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 12:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

lxcContainerMountFSDevPTS: Unify @ret usage pattern

Browse Source 
Currently, if virFileMakePath() fails, the @ret is left initialized from
virAsprintf() just a few lines above leading to a wrong return value of
zero whereas -1 should be returned.

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Chen Hanxiao 2013-12-06 14:20:21 +08:00 committed by Michal Privoznik
parent 036aeca721
commit 78d04e556a
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lxc/lxc_container.c
View File

@ -940,16 +940,14 @@ cleanup:
static int lxcContainerMountFSDevPTS(virDomainDefPtr def,
const char *stateDir)
{
int ret;
int ret = -1;
char *path = NULL;
int flags = def->idmap.nuidmap ? MS_BIND : MS_MOVE;
VIR_DEBUG("Mount /dev/pts stateDir=%s", stateDir);
if ((ret = virAsprintf(&path,
"/.oldroot/%s/%s.devpts",
stateDir,
def->name)) < 0)
if (virAsprintf(&path, "/.oldroot/%s/%s.devpts",
stateDir, def->name) < 0)
return ret;
if (virFileMakePath("/dev/pts") < 0) {
@ -961,16 +959,16 @@ static int lxcContainerMountFSDevPTS(virDomainDefPtr def,
VIR_DEBUG("Trying to %s %s to /dev/pts", def->idmap.nuidmap ?
"bind" : "move", path);
if ((ret = mount(path, "/dev/pts", NULL, flags, NULL)) < 0) {
if (mount(path, "/dev/pts", NULL, flags, NULL) < 0) {
virReportSystemError(errno,
_("Failed to mount %s on /dev/pts"),
path);
goto cleanup;
}
ret = 0;
cleanup:
VIR_FREE(path);
return ret;
}