提交 8d854e5b 编写于 作者: J John Ferlan

getAdapterName: check for SCSI_HOST

Rather than assume that NOT FC_HOST is SCSI_HOST, let's call them out
specifically. Makes it easier to find SCSI_HOST code/structs and ensures
something isn't missed in the future
上级 b325be12
...@@ -547,18 +547,17 @@ getAdapterName(virStoragePoolSourceAdapter adapter) ...@@ -547,18 +547,17 @@ getAdapterName(virStoragePoolSourceAdapter adapter)
{ {
char *name = NULL; char *name = NULL;
if (adapter.type != VIR_STORAGE_POOL_SOURCE_ADAPTER_TYPE_FC_HOST) { if (adapter.type == VIR_STORAGE_POOL_SOURCE_ADAPTER_TYPE_SCSI_HOST) {
ignore_value(VIR_STRDUP(name, adapter.data.name)); ignore_value(VIR_STRDUP(name, adapter.data.name));
return name; } else if (adapter.type == VIR_STORAGE_POOL_SOURCE_ADAPTER_TYPE_FC_HOST) {
} if (!(name = virGetFCHostNameByWWN(NULL,
adapter.data.fchost.wwnn,
if (!(name = virGetFCHostNameByWWN(NULL, adapter.data.fchost.wwpn))) {
adapter.data.fchost.wwnn, virReportError(VIR_ERR_XML_ERROR,
adapter.data.fchost.wwpn))) { _("Failed to find SCSI host with wwnn='%s', "
virReportError(VIR_ERR_XML_ERROR, "wwpn='%s'"), adapter.data.fchost.wwnn,
_("Failed to find SCSI host with wwnn='%s', " adapter.data.fchost.wwpn);
"wwpn='%s'"), adapter.data.fchost.wwnn, }
adapter.data.fchost.wwpn);
} }
return name; return name;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册