External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

virStorageBackendISCSIDirectFindPoolSources: Use allocated virStoragePoolSourceList

Browse Source 
Using an allocated version together with copying the
host/initiator/device portions into it allows us to switch to automatic
clearing rather than open-coding it.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-06-18 14:01:17 +02:00
parent 3776b6a93d
commit 80b7e03ce5
1 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/storage/storage_backend_iscsi_direct.c
View File

@ -495,23 +495,21 @@ virStorageBackendISCSIDirectFindPoolSources(const char *srcSpec,
char **targets = NULL; char **targets = NULL;
char *ret = NULL; char *ret = NULL;
size_t i; size_t i;
virStoragePoolSourceList list = { g_autoptr(virStoragePoolSourceList) list = g_new0(virStoragePoolSourceList, 1);
.type = VIR_STORAGE_POOL_ISCSI_DIRECT,
.nsources = 0,
.sources = NULL
};
g_autofree char *portal = NULL; g_autofree char *portal = NULL;
g_autoptr(virStoragePoolSource) source = NULL; g_autoptr(virStoragePoolSource) source = NULL;
virCheckFlags(0, NULL); virCheckFlags(0, NULL);
list->type = VIR_STORAGE_POOL_ISCSI_DIRECT;
if (!srcSpec) { if (!srcSpec) {
virReportError(VIR_ERR_INVALID_ARG, "%s", virReportError(VIR_ERR_INVALID_ARG, "%s",
_("hostname must be specified for iscsi sources")); _("hostname must be specified for iscsi sources"));
return NULL; return NULL;
} }
if (!(source = virStoragePoolDefParseSourceString(srcSpec, list.type))) if (!(source = virStoragePoolDefParseSourceString(srcSpec, list->type)))
return NULL; return NULL;
if (source->nhost != 1) { if (source->nhost != 1) {
@ -532,30 +530,28 @@ virStorageBackendISCSIDirectFindPoolSources(const char *srcSpec,
if (virISCSIDirectScanTargets(source->initiator.iqn, portal, &ntargets, &targets) < 0) if (virISCSIDirectScanTargets(source->initiator.iqn, portal, &ntargets, &targets) < 0)
goto cleanup; goto cleanup;
list.sources = g_new0(virStoragePoolSource, ntargets); list->sources = g_new0(virStoragePoolSource, ntargets);
for (i = 0; i < ntargets; i++) { for (i = 0; i < ntargets; i++) {
list.sources[i].devices = g_new0(virStoragePoolSourceDevice, 1); list->sources[i].hosts = g_new0(virStoragePoolSourceHost, 1);
list.sources[i].hosts = g_new0(virStoragePoolSourceHost, 1); list->sources[i].nhost = 1;
list.sources[i].nhost = 1; list->sources[i].hosts[0].name = g_strdup(source->hosts[0].name);
list.sources[i].hosts[0] = source->hosts[0]; list->sources[i].hosts[0].port = source->hosts[0].port;
list.sources[i].initiator = source->initiator;
list.sources[i].ndevice = 1; virStorageSourceInitiatorCopy(&list->sources[i].initiator,
list.sources[i].devices[0].path = targets[i]; &source->initiator);
list.nsources++;
list->sources[i].devices = g_new0(virStoragePoolSourceDevice, 1);
list->sources[i].ndevice = 1;
list->sources[i].devices[0].path = g_strdup(targets[i]);
list->nsources++;
} }
if (!(ret = virStoragePoolSourceListFormat(&list))) if (!(ret = virStoragePoolSourceListFormat(list)))
goto cleanup; goto cleanup;
cleanup: cleanup:
if (list.sources) {
for (i = 0; i < ntargets; i++) {
VIR_FREE(list.sources[i].hosts);
VIR_FREE(list.sources[i].devices);
}
VIR_FREE(list.sources);
}
for (i = 0; i < ntargets; i++) for (i = 0; i < ntargets; i++)
VIR_FREE(targets[i]); VIR_FREE(targets[i]);
VIR_FREE(targets); VIR_FREE(targets);