External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-30 21:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove storage pool from the arguments of a few functions

Browse Source 
virStorageBackendISCSISession only needs the path of the source
device and virStorageBackendISCSIRescanLUNs doesn't need the pool
at all.

This will allow the functions to be moved to src/util.
This commit is contained in:
Ján Tomko 2014-03-19 15:54:08 +01:00
parent 2053427552
commit 55074071ec
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/storage/storage_backend_iscsi.c
View File

@ -96,8 +96,8 @@ virStorageBackendISCSIExtractSession(char **const groups,
}
static char *
virStorageBackendISCSISession(virStoragePoolObjPtr pool,
bool probe)
virStorageBackendISCSIGetSession(const char *devpath,
bool probe)
{
/*
* # iscsiadm --mode session
@ -114,7 +114,7 @@ virStorageBackendISCSISession(virStoragePoolObjPtr pool,
};
struct virStorageBackendISCSISessionData cbdata = {
.session = NULL,
.devpath = pool->def->source.devices[0].path
.devpath = devpath,
};
virCommandPtr cmd = virCommandNewArgList(ISCSIADM, "--mode", "session", NULL);
@ -138,6 +138,13 @@ cleanup:
return cbdata.session;
}
static char *
virStorageBackendISCSISession(virStoragePoolObjPtr pool,
bool probe)
{
return virStorageBackendISCSIGetSession(pool->def->source.devices[0].path, probe);
}
#define LINE_SIZE 4096
@ -442,8 +449,7 @@ virStorageBackendISCSIFindLUs(virStoragePoolObjPtr pool,
}
static int
virStorageBackendISCSIRescanLUNs(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED,
const char *session)
virStorageBackendISCSIRescanLUNs(const char *session)
{
virCommandPtr cmd = virCommandNewArgList(ISCSIADM,
"--mode", "session",
@ -865,7 +871,7 @@ virStorageBackendISCSIRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED,
if ((session = virStorageBackendISCSISession(pool, false)) == NULL)
goto cleanup;
if (virStorageBackendISCSIRescanLUNs(pool, session) < 0)
if (virStorageBackendISCSIRescanLUNs(session) < 0)
goto cleanup;
if (virStorageBackendISCSIFindLUs(pool, session) < 0)
goto cleanup;