External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 07:59:00 +00:00
Code

scsi: Converge more createVport checks

Browse Source 
Remove duplicated code - make one simple path through

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2017-01-03 17:00:36 -05:00
parent 476ecf2a2a
commit 9fdc8c4269
1 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/storage/storage_backend_scsi.c
View File

@ -722,39 +722,34 @@ createVport(virConnectPtr conn,
goto cleanup;
}
/* If a parent was provided, then let's make sure it's vhost capable */
if (adapter->data.fchost.parent) {
if (virGetSCSIHostNumber(adapter->data.fchost.parent, &parent_host) < 0)
if (VIR_STRDUP(parent_hoststr, adapter->data.fchost.parent) < 0)
goto cleanup;
if (!virIsCapableFCHost(NULL, parent_host)) {
virReportError(VIR_ERR_XML_ERROR,
_("parent '%s' specified for vHBA "
"is not vport capable"),
adapter->data.fchost.parent);
goto cleanup;
}
}
if (!adapter->data.fchost.parent) {
} else {
if (!(parent_hoststr = virFindFCHostCapableVport(NULL))) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("'parent' for vHBA not specified, and "
"cannot find one on this host"));
goto cleanup;
}
}
if (virGetSCSIHostNumber(parent_hoststr, &parent_host) < 0)
goto cleanup;
if (virGetSCSIHostNumber(parent_hoststr, &parent_host) < 0)
goto cleanup;
/* NOTE:
* We do not save the parent_hoststr in adapter->data.fchost.parent
* since we could be writing out the 'def' to the saved XML config.
* If we wrote out the name in the XML, then future starts would
* always use the same parent rather than finding the "best available"
* parent. Besides we have a way to determine the parent based on
* the 'name' field.
*/
/* NOTE:
* We do not save the parent_hoststr in adapter->data.fchost.parent
* since we could be writing out the 'def' to the saved XML config.
* If we wrote out the name in the XML, then future starts would
* always use the same parent rather than finding the "best available"
* parent. Besides we have a way to determine the parent based on
* the 'name' field.
*/
if (adapter->data.fchost.parent && !virIsCapableFCHost(NULL, parent_host)) {
virReportError(VIR_ERR_XML_ERROR,
_("parent '%s' specified for vHBA is not vport capable"),
parent_hoststr);
goto cleanup;
}
/* Since we're creating the vHBA, then we need to manage removing it