External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-28 03:21:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: midonet: use g_auto for virCommand

Browse Source 
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Ján Tomko 2022-01-17 18:02:28 +01:00
parent a269fae099
commit aa9cd08d92
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/util/virnetdevmidonet.c
View File

@ -39,8 +39,7 @@ int
virNetDevMidonetBindPort(const char *ifname, virNetDevMidonetBindPort(const char *ifname,
const virNetDevVPortProfile *virtualport) const virNetDevVPortProfile *virtualport)
{ {
int ret = -1; g_autoptr(virCommand) cmd = NULL;
virCommand *cmd = NULL;
char virtportuuid[VIR_UUID_STRING_BUFLEN]; char virtportuuid[VIR_UUID_STRING_BUFLEN];
virUUIDFormat(virtualport->interfaceID, virtportuuid); virUUIDFormat(virtualport->interfaceID, virtportuuid);
@ -53,13 +52,10 @@ virNetDevMidonetBindPort(const char *ifname,
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Unable to bind port %s to the virtual port %s"), _("Unable to bind port %s to the virtual port %s"),
ifname, virtportuuid); ifname, virtportuuid);
goto cleanup; return -1;
} }
ret = 0; return 0;
cleanup:
virCommandFree(cmd);
return ret;
} }
/** /**
@ -73,8 +69,7 @@ virNetDevMidonetBindPort(const char *ifname,
int int
virNetDevMidonetUnbindPort(const virNetDevVPortProfile *virtualport) virNetDevMidonetUnbindPort(const virNetDevVPortProfile *virtualport)
{ {
int ret = -1; g_autoptr(virCommand) cmd = NULL;
virCommand *cmd = NULL;
char virtportuuid[VIR_UUID_STRING_BUFLEN]; char virtportuuid[VIR_UUID_STRING_BUFLEN];
virUUIDFormat(virtualport->interfaceID, virtportuuid); virUUIDFormat(virtualport->interfaceID, virtportuuid);
@ -86,11 +81,8 @@ virNetDevMidonetUnbindPort(const virNetDevVPortProfile *virtualport)
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Unable to unbind the virtual port %s from Midonet"), _("Unable to unbind the virtual port %s from Midonet"),
virtportuuid); virtportuuid);
goto cleanup; return -1;
} }
ret = 0; return 0;
cleanup:
virCommandFree(cmd);
return ret;
} }