openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

virDomainDiskAddISCSIPoolSourceHost: use g_strsplit instead of virStringSplitCount 

Count the elements directly using g_strv_length.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-03-22 17:00:41 +01:00
parent b2c2de01dc
commit 129590d511
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/conf/domain_conf.c
View File

@ -32117,7 +32117,6 @@ virDomainDiskAddISCSIPoolSourceHost(virStorageSourcePtr src,
virStoragePoolDefPtr pooldef)
{
g_auto(GStrv) tokens = NULL;
size_t ntokens;
/* Only support one host */
if (pooldef->source.nhost != 1) {
@ -32138,10 +32137,10 @@ virDomainDiskAddISCSIPoolSourceHost(virStorageSourcePtr src,
src->hosts[0].port = 3260;
/* iscsi volume has name like "unit:0:0:1" */
if (!(tokens = virStringSplitCount(src->srcpool->volume, ":", 0, &ntokens)))
if (!(tokens = g_strsplit(src->srcpool->volume, ":", 0)))
return -1;
if (ntokens != 4) {
if (g_strv_length(tokens) != 4) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("unexpected iscsi volume name '%s'"),
src->srcpool->volume);