From: Ján Tomko <jtomko@redhat.com>
Date: Wed, 12 Jun 2013 08:30:13 +0000 (+0200)
Subject: nodedev: fix vport detection for FC HBA
X-Git-Tag: v1.0.5.3~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e0b15f2f0bd56832249822d0961a8e03e7bb1a3;p=thirdparty%2Flibvirt.git

nodedev: fix vport detection for FC HBA

Use the host number as the host number when constructing the sysfs path
instead of the variable we are trying to fill.

https://bugzilla.redhat.com/show_bug.cgi?id=973543
(cherry picked from commit 371c15517c919e9d7d2ea3f66e490bd49b6db384)
---

diff --git a/src/node_device/node_device_linux_sysfs.c b/src/node_device/node_device_linux_sysfs.c
index 0c84619364..9f57f55a82 100644
--- a/src/node_device/node_device_linux_sysfs.c
+++ b/src/node_device/node_device_linux_sysfs.c
@@ -79,7 +79,7 @@ detect_scsi_host_caps(union _virNodeDevCapData *d)
         d->scsi_host.flags |= VIR_NODE_DEV_CAP_FLAG_HBA_VPORT_OPS;
 
         if (virReadFCHost(NULL,
-                          d->scsi_host.max_vports,
+                          d->scsi_host.host,
                           "max_npiv_vports",
                           &max_vports) < 0) {
             VIR_ERROR(_("Failed to read max_npiv_vports for host%d"),
@@ -88,7 +88,7 @@ detect_scsi_host_caps(union _virNodeDevCapData *d)
         }
 
          if (virReadFCHost(NULL,
-                          d->scsi_host.max_vports,
+                          d->scsi_host.host,
                           "npiv_vports_inuse",
                           &vports) < 0) {
             VIR_ERROR(_("Failed to read npiv_vports_inuse for host%d"),