External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-01 17:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

libxl: remove a now-unnecessary ret variable and cleanup: label.

Browse Source 
Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Laine Stump 2021-01-08 10:28:46 -05:00
parent 7f37110f2f
commit 05e73a8747
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/libxl/libxl_domain.c
View File

@ -1051,7 +1051,6 @@ libxlNetworkPrepareDevices(virDomainDefPtr def)
{
size_t i;
g_autoptr(virConnect) conn = NULL;
int ret = -1;
for (i = 0; i < def->nnets; i++) {
virDomainNetDefPtr net = def->nets[i];
@ -1063,9 +1062,9 @@ libxlNetworkPrepareDevices(virDomainDefPtr def)
*/
if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) {
if (!conn && !(conn = virGetConnectNetwork()))
goto cleanup;
return -1;
if (virDomainNetAllocateActualDevice(conn, def, net) < 0)
goto cleanup;
return -1;
}
/* final validation now that actual type is known */
@ -1090,13 +1089,11 @@ libxlNetworkPrepareDevices(virDomainDefPtr def)
pcisrc->backend = VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN;
if (virDomainHostdevInsert(def, hostdev) < 0)
goto cleanup;
return -1;
}
}
ret = 0;
cleanup:
return ret;
return 0;
}
static void