Do not return number of set bits in virBitmapParse

This is only used by one caller.
This commit is contained in:
Ján Tomko 2016-06-17 14:11:55 +02:00
parent dc5821d743
commit ba7c026dab
2 changed files with 5 additions and 4 deletions

View File

@ -419,7 +419,7 @@ char *virBitmapFormat(virBitmapPtr bitmap)
* Pass 0 as @terminator if it is not needed. Whitespace characters may not
* be used as terminators.
*
* Returns the number of bits set in @bitmap, or -1 in case of error.
* Returns 0 on success, or -1 in case of error.
*/
int
virBitmapParse(const char *str,
@ -509,7 +509,7 @@ virBitmapParse(const char *str,
}
}
return virBitmapCountBits(*bitmap);
return 0;
error:
virReportError(VIR_ERR_INVALID_ARG,

View File

@ -1049,9 +1049,10 @@ sexpr_to_xend_topology(const struct sexpr *root, virCapsPtr caps)
if (!(cpuset = virBitmapNew(numCpus)))
goto error;
} else {
nb_cpus = virBitmapParse(cur, 'n', &cpuset, numCpus);
if (nb_cpus < 0)
if (virBitmapParse(cur, 'n', &cpuset, numCpus) < 0)
goto error;
nb_cpus = virBitmapCountBits(cpuset);
}
if (VIR_ALLOC_N(cpuInfo, numCpus) < 0) {