From: John Ferlan <jferlan@redhat.com>
Date: Mon, 9 Jun 2014 16:41:04 +0000 (-0400)
Subject: scsi_backend: Use existing LINUX_SYSFS_SCSI_HOST_PREFIX definition
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=aa9dac09b3efd3bed936c1a8c3a634d46cfe3739;p=libvirt.git

scsi_backend: Use existing LINUX_SYSFS_SCSI_HOST_PREFIX definition

Rather than supplying the path again in the formatting of the sysfs
scsi_host directory.
---

diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c
index f787c56861..cbf8ccc0cd 100644
--- a/src/storage/storage_backend_scsi.c
+++ b/src/storage/storage_backend_scsi.c
@@ -475,7 +475,8 @@ virStorageBackendSCSITriggerRescan(uint32_t host)
 
     VIR_DEBUG("Triggering rescan of host %d", host);
 
-    if (virAsprintf(&path, "/sys/class/scsi_host/host%u/scan", host) < 0) {
+    if (virAsprintf(&path, "%s/host%u/scan",
+                    LINUX_SYSFS_SCSI_HOST_PREFIX, host) < 0) {
         retval = -1;
         goto out;
     }
@@ -663,7 +664,8 @@ virStorageBackendSCSICheckPool(virConnectPtr conn ATTRIBUTE_UNUSED,
     if (getHostNumber(name, &host) < 0)
         goto cleanup;
 
-    if (virAsprintf(&path, "/sys/class/scsi_host/host%d", host) < 0)
+    if (virAsprintf(&path, "%s/host%d",
+                    LINUX_SYSFS_SCSI_HOST_PREFIX, host) < 0)
         goto cleanup;
 
     *isActive = virFileExists(path);