External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 12:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

storage: add SetConnection to iscsi-direct backend

Browse Source 
The code to set the connection and connect using libiscsi will always be
the same. Add function to avoid code duplication.

Signed-off-by: Clementine Hayat <clem@lse.epita.fr>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Clementine Hayat 2018-08-13 00:26:17 +02:00 committed by Michal Privoznik
parent 14bfe9fa84
commit e68426f0ad
1 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/storage/storage_backend_iscsi_direct.c
View File

@ -556,23 +556,45 @@ virStorageBackendISCSIDirectFindPoolSources(const char *srcSpec,
return ret;
}
static int
virStorageBackendISCSIDirectRefreshPool(virStoragePoolObjPtr pool)
static struct iscsi_context *
virStorageBackendISCSIDirectSetConnection(virStoragePoolObjPtr pool,
char **portalRet)
{
virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool);
struct iscsi_context *iscsi = NULL;
char *portal = NULL;
int ret = -1;
if (!(iscsi = virISCSIDirectCreateContext(def->source.initiator.iqn)))
goto cleanup;
goto error;
if (!(portal = virStorageBackendISCSIDirectPortal(&def->source)))
goto cleanup;
goto error;
if (virStorageBackendISCSIDirectSetAuth(iscsi, &def->source) < 0)
goto cleanup;
goto error;
if (virISCSIDirectSetContext(iscsi, def->source.devices[0].path, ISCSI_SESSION_NORMAL) < 0)
goto cleanup;
goto error;
if (virISCSIDirectConnect(iscsi, portal) < 0)
goto error;
if (portalRet)
VIR_STEAL_PTR(*portalRet, portal);
cleanup:
VIR_FREE(portal);
return iscsi;
error:
iscsi_destroy_context(iscsi);
iscsi = NULL;
goto cleanup;
}
static int
virStorageBackendISCSIDirectRefreshPool(virStoragePoolObjPtr pool)
{
struct iscsi_context *iscsi = NULL;
char *portal = NULL;
int ret = -1;
if (!(iscsi = virStorageBackendISCSIDirectSetConnection(pool, &portal)))
goto cleanup;
if (virISCSIDirectReportLuns(pool, iscsi, portal) < 0)
goto disconect;
@ -580,9 +602,9 @@ virStorageBackendISCSIDirectRefreshPool(virStoragePoolObjPtr pool)
ret = 0;
disconect:
virISCSIDirectDisconnect(iscsi);
iscsi_destroy_context(iscsi);
cleanup:
VIR_FREE(portal);
iscsi_destroy_context(iscsi);
return ret;
}