diff options
| author | John Ferlan <jferlan@redhat.com> | 2016-05-13 11:38:45 -0400 |
|---|---|---|
| committer | John Ferlan <jferlan@redhat.com> | 2016-05-18 08:29:24 -0400 |
| commit | 027986f5bff0d89375e94e1344074f82eed27d7b (patch) | |
| tree | e25bfe675d7429d1070c901053e517408a9582de /src | |
| parent | 56057900dc53df490d953d56de1195ebfa025bdd (diff) | |
| download | libvirt-027986f5bff0d89375e94e1344074f82eed27d7b.tar.gz | |
iscsi: Remove initiatoriqn from virISCSIScanTargets
No longer necessary to have it, so remove it.
Diffstat (limited to 'src')
| -rw-r--r-- | src/storage/storage_backend_iscsi.c | 8 | ||||
| -rw-r--r-- | src/util/viriscsi.c | 3 | ||||
| -rw-r--r-- | src/util/viriscsi.h | 1 |
3 files changed, 3 insertions, 9 deletions
diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index 9e2d01e457..bccfba3fda 100644 --- 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 f4e32540eb..e705517a7d 100644 --- 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 f4093f7165..459249ee60 100644 --- 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; |