virbitmap: Change return type of virBitmapToData to void

This function return value is invariant since e59b8f9, so change
its type and remove all dependent checks.

Found by Linux Verification Center (linuxtesting.org) with Svace.

Signed-off-by: Artem Chernyshev <artem.chernyshev@red-soft.ru>
Signed-off-by: Alexander Kuznetsov <kuznetsovam@altlinux.org>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>

diff --git a/src/ch/ch_monitor.c b/src/ch/ch_monitor.c
index 2a6638db4fed226abdf85106024b54fac482715b..5a490b75f6f6f59a06c48d413b1e6afc9c32a8a8 100644 (file)
--- a/src/ch/ch_monitor.c
+++ b/src/ch/ch_monitor.c
@@ -1208,10 +1208,7 @@ virCHMonitorGetIOThreads(virCHMonitor *mon,
             if (!(map = virProcessGetAffinity(iothreadinfo->iothread_id)))
                 goto error;
 
-            if (virBitmapToData(map, &(iothreadinfo->cpumap),
-                                &(iothreadinfo->cpumaplen)) < 0) {
-                goto error;
-            }
+            virBitmapToData(map, &(iothreadinfo->cpumap), &(iothreadinfo->cpumaplen));
 
             /* Append to iothreadinfolist */
             iothreadinfolist[niothreads] = g_steal_pointer(&iothreadinfo);

diff --git a/src/hypervisor/domain_driver.c b/src/hypervisor/domain_driver.c
index e2a08d737e33aca05015fda14582c04b430ac07b..35966a5a8dda589e523c1f215d5380361eb31c07 100644 (file)
--- a/src/hypervisor/domain_driver.c
+++ b/src/hypervisor/domain_driver.c
@@ -652,9 +652,7 @@ virDomainDriverGetIOThreadsConfig(virDomainDef *targetDef,
                 cpumask = bitmap;
             }
         }
-        if (virBitmapToData(cpumask, &info_ret[i]->cpumap,
-                            &info_ret[i]->cpumaplen) < 0)
-            goto cleanup;
+        virBitmapToData(cpumask, &info_ret[i]->cpumap, &info_ret[i]->cpumaplen);
     }
 
     *info = g_steal_pointer(&info_ret);

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index f9e8f2a5581270595dbd7c8fd42fad5c23738659..a34d6f14370cb6efc258d135c951dc27ce786dc1 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -4803,8 +4803,7 @@ qemuDomainGetIOThreadsLive(virDomainObj *vm,
         if (!(map = virProcessGetAffinity(iothreads[i]->thread_id)))
             goto endjob;
 
-        if (virBitmapToData(map, &info_ret[i]->cpumap, &info_ret[i]->cpumaplen) < 0)
-            goto endjob;
+        virBitmapToData(map, &info_ret[i]->cpumap, &info_ret[i]->cpumaplen);
     }
 
     *info = g_steal_pointer(&info_ret);

diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c
index e42f5b872c7dc64c2fca4889c0e7ab1f50ca6e29..8a3f33c806020f146d2dc92d93b8363b6a4d72e8 100644 (file)
--- a/src/util/virbitmap.c
+++ b/src/util/virbitmap.c
@@ -637,10 +637,8 @@ virBitmapNewData(const void *data,
  * Convert a bitmap to a chunk of data containing bits information.
  * Data consists of sequential bytes, with lower bytes containing
  * lower bits. This function allocates @data.
- *
- * Returns 0 on success, -1 otherwise.
  */
-int
+void
 virBitmapToData(virBitmap *bitmap,
                 unsigned char **data,
                 int *dataLen)
@@ -656,8 +654,6 @@ virBitmapToData(virBitmap *bitmap,
     *dataLen = len;
 
     virBitmapToDataBuf(bitmap, *data, *dataLen);
-
-    return 0;
 }
 
 

diff --git a/src/util/virbitmap.h b/src/util/virbitmap.h
index a9f9d97fd0f86912537c9541912ceb348e1c6578..a9c0a1a3072874ef474c31477f21fcf4830342ec 100644 (file)
--- a/src/util/virbitmap.h
+++ b/src/util/virbitmap.h
@@ -91,7 +91,7 @@ virBitmap *virBitmapNewCopy(virBitmap *src) ATTRIBUTE_NONNULL(1);
 
 virBitmap *virBitmapNewData(const void *data, int len) ATTRIBUTE_NONNULL(1);
 
-int virBitmapToData(virBitmap *bitmap, unsigned char **data, int *dataLen)
+void virBitmapToData(virBitmap *bitmap, unsigned char **data, int *dataLen)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
 
 void virBitmapToDataBuf(virBitmap *bitmap, unsigned char *data, size_t len)

diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c
index 5fd74a7152d72f392e7e45e87d41004c47f81bc1..5dbcc8987c1367efb72893f5f6ebef8bf22c9984 100644 (file)
--- a/src/util/virhostcpu.c
+++ b/src/util/virhostcpu.c
@@ -1101,8 +1101,8 @@ virHostCPUGetMap(unsigned char **cpumap,
     if (!(cpus = virHostCPUGetOnlineBitmap()))
         goto cleanup;
 
-    if (cpumap && virBitmapToData(cpus, cpumap, &dummy) < 0)
-        goto cleanup;
+    if (cpumap)
+        virBitmapToData(cpus, cpumap, &dummy);
     if (online)
         *online = virBitmapCountBits(cpus);
 

diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c
index 27b6c13114540785330927efe01a6dbb19dffacf..709c62ab5423a01b42d94265f162259f86d058fb 100644 (file)
--- a/tests/virbitmaptest.c
+++ b/tests/virbitmaptest.c
@@ -339,8 +339,7 @@ test5(const void *v G_GNUC_UNUSED)
     ignore_value(virBitmapSetBit(bitmap, 2));
     ignore_value(virBitmapSetBit(bitmap, 15));
 
-    if (virBitmapToData(bitmap, &data2, &len2) < 0)
-        return -1;
+    virBitmapToData(bitmap, &data2, &len2);
 
     if (len2 != sizeof(data) ||
         data2[0] != 0x05 ||

diff --git a/tools/virsh-completer-domain.c b/tools/virsh-completer-domain.c
index b6a4d85ee8df2963346e09547cee37949c5be03e..3a165bc4a55e71e5bce47252fb6de21964e1e5cb 100644 (file)
--- a/tools/virsh-completer-domain.c
+++ b/tools/virsh-completer-domain.c
@@ -794,8 +794,7 @@ virshDomainVcpulistViaAgentCompleter(vshControl *ctl,
         if (!(onlineVcpus = virBitmapParseUnlimited(onlineVcpuStr)))
             goto cleanup;
 
-        if (virBitmapToData(onlineVcpus, &onlineVcpumap, &dummy) < 0)
-            goto cleanup;
+        virBitmapToData(onlineVcpus, &onlineVcpumap, &dummy);
 
         if (enable) {
             offlinableVcpuStr = vshGetTypedParamValue(ctl, &params[2]);
@@ -803,8 +802,7 @@ virshDomainVcpulistViaAgentCompleter(vshControl *ctl,
             if (!(offlinableVcpus = virBitmapParseUnlimited(offlinableVcpuStr)))
                 goto cleanup;
 
-            if (virBitmapToData(offlinableVcpus, &offlinableVcpumap, &dummy) < 0)
-                goto cleanup;
+            virBitmapToData(offlinableVcpus, &offlinableVcpumap, &dummy);
 
             lastcpu = virBitmapLastSetBit(offlinableVcpus);
             cpulist = g_new0(char *, nvcpus - virBitmapCountBits(onlineVcpus) + 1);

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index c0ea4cd184c6cddd5a2c2d68b9f177b72b0acab5..a5f87243a2f0884941b049c1dab702d80fd675c4 100644 (file)
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -7420,8 +7420,7 @@ virshParseCPUList(vshControl *ctl, int *cpumaplen,
         }
     }
 
-    if (virBitmapToData(map, &cpumap, cpumaplen) < 0)
-        return NULL;
+    virBitmapToData(map, &cpumap, cpumaplen);
 
     return cpumap;
 }