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

vmx: Refactor number parsing in virVMXParseConfig

Browse Source 
Parsing of the cpu affinity list was using virParseNumber. Modernize it
to get rid of the virParseNumber call.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2019-04-01 17:43:20 +02:00
parent c0dae62e02
commit 5857a63519
1 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/vmx/vmx.c
View File

@ -1500,19 +1500,35 @@ virVMXParseConfig(virVMXContext *ctx,
} }
if (sched_cpu_affinity != NULL && STRCASENEQ(sched_cpu_affinity, "all")) { if (sched_cpu_affinity != NULL && STRCASENEQ(sched_cpu_affinity, "all")) {
const char *current = sched_cpu_affinity; VIR_AUTOSTRINGLIST afflist = NULL;
int number, count = 0; char **aff;
size_t naffs;
def->cpumask = virBitmapNew(VIR_DOMAIN_CPUMASK_LEN); def->cpumask = virBitmapNew(VIR_DOMAIN_CPUMASK_LEN);
if (!def->cpumask) if (!def->cpumask)
goto cleanup; goto cleanup;
while (*current != '\0') { if (!(afflist = virStringSplitCount(sched_cpu_affinity, ",", 0, &naffs)))
goto cleanup;
if (naffs < 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);
goto cleanup;
}
for (aff = afflist; *aff; aff++) {
const char *current = *aff;
unsigned int number;
int rc;
virSkipSpaces(&current);
rc = virStrToLong_uip(current, (char **) &current, 10, &number);
virSkipSpaces(&current); virSkipSpaces(&current);
number = virParseNumber(&current); if (rc < 0 || *current != '\0') {
if (number < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Expecting VMX entry 'sched.cpu.affinity' to be " _("Expecting VMX entry 'sched.cpu.affinity' to be "
"a comma separated list of unsigned integers but " "a comma separated list of unsigned integers but "
@ -1528,31 +1544,6 @@ virVMXParseConfig(virVMXContext *ctx,
} }
ignore_value(virBitmapSetBit(def->cpumask, number)); ignore_value(virBitmapSetBit(def->cpumask, number));
++count;
virSkipSpaces(&current);
if (*current == ',') {
++current;
} else if (*current == '\0') {
break;
} else {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Expecting VMX entry 'sched.cpu.affinity' to be "
"a comma separated list of unsigned integers but "
"found '%s'"), sched_cpu_affinity);
goto cleanup;
}
virSkipSpaces(&current);
}
if (count < 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 %d value(s)"), numvcpus, count);
goto cleanup;
} }
} }