From: John Ferlan <jferlan@redhat.com>
Date: Mon, 3 Mar 2014 19:57:50 +0000 (-0500)
Subject: getAdapterName: check for SCSI_HOST
X-Git-Tag: v1.2.7-rc1~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d854e5b5bb1039525db3644cf9c0e78a4bb4c19;p=thirdparty%2Flibvirt.git

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
---

diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c
index dfb663b75e..1ef75d9448 100644
--- a/src/storage/storage_backend_scsi.c
+++ b/src/storage/storage_backend_scsi.c
@@ -547,18 +547,17 @@ getAdapterName(virStoragePoolSourceAdapter adapter)
 {
     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));
-        return name;
-    }
-
-    if (!(name = virGetFCHostNameByWWN(NULL,
-                                       adapter.data.fchost.wwnn,
-                                       adapter.data.fchost.wwpn))) {
-        virReportError(VIR_ERR_XML_ERROR,
-                       _("Failed to find SCSI host with wwnn='%s', "
-                         "wwpn='%s'"), adapter.data.fchost.wwnn,
-                       adapter.data.fchost.wwpn);
+    } else if (adapter.type == VIR_STORAGE_POOL_SOURCE_ADAPTER_TYPE_FC_HOST) {
+        if (!(name = virGetFCHostNameByWWN(NULL,
+                                           adapter.data.fchost.wwnn,
+                                           adapter.data.fchost.wwpn))) {
+            virReportError(VIR_ERR_XML_ERROR,
+                           _("Failed to find SCSI host with wwnn='%s', "
+                             "wwpn='%s'"), adapter.data.fchost.wwnn,
+                           adapter.data.fchost.wwpn);
+        }
     }
 
     return name;