shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 06:50:22 +03:00
Code Releases Activity

virNetDevOpenvswitchGetVhostuserIfname: Drop cleanup label

Browse Source 
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2020-05-13 11:49:37 +02:00
parent c4408decbd
commit 9d190efc85
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/util/virnetdevopenvswitch.c
View File

@ -485,7 +485,6 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path,
{
const char *tmpIfname = NULL;
int status;
int ret = -1;
g_autoptr(virCommand) cmd = NULL;
/* Openvswitch vhostuser path are hardcoded to
@ -495,10 +494,8 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path,
* so we pick the filename and check it's a openvswitch interface
*/
if (!path ||
!(tmpIfname = strrchr(path, '/'))) {
ret = 0;
goto cleanup;
}
!(tmpIfname = strrchr(path, '/')))
return 0;
tmpIfname++;
cmd = virCommandNew(OVSVSCTL);
@ -507,15 +504,11 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path,
if (virCommandRun(cmd, &status) < 0 ||
status) {
/* it's not a openvswitch vhostuser interface. */
ret = 0;
goto cleanup;
return 0;
}
*ifname = g_strdup(tmpIfname);
ret = 1;
cleanup:
return ret;
return 1;
}
/**