External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-01 17:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

iscsi: Remove initiatoriqn from virISCSIScanTargets

Browse Source 
No longer necessary to have it, so remove it.
This commit is contained in:
John Ferlan 2016-05-13 11:38:45 -04:00
parent 56057900dc
commit 027986f5bf
4 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/storage/storage_backend_iscsi.c
View File

@ -197,9 +197,7 @@ virStorageBackendISCSIFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSED,
if (!(portal = virStorageBackendISCSIPortal(source))) if (!(portal = virStorageBackendISCSIPortal(source)))
goto cleanup; goto cleanup;
if (virISCSIScanTargets(portal, if (virISCSIScanTargets(portal, &ntargets, &targets) < 0)
source->initiator.iqn,
&ntargets, &targets) < 0)
goto cleanup; goto cleanup;
if (VIR_ALLOC_N(list.sources, ntargets) < 0) 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 * iscsiadm doesn't let you login to a target, unless you've
* first issued a 'sendtargets' command to the portal :-( * first issued a 'sendtargets' command to the portal :-(
*/ */
if (virISCSIScanTargets(portal, if (virISCSIScanTargets(portal, NULL, NULL) < 0)
pool->def->source.initiator.iqn,
NULL, NULL) < 0)
goto cleanup; goto cleanup;
if (virStorageBackendISCSISetAuth(portal, conn, &pool->def->source) < 0) if (virStorageBackendISCSISetAuth(portal, conn, &pool->def->source) < 0)

3
src/util/viriscsi.c
View File

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

1
src/util/viriscsi.h
View File

@ -49,7 +49,6 @@ virISCSIRescanLUNs(const char *session)
int int
virISCSIScanTargets(const char *portal, virISCSIScanTargets(const char *portal,
const char *initiatoriqn,
size_t *ntargetsret, size_t *ntargetsret,
char ***targetsret) char ***targetsret)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK;

3
tests/viriscsitest.c
View File

@ -145,8 +145,7 @@ testISCSIScanTargets(const void *data)
virCommandSetDryRun(NULL, testIscsiadmCb, NULL); virCommandSetDryRun(NULL, testIscsiadmCb, NULL);
if (virISCSIScanTargets(info->portal, NULL, if (virISCSIScanTargets(info->portal, &ntargets, &targets) < 0)
&ntargets, &targets) < 0)
goto cleanup; goto cleanup;
if (info->nexpected != ntargets) { if (info->nexpected != ntargets) {