Introduce virBitmapIsBitSet

A helper that never returns an error and treats bits out of bitmap range
as false.

Use it everywhere we use ignore_value on virBitmapGetBit, or loop over
the bitmap size.

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 127fc911ef27c1fec0e0b62236cece18b101af4b..ae8688e92d52a97de333f6f03326d8ecd6ad7df3 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -3107,7 +3107,6 @@ virDomainDefRejectDuplicateControllers(virDomainDefPtr def)
     virDomainControllerDefPtr cont;
     size_t nbitmaps = 0;
     int ret = -1;
-    bool b;
     size_t i;
 
     memset(max_idx, -1, sizeof(max_idx));
@@ -3133,8 +3132,7 @@ virDomainDefRejectDuplicateControllers(virDomainDefPtr def)
         if (max_idx[cont->type] == -1)
             continue;
 
-        ignore_value(virBitmapGetBit(bitmaps[cont->type], cont->idx, &b));
-        if (b) {
+        if (virBitmapIsBitSet(bitmaps[cont->type], cont->idx)) {
             virReportError(VIR_ERR_XML_ERROR,
                            _("Multiple '%s' controllers with index '%d'"),
                            virDomainControllerTypeToString(cont->type),

diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index 07cc0d02fde4b7ef960d6f186a05d439f99ff087..a28684737654129f25bd372d055c5594eefc208f 100644 (file)
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -439,9 +439,7 @@ char *virNodeDeviceDefFormat(const virNodeDeviceDef *def)
             virInterfaceLinkFormat(&buf, &data->net.lnk);
             if (data->net.features) {
                 for (i = 0; i < VIR_NET_DEV_FEAT_LAST; i++) {
-                    bool b;
-                    ignore_value(virBitmapGetBit(data->net.features, i, &b));
-                    if (b) {
+                    if (virBitmapIsBitSet(data->net.features, i)) {
                         virBufferAsprintf(&buf, "<feature name='%s'/>\n",
                                           virNetDevFeatureTypeToString(i));
                     }

diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index a0667c2824be3191eb9442e1cc195be5ca50d99a..dc5436f8d8450562a40f32bc4e70e572dae943f4 100644 (file)
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -465,7 +465,6 @@ virDomainSnapshotAlignDisks(virDomainSnapshotDefPtr def,
     virBitmapPtr map = NULL;
     size_t i;
     int ndisks;
-    bool inuse;
 
     if (!def->dom) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@@ -500,7 +499,7 @@ virDomainSnapshotAlignDisks(virDomainSnapshotDefPtr def,
             goto cleanup;
         }
 
-        if (virBitmapGetBit(map, idx, &inuse) < 0 || inuse) {
+        if (virBitmapIsBitSet(map, idx)) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                            _("disk '%s' specified twice"),
                            disk->name);
@@ -553,8 +552,7 @@ virDomainSnapshotAlignDisks(virDomainSnapshotDefPtr def,
     for (i = 0; i < def->dom->ndisks; i++) {
         virDomainSnapshotDiskDefPtr disk;
 
-        ignore_value(virBitmapGetBit(map, i, &inuse));
-        if (inuse)
+        if (virBitmapIsBitSet(map, i))
             continue;
         disk = &def->disks[ndisks++];
         if (VIR_ALLOC(disk->src) < 0)

diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index 4c1f05dd8a5097b0f986413a440fdf423ca393a1..b0704487de7ed227bb7e31c722f58fb29a77f922 100644 (file)
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -1567,7 +1567,6 @@ virStorageVolTargetDefFormat(virStorageVolOptionsPtr options,
 
     if (options->featureToString && def->features) {
         size_t i;
-        bool b;
         bool empty = virBitmapIsAllClear(def->features);
 
         if (empty) {
@@ -1578,8 +1577,7 @@ virStorageVolTargetDefFormat(virStorageVolOptionsPtr options,
         }
 
         for (i = 0; i < VIR_STORAGE_FILE_FEATURE_LAST; i++) {
-            ignore_value(virBitmapGetBit(def->features, i, &b));
-            if (b)
+            if (virBitmapIsBitSet(def->features, i))
                 virBufferAsprintf(buf, "<%s/>\n",
                                   options->featureToString(i));
         }

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 7262c95c6c6f6f3c6eabc9dfc4d7bbb0fa75421a..b5fe88cb940ce48bda471df5a53bdb99e405a776 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1070,6 +1070,7 @@ virBitmapFree;
 virBitmapGetBit;
 virBitmapIsAllClear;
 virBitmapIsAllSet;
+virBitmapIsBitSet;
 virBitmapLastSetBit;
 virBitmapNew;
 virBitmapNewCopy;

diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
index 9af5758969fbdbd03ac36ca4b7ae013437794a57..66ca98895b958687f83d7ec3e23c67671d9b4c6b 100644 (file)
--- a/src/libxl/libxl_domain.c
+++ b/src/libxl/libxl_domain.c
@@ -1093,9 +1093,7 @@ libxlDomainSetVcpuAffinities(libxlDriverPrivatePtr driver, virDomainObjPtr vm)
         cpumask = def->cputune.vcpupin[vcpu]->cpumask;
 
         for (i = 0; i < virBitmapSize(cpumask); ++i) {
-            bool bit;
-            ignore_value(virBitmapGetBit(cpumask, i, &bit));
-            if (bit)
+            if (virBitmapIsBitSet(cpumask, i))
                 VIR_USE_CPU(cpumap, i);
         }
 

diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 88fa6ff7f970b27b6ed4b6845d9e6f92cb927826..d4a8b9df58715de62128f1ad9f43e5e4e3266a8a 100644 (file)
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -2051,7 +2051,6 @@ libxlDomainGetVcpuPinInfo(virDomainPtr dom, int ncpumaps,
     virBitmapPtr cpumask = NULL;
     int maxcpu, hostcpus, vcpu, pcpu, n, ret = -1;
     unsigned char *cpumap;
-    bool pinned;
 
     virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
                   VIR_DOMAIN_AFFECT_CONFIG, -1);
@@ -2100,9 +2099,7 @@ libxlDomainGetVcpuPinInfo(virDomainPtr dom, int ncpumaps,
         cpumask = vcpupin_list[n]->cpumask;
         cpumap = VIR_GET_CPUMAP(cpumaps, maplen, vcpu);
         for (pcpu = 0; pcpu < maxcpu; pcpu++) {
-            if (virBitmapGetBit(cpumask, pcpu, &pinned) < 0)
-                goto cleanup;
-            if (!pinned)
+            if (!virBitmapIsBitSet(cpumask, pcpu))
                 VIR_UNUSE_CPU(cpumap, pcpu);
         }
     }

diff --git a/src/nodeinfo.c b/src/nodeinfo.c
index 3a27c22eefa13b292e6bb6ee290816716d3c5472..05256cc34de642d862093d0b1907e8ee9401a1a0 100644 (file)
--- a/src/nodeinfo.c
+++ b/src/nodeinfo.c
@@ -1911,11 +1911,7 @@ nodeCapsInitNUMA(virCapsPtr caps)
         cpu = 0;
 
         for (i = 0; i < virBitmapSize(cpumap); i++) {
-            bool cpustate;
-            if (virBitmapGetBit(cpumap, i, &cpustate) < 0)
-                continue;
-
-            if (cpustate) {
+            if (virBitmapIsBitSet(cpumap, i)) {
                 if (virNodeCapsFillCPUInfo(i, cpus + cpu++) < 0) {
                     topology_failed = true;
                     virResetLastError();

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index c513d46e10551df09eaf2bc4b9e11540321355e2..ccf22f023428766f5c4e4a060423aa210c9683a2 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -2048,12 +2048,7 @@ bool
 virQEMUCapsGet(virQEMUCapsPtr qemuCaps,
                virQEMUCapsFlags flag)
 {
-    bool b;
-
-    if (!qemuCaps || virBitmapGetBit(qemuCaps->flags, flag, &b) < 0)
-        return false;
-    else
-        return b;
+    return qemuCaps && virBitmapIsBitSet(qemuCaps->flags, flag);
 }
 
 

diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
index a4e75f5a5c8eb9a37b4cb3b610ba28fa9803b1b7..9322571cc9c8a8ec1302faa25a99af82f69ffab4 100644 (file)
--- a/src/storage/storage_backend.c
+++ b/src/storage/storage_backend.c
@@ -807,7 +807,6 @@ virStorageBackendCreateQemuImgOpts(char **opts,
                                    virBitmapPtr features)
 {
     virBuffer buf = VIR_BUFFER_INITIALIZER;
-    bool b;
     size_t i;
 
     if (backingType)
@@ -823,8 +822,7 @@ virStorageBackendCreateQemuImgOpts(char **opts,
         virBufferAsprintf(&buf, "compat=%s,", compat);
     if (features && format == VIR_STORAGE_FILE_QCOW2) {
         for (i = 0; i < VIR_STORAGE_FILE_FEATURE_LAST; i++) {
-            ignore_value(virBitmapGetBit(features, i, &b));
-            if (b) {
+            if (virBitmapIsBitSet(features, i)) {
                 switch ((virStorageFileFeature) i) {
                 case VIR_STORAGE_FILE_FEATURE_LAZY_REFCOUNTS:
                     if (STREQ_NULLABLE(compat, "0.10")) {

diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c
index b531be5e8ba0b29aa5bcd9114b219b8c7c08faac..5322bce65ee19769b9c2c43bdc578100fa8757a4 100644 (file)
--- a/src/util/virbitmap.c
+++ b/src/util/virbitmap.c
@@ -178,6 +178,24 @@ static bool virBitmapIsSet(virBitmapPtr bitmap, size_t b)
     return !!(bitmap->map[VIR_BITMAP_UNIT_OFFSET(b)] & VIR_BITMAP_BIT(b));
 }
 
+/**
+ * virBitmapIsBitSet:
+ * @bitmap: Pointer to bitmap
+ * @b: bit position to get
+ *
+ * Get setting of bit position @b in @bitmap.
+ *
+ * If @b is in the range of @bitmap, returns the value of the bit.
+ * Otherwise false is returned.
+ */
+bool virBitmapIsBitSet(virBitmapPtr bitmap, size_t b)
+{
+    if (bitmap->max_bit <= b)
+        return false;
+
+    return virBitmapIsSet(bitmap, b);
+}
+
 /**
  * virBitmapGetBit:
  * @bitmap: Pointer to bitmap

diff --git a/src/util/virbitmap.h b/src/util/virbitmap.h
index 136e8197d0dae57ad15fd89b17bcecb29161f032..d326c6a6b079d43f464612afae629d60b60bb1f7 100644 (file)
--- a/src/util/virbitmap.h
+++ b/src/util/virbitmap.h
@@ -61,6 +61,11 @@ int virBitmapSetBit(virBitmapPtr bitmap, size_t b)
 int virBitmapClearBit(virBitmapPtr bitmap, size_t b)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK;
 
+/*
+ * Get bit @b in @bitmap. Returns false if b is out of range.
+ */
+bool virBitmapIsBitSet(virBitmapPtr bitmap, size_t b)
+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK;
 /*
  * Get setting of bit position @b in @bitmap and store in @result
  */

diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index 6957e81d547227a05e35efd6c96b0d6c138ed199..e54a07908da52bcb921cb555b6597103a525f0a4 100644 (file)
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -3085,9 +3085,7 @@ virCgroupGetPercpuStats(virCgroupPtr group,
     need_cpus = MIN(total_cpus, start_cpu + ncpus);
 
     for (i = 0; i < need_cpus; i++) {
-        bool present;
-        ignore_value(virBitmapGetBit(cpumap, i, &present));
-        if (!present) {
+        if (!virBitmapIsBitSet(cpumap, i)) {
             cpu_time = 0;
         } else if (virStrToLong_ull(pos, &pos, 10, &cpu_time) < 0) {
             virReportError(VIR_ERR_INTERNAL_ERROR, "%s",

diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c
index 97652c0aa602e3781a498dbc96c376d90360cccd..6a2a2fbec6f0bbf2efc406c54fe5581cf19f6747 100644 (file)
--- a/src/util/virdnsmasq.c
+++ b/src/util/virdnsmasq.c
@@ -874,10 +874,6 @@ dnsmasqCapsGetVersion(dnsmasqCapsPtr caps)
 bool
 dnsmasqCapsGet(dnsmasqCapsPtr caps, dnsmasqCapsFlags flag)
 {
-    bool b;
 
-    if (!caps || virBitmapGetBit(caps->flags, flag, &b) < 0)
-        return false;
-    else
-        return b;
+    return caps && virBitmapIsBitSet(caps->flags, flag);
 }

diff --git a/src/util/virportallocator.c b/src/util/virportallocator.c
index 578debf85d0b9089699e8a658b132048c979457f..fcd4f744929d7b96be66eed73d40812d7725357c 100644 (file)
--- a/src/util/virportallocator.c
+++ b/src/util/virportallocator.c
@@ -184,14 +184,7 @@ int virPortAllocatorAcquire(virPortAllocatorPtr pa,
     for (i = pa->start; i <= pa->end && !*port; i++) {
         bool used = false, v6used = false;
 
-        if (virBitmapGetBit(pa->bitmap,
-                            i - pa->start, &used) < 0) {
-            virReportError(VIR_ERR_INTERNAL_ERROR,
-                           _("Failed to query port %zu"), i);
-            goto cleanup;
-        }
-
-        if (used)
+        if (virBitmapIsBitSet(pa->bitmap, i - pa->start))
             continue;
 
         if (!(pa->flags & VIR_PORT_ALLOCATOR_SKIP_BIND_CHECK)) {
@@ -269,12 +262,8 @@ int virPortAllocatorSetUsed(virPortAllocatorPtr pa,
     }
 
     if (value) {
-        bool used = false;
-        if (virBitmapGetBit(pa->bitmap, port - pa->start, &used) < 0)
-            virReportError(VIR_ERR_INTERNAL_ERROR,
-                           _("Failed to query port %d"), port);
-
-        if (used || virBitmapSetBit(pa->bitmap, port - pa->start) < 0) {
+        if (virBitmapIsBitSet(pa->bitmap, port - pa->start) ||
+            virBitmapSetBit(pa->bitmap, port - pa->start) < 0) {
             virReportError(VIR_ERR_INTERNAL_ERROR,
                            _("Failed to reserve port %d"), port);
             goto cleanup;

diff --git a/src/util/virprocess.c b/src/util/virprocess.c
index 342bf40c4d78344903ad79112190d38e8db5dab7..aa00a996db7077a08454e26d8b6feb275d732a7d 100644 (file)
--- a/src/util/virprocess.c
+++ b/src/util/virprocess.c
@@ -407,7 +407,6 @@ virProcessKillPainfully(pid_t pid, bool force)
 int virProcessSetAffinity(pid_t pid, virBitmapPtr map)
 {
     size_t i;
-    bool set = false;
     VIR_DEBUG("Set process affinity on %lld\n", (long long)pid);
 # ifdef CPU_ALLOC
     /* New method dynamically allocates cpu mask, allowing unlimted cpus */
@@ -433,9 +432,7 @@ int virProcessSetAffinity(pid_t pid, virBitmapPtr map)
 
     CPU_ZERO_S(masklen, mask);
     for (i = 0; i < virBitmapSize(map); i++) {
-        if (virBitmapGetBit(map, i, &set) < 0)
-            return -1;
-        if (set)
+        if (virBitmapIsBitSet(map, i))
             CPU_SET_S(i, masklen, mask);
     }
 
@@ -457,9 +454,7 @@ int virProcessSetAffinity(pid_t pid, virBitmapPtr map)
 
     CPU_ZERO(&mask);
     for (i = 0; i < virBitmapSize(map); i++) {
-        if (virBitmapGetBit(map, i, &set) < 0)
-            return -1;
-        if (set)
+        if (virBitmapIsBitSet(map, i))
             CPU_SET(i, &mask);
     }
 

diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index 5e6ef68d697b9b944e0fccfd34b7442a8d6bafd4..75778812f12d613236c26909f8ea377658f23829 100644 (file)
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -232,9 +232,7 @@ xenDomainUsedCpus(virDomainPtr dom, virDomainDefPtr def)
                                                   cpumap, cpumaplen)) >= 0) {
         for (n = 0; n < ncpus; n++) {
             for (m = 0; m < priv->nbNodeCpus; m++) {
-                bool used;
-                ignore_value(virBitmapGetBit(cpulist, m, &used));
-                if ((!used) &&
+                if (!virBitmapIsBitSet(cpulist, m) &&
                     (VIR_CPU_USABLE(cpumap, cpumaplen, n, m))) {
                     ignore_value(virBitmapSetBit(cpulist, m));
                     nb++;

diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index ab03c1c158243ac9a85b1591ee2bfd5c7ad6ff38..1722c3f0d3bffa4ec8bf2edf7236b5020773dae4 100644 (file)
--- a/src/xen/xend_internal.c
+++ b/src/xen/xend_internal.c
@@ -1089,10 +1089,7 @@ sexpr_to_xend_topology(const struct sexpr *root, virCapsPtr caps)
         }
 
         for (n = 0, cpu = 0; cpu < numCpus; cpu++) {
-            bool used;
-
-            ignore_value(virBitmapGetBit(cpuset, cpu, &used));
-            if (used)
+            if (virBitmapIsBitSet(cpuset, cpu))
                 cpuInfo[n++].id = cpu;
         }
         virBitmapFree(cpuset);