From: Peter Krempa Date: Thu, 1 Apr 2021 13:36:49 +0000 (+0200) Subject: virVMXParseConfig: Replace virStringSplitCount by g_strsplit X-Git-Tag: v7.3.0-rc1~278 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a95794dbdb3802e87cf21314d3ddaef98fc5f305;p=thirdparty%2Flibvirt.git virVMXParseConfig: Replace virStringSplitCount by g_strsplit Remove the last usage of virStringSplitCount Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index ecc2db7f43..89d08c1ce0 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -1574,18 +1574,17 @@ virVMXParseConfig(virVMXContext *ctx, if (sched_cpu_affinity != NULL && STRCASENEQ(sched_cpu_affinity, "all")) { g_auto(GStrv) afflist = NULL; char **aff; - size_t naffs; def->cpumask = virBitmapNew(VIR_DOMAIN_CPUMASK_LEN); - if (!(afflist = virStringSplitCount(sched_cpu_affinity, ",", 0, &naffs))) + if (!(afflist = g_strsplit(sched_cpu_affinity, ",", 0))) goto cleanup; - if (naffs < numvcpus) { + if (g_strv_length(afflist) < numvcpus) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Expecting VMX entry 'sched.cpu.affinity' to contain " "at least as many values as 'numvcpus' (%lld) but " - "found only %zu value(s)"), numvcpus, naffs); + "found only %u value(s)"), numvcpus, g_strv_length(afflist)); goto cleanup; }