numa_conf: Make virDomainNumaSetNodeCpumask() return void

There is only one caller of virDomainNumaSetNodeCpumask() which
checks for the return value but because the function will return
NULL iff the @cpumask was NULL in the first place. But in that
place @cpumask can't be NULL because it was just allocated by
virBitmapParse().

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>

diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c
index 2685a3e8283c6eb173e48a4ca7a6fb7fe91de99c..7b9084456efa33ecacebf3c98dedb0cd287fa830 100644 (file)
--- a/src/conf/numa_conf.c
+++ b/src/conf/numa_conf.c
@@ -1317,14 +1317,12 @@ virDomainNumaGetNodeCpumask(virDomainNumaPtr numa,
 }
 
 
-virBitmapPtr
+void
 virDomainNumaSetNodeCpumask(virDomainNumaPtr numa,
                             size_t node,
                             virBitmapPtr cpumask)
 {
     numa->mem_nodes[node].cpumask = cpumask;
-
-    return numa->mem_nodes[node].cpumask;
 }
 
 

diff --git a/src/conf/numa_conf.h b/src/conf/numa_conf.h
index 206dffe304f19f0df8a20d8ec06659b1355b5c0e..25e896826b18b5d0d54a9fbbe49cadf1cdc1f84e 100644 (file)
--- a/src/conf/numa_conf.h
+++ b/src/conf/numa_conf.h
@@ -155,9 +155,9 @@ size_t virDomainNumaSetNodeDistanceCount(virDomainNumaPtr numa,
                                          size_t ndistances)
     ATTRIBUTE_NONNULL(1);
 
-virBitmapPtr virDomainNumaSetNodeCpumask(virDomainNumaPtr numa,
-                                         size_t node,
-                                         virBitmapPtr cpumask)
+void  virDomainNumaSetNodeCpumask(virDomainNumaPtr numa,
+                                  size_t node,
+                                  virBitmapPtr cpumask)
     ATTRIBUTE_NONNULL(1);
 
 /*

diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c
index d40c2e1d8ef49f1c8b8408a7c78b01bba6c29564..1c1279e1cb27bf6347554e7221a19f9481ec09fa 100644 (file)
--- a/src/libxl/xen_xl.c
+++ b/src/libxl/xen_xl.c
@@ -508,10 +508,10 @@ xenParseXLVnuma(virConfPtr conf,
                             goto cleanup;
                         }
 
-                        if ((virBitmapParse(vtoken, &cpumask, VIR_DOMAIN_CPUMASK_LEN) < 0) ||
-                            (virDomainNumaSetNodeCpumask(numa, vnodeCnt, cpumask) == NULL))
+                        if (virBitmapParse(vtoken, &cpumask, VIR_DOMAIN_CPUMASK_LEN) < 0)
                             goto cleanup;
 
+                        virDomainNumaSetNodeCpumask(numa, vnodeCnt, cpumask);
                         vcpus += virBitmapCountBits(cpumask);
 
                     } else if (STRPREFIX(str, "vdistances")) {