From: Osier Yang <jyang@redhat.com>
Date: Mon, 6 May 2013 12:45:16 +0000 (+0800)
Subject: util: Honor the passed sysfs_prefix
X-Git-Tag: CVE-2013-1962~79
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7ab719528ff70ec5c4dc6b1cab9c344f82eb623;p=thirdparty%2Flibvirt.git

util: Honor the passed sysfs_prefix

The helper works for default sysfs_prefix, but for user specified
prefix, it doesn't work. (Detected when writing test cases. A later
patch will add the test cases for fc_host).
---

diff --git a/src/util/virutil.c b/src/util/virutil.c
index 43682ad640..ab3c82f823 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -1938,7 +1938,8 @@ cleanup:
 /* virFindFCHostCapableVport:
  *
  * Iterate over the sysfs and find out the first online HBA which
- * supports vport, and not saturated,.
+ * supports vport, and not saturated. Returns the host name (e.g.
+ * host5) on success, or NULL on failure.
  */
 char *
 virFindFCHostCapableVport(const char *sysfs_prefix)
@@ -1972,10 +1973,10 @@ virFindFCHostCapableVport(const char *sysfs_prefix)
             continue;
         }
 
-        if (!virIsCapableVport(NULL, host))
+        if (!virIsCapableVport(prefix, host))
             continue;
 
-        if (virReadFCHost(NULL, host, "port_state", &state) < 0) {
+        if (virReadFCHost(prefix, host, "port_state", &state) < 0) {
              VIR_DEBUG("Failed to read port_state for host%d", host);
              continue;
         }
@@ -1987,12 +1988,12 @@ virFindFCHostCapableVport(const char *sysfs_prefix)
         }
         VIR_FREE(state);
 
-        if (virReadFCHost(NULL, host, "max_npiv_vports", &max_vports) < 0) {
+        if (virReadFCHost(prefix, 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) {
+        if (virReadFCHost(prefix, host, "npiv_vports_inuse", &vports) < 0) {
              VIR_DEBUG("Failed to read npiv_vports_inuse for host%d", host);
              VIR_FREE(max_vports);
              continue;