iscsi: Remove initiatoriqn from virISCSIScanTargets

No longer necessary to have it, so remove it.

diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c
index 9e2d01e457fb16a2eac6bf42e133e7498fdbe6d2..bccfba3fda5d31d84435bedbd549fc56e6e35432 100644 (file)
--- a/src/storage/storage_backend_iscsi.c
+++ b/src/storage/storage_backend_iscsi.c
@@ -197,9 +197,7 @@ virStorageBackendISCSIFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSED,
     if (!(portal = virStorageBackendISCSIPortal(source)))
         goto cleanup;
 
-    if (virISCSIScanTargets(portal,
-                            source->initiator.iqn,
-                            &ntargets, &targets) < 0)
+    if (virISCSIScanTargets(portal, &ntargets, &targets) < 0)
         goto cleanup;
 
     if (VIR_ALLOC_N(list.sources, ntargets) < 0)
@@ -399,9 +397,7 @@ virStorageBackendISCSIStartPool(virConnectPtr conn,
          * iscsiadm doesn't let you login to a target, unless you've
          * first issued a 'sendtargets' command to the portal :-(
          */
-        if (virISCSIScanTargets(portal,
-                                pool->def->source.initiator.iqn,
-                                NULL, NULL) < 0)
+        if (virISCSIScanTargets(portal, NULL, NULL) < 0)
             goto cleanup;
 
         if (virStorageBackendISCSISetAuth(portal, conn, &pool->def->source) < 0)

diff --git a/src/util/viriscsi.c b/src/util/viriscsi.c
index f4e32540eb68f4b5f183f8248b0f8c7f230e8eaa..e705517a7d0252ecf96beea977d41f5537b2f6aa 100644 (file)
--- a/src/util/viriscsi.c
+++ b/src/util/viriscsi.c
@@ -307,7 +307,7 @@ virISCSIConnection(const char *portal,
              * portal. Without the sendtargets all that is received is a
              * "iscsiadm: No records found"
              */
-            if (virISCSIScanTargets(portal, initiatoriqn, NULL, NULL) < 0)
+            if (virISCSIScanTargets(portal, NULL, NULL) < 0)
                 goto cleanup;
 
             break;
@@ -392,7 +392,6 @@ virISCSIGetTargets(char **const groups,
 
 int
 virISCSIScanTargets(const char *portal,
-                    const char *initiatoriqn ATTRIBUTE_UNUSED,
                     size_t *ntargetsret,
                     char ***targetsret)
 {

diff --git a/src/util/viriscsi.h b/src/util/viriscsi.h
index f4093f7165e14be98f2533bc90377ffb4535a10d..459249ee60c93d1922f0a8edb1c1623129766ca9 100644 (file)
--- a/src/util/viriscsi.h
+++ b/src/util/viriscsi.h
@@ -49,7 +49,6 @@ virISCSIRescanLUNs(const char *session)
 
 int
 virISCSIScanTargets(const char *portal,
-                    const char *initiatoriqn,
                     size_t *ntargetsret,
                     char ***targetsret)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK;

diff --git a/tests/viriscsitest.c b/tests/viriscsitest.c
index b5b0e203ed5c1a35ff247f47abae8077507b3c95..40e4d101ff7b385d5cb947cf5f4d4548d2deaf50 100644 (file)
--- a/tests/viriscsitest.c
+++ b/tests/viriscsitest.c
@@ -145,8 +145,7 @@ testISCSIScanTargets(const void *data)
 
     virCommandSetDryRun(NULL, testIscsiadmCb, NULL);
 
-    if (virISCSIScanTargets(info->portal, NULL,
-                            &ntargets, &targets) < 0)
+    if (virISCSIScanTargets(info->portal, &ntargets, &targets) < 0)
         goto cleanup;
 
     if (info->nexpected != ntargets) {