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

bhyve_device.c: remove unneeded cleanup labels

Browse Source 
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Daniel Henrique Barboza 2019-10-21 15:19:11 -03:00 committed by Ján Tomko
parent 10d6290f1c
commit 2f7d81497b
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/bhyve/bhyve_device.c
View File

@ -36,7 +36,6 @@ bhyveCollectPCIAddress(virDomainDefPtr def G_GNUC_UNUSED,
virDomainDeviceInfoPtr info,
void *opaque)
{
int ret = -1;
if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE)
return 0;
@ -56,12 +55,10 @@ bhyveCollectPCIAddress(virDomainDefPtr def G_GNUC_UNUSED,
if (virDomainPCIAddressReserveAddr(addrs, addr,
VIR_PCI_CONNECT_TYPE_PCI_DEVICE, 0) < 0) {
goto cleanup;
return -1;
}
ret = 0;
cleanup:
return ret;
return 0;
}
virDomainPCIAddressSetPtr
@ -169,13 +166,11 @@ int bhyveDomainAssignPCIAddresses(virDomainDefPtr def,
virDomainPCIAddressSetPtr addrs = NULL;
bhyveDomainObjPrivatePtr priv = NULL;
int ret = -1;
if (!(addrs = bhyveDomainPCIAddressSetCreate(def, 1)))
goto cleanup;
return -1;
if (bhyveAssignDevicePCISlots(def, addrs) < 0)
goto cleanup;
return -1;
if (obj && obj->privateData) {
priv = obj->privateData;
@ -188,10 +183,7 @@ int bhyveDomainAssignPCIAddresses(virDomainDefPtr def,
}
}
ret = 0;
cleanup:
return ret;
return 0;
}
int bhyveDomainAssignAddresses(virDomainDefPtr def, virDomainObjPtr obj)