From 60a2ce4962f932eaf984a6b7b8c78e1fd0218f54 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Wed, 11 Feb 2015 17:38:29 +0100 Subject: [PATCH] conf: numa: Improve error message in case a numa node doesn't have cpus Currently the code would exit without reporting an error as virBitmapParse reports one only if it fails to parse the bitmap, whereas the code was jumping to the error label even in case 0 cpus were correctly parsed in the map. --- src/conf/numa_conf.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c index d21d62e745..39061adc86 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -749,9 +749,14 @@ virDomainNumaDefCPUParseXML(virCPUDefPtr def, } if (virBitmapParse(tmp, 0, &def->cells[cur_cell].cpumask, - VIR_DOMAIN_CPUMASK_LEN) <= 0) + VIR_DOMAIN_CPUMASK_LEN) < 0) goto cleanup; + if (virBitmapIsAllClear(def->cells[cur_cell].cpumask)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("NUMA cell %d has no vCPUs assigned"), cur_cell); + goto cleanup; + } VIR_FREE(tmp); ctxt->node = nodes[i];