External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 21:55:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: use cleanup label consistently in virHostdevNetConfigReplace()

Browse Source 
This will make an upcoming functional change more straightforward.
This commit is contained in:
Laine Stump 2017-02-26 13:27:48 -05:00
parent 0a583c26f7
commit 19c5db749c
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/util/virhostdev.c
View File

@ -411,15 +411,14 @@ virHostdevNetConfigReplace(virDomainHostdevDefPtr hostdev,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Interface type hostdev is currently supported on"
" SR-IOV Virtual Functions only"));
return ret;
goto cleanup;
}
if (virHostdevNetDevice(hostdev, &linkdev, &vf) < 0)
return ret;
goto cleanup;
vlan = virDomainNetGetActualVlan(hostdev->parent.data.net);
virtPort = virDomainNetGetActualVirtPortProfile(
hostdev->parent.data.net);
virtPort = virDomainNetGetActualVirtPortProfile(hostdev->parent.data.net);
if (virtPort) {
if (vlan) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
@ -428,15 +427,21 @@ virHostdevNetConfigReplace(virDomainHostdevDefPtr hostdev,
virNetDevVPortTypeToString(virtPort->virtPortType));
goto cleanup;
}
ret = virHostdevNetConfigVirtPortProfile(linkdev, vf,
virtPort, &hostdev->parent.data.net->mac, uuid,
port_profile_associate);
if (virHostdevNetConfigVirtPortProfile(linkdev, vf, virtPort,
&hostdev->parent.data.net->mac,
uuid, port_profile_associate) < 0) {
goto cleanup;
}
} else {
/* Set only mac and vlan */
ret = virNetDevReplaceNetConfig(linkdev, vf,
&hostdev->parent.data.net->mac,
vlan, stateDir);
if (virNetDevReplaceNetConfig(linkdev, vf,
&hostdev->parent.data.net->mac,
vlan, stateDir) < 0) {
goto cleanup;
}
}
ret = 0;
cleanup:
VIR_FREE(linkdev);
return ret;