External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 15:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

lxc: Fix error handlings in lxcContainerRenameAndEnableInterfaces

Browse Source 
The function is expected to return negative value on failure,
however, it returns positive value when either setInterfaceName
or vethInterfaceUpOrDown fails. Because the function returns
the return value of either as is, however, the two functions
may return positive value on failure.

The patch fixes the defects and add error messages.
This commit is contained in:
Ryota Ozaki 2010-06-27 05:59:59 +09:00 committed by Eric Blake
parent b3a96d9049
commit df8225ac54
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/lxc/lxc_container.c
View File

@ -255,13 +255,20 @@ static int lxcContainerRenameAndEnableInterfaces(unsigned int nveths,
DEBUG("Renaming %s to %s", veths[i], newname);
rc = setInterfaceName(veths[i], newname);
if (0 != rc)
if (0 != rc) {
VIR_ERROR(_("Failed to rename %s to %s (%d)"),
veths[i], newname, rc);
rc = -1;
goto error_out;
}
DEBUG("Enabling %s", newname);
rc = vethInterfaceUpOrDown(newname, 1);
if (0 != rc)
rc = vethInterfaceUpOrDown(newname, 1);
if (0 != rc) {
VIR_ERROR(_("Failed to enable %s (%d)"), newname, rc);
rc = -1;
goto error_out;
}
VIR_FREE(newname);
}