storage: Guess the parent if it's not specified for vHBA

This finds the parent for vHBA by iterating over all the HBA
which supports vport_ops capability on the host, and return
the first one which is online, not saturated (vports in use
is less than max_vports).

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index cd4eb927e229965749c6e94c33ba1bb2b9287e32..786d25a98ab179c85ca41f75a618bc48aa6d0b50 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1852,6 +1852,7 @@ virFileStripSuffix;
 virFileUnlock;
 virFileWaitForDevices;
 virFileWriteStr;
+virFindFCHostCapableVport;
 virFindFileInPath;
 virFormatIntDecimal;
 virGetDeviceID;

diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c
index d72c1533548e7c075f2ae23dc945cf9ba8c14d3c..987d218509b6d2839d5e50e06d6b35fb2ec4ad94 100644 (file)
--- a/src/storage/storage_backend_scsi.c
+++ b/src/storage/storage_backend_scsi.c
@@ -660,10 +660,12 @@ createVport(virStoragePoolSourceAdapter adapter)
         return 0;
     }
 
-    if (!adapter.data.fchost.parent) {
-        virReportError(VIR_ERR_XML_ERROR, "%s",
-                       _("'parent' for vHBA must be specified"));
-        return -1;
+    if (!adapter.data.fchost.parent &&
+        !(adapter.data.fchost.parent = virFindFCHostCapableVport(NULL))) {
+         virReportError(VIR_ERR_XML_ERROR, "%s",
+                       _("'parent' for vHBA not specified, and "
+                         "cannot find one on this host"));
+         return -1;
     }
 
     if (getHostNumber(adapter.data.fchost.parent, &parent_host) < 0)

diff --git a/src/util/virutil.c b/src/util/virutil.c
index 46f17456b2c4487458005e312a752f6fbabb0931..0e4063b2a70eb31aac6a582b69a3e5475d849c9a 100644 (file)
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -3670,6 +3670,92 @@ cleanup:
     VIR_FREE(wwpn_buf);
     return ret;
 }
+
+# define PORT_STATE_ONLINE "Online"
+
+/* virFindFCHostCapableVport:
+ *
+ * Iterate over the sysfs and find out the first online HBA which
+ * supports vport, and not saturated,.
+ */
+char *
+virFindFCHostCapableVport(const char *sysfs_prefix)
+{
+    const char *prefix = sysfs_prefix ? sysfs_prefix : SYSFS_FC_HOST_PATH;
+    DIR *dir = NULL;
+    struct dirent *entry = NULL;
+    char *max_vports = NULL;
+    char *vports = NULL;
+    char *state = NULL;
+    char *ret = NULL;
+
+    if (!(dir = opendir(prefix))) {
+        virReportSystemError(errno,
+                             _("Failed to opendir path '%s'"),
+                             prefix);
+        return NULL;
+    }
+
+    while ((entry = readdir(dir))) {
+        unsigned int host;
+        char *p = NULL;
+
+        if (entry->d_name[0] == '.')
+            continue;
+
+        p = entry->d_name + strlen("host");
+        if (virStrToLong_ui(p, NULL, 10, &host) == -1) {
+            VIR_DEBUG("Failed to parse host number from '%s'",
+                      entry->d_name);
+            continue;
+        }
+
+        if (!virIsCapableVport(NULL, host))
+            continue;
+
+        if (virReadFCHost(NULL, host, "port_state", &state) < 0) {
+             VIR_DEBUG("Failed to read port_state for host%d", host);
+             continue;
+        }
+
+        /* Skip the not online FC host */
+        if (STRNEQ(state, PORT_STATE_ONLINE)) {
+            VIR_FREE(state);
+            continue;
+        }
+        VIR_FREE(state);
+
+        if (virReadFCHost(NULL, host, "max_npiv_vports", &max_vports) < 0) {
+             VIR_DEBUG("Failed to read max_npiv_vports for host%d", host);
+             continue;
+        }
+
+        if (virReadFCHost(NULL, host, "npiv_vports_inuse", &vports) < 0) {
+             VIR_DEBUG("Failed to read npiv_vports_inuse for host%d", host);
+             VIR_FREE(max_vports);
+             continue;
+        }
+
+        /* Compare from the strings directly, instead of converting
+         * the strings to integers first
+         */
+        if ((strlen(max_vports) >= strlen(vports)) ||
+            ((strlen(max_vports) == strlen(vports)) &&
+             strcmp(max_vports, vports) > 0)) {
+            ret = strdup(entry->d_name);
+            goto cleanup;
+        }
+
+        VIR_FREE(max_vports);
+        VIR_FREE(vports);
+    }
+
+cleanup:
+    closedir(dir);
+    VIR_FREE(max_vports);
+    VIR_FREE(vports);
+    return ret;
+}
 #else
 int
 virReadFCHost(const char *sysfs_prefix ATTRIBUTE_UNUSED,
@@ -3716,4 +3802,11 @@ virGetFCHostNameByWWN(const char *sysfs_prefix ATTRIBUTE_UNUSED,
     return NULL;
 }
 
+char *
+virFindFCHostCapableVport(const char *sysfs_prefix ATTRIBUTE_UNUSED)
+{
+    virReportSystemError(ENOSYS, "%s", _("Not supported on this platform"));
+    return NULL;
+}
+
 #endif /* __linux__ */

diff --git a/src/util/virutil.h b/src/util/virutil.h
index 2aa4f2c7a5c296cc3e0f5d97646aaa84ddee6e35..7b37d65cff18f997fcc10c152d1be9862ba2d272 100644 (file)
--- a/src/util/virutil.h
+++ b/src/util/virutil.h
@@ -322,4 +322,6 @@ char *virGetFCHostNameByWWN(const char *sysfs_prefix,
                             const char *wwpn)
     ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
 
+char *virFindFCHostCapableVport(const char *sysfs_prefix);
+
 #endif /* __VIR_UTIL_H__ */