9:27 a.m.
Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com>
---
src/conf/domain_addr.c | 2 +-
src/conf/domain_conf.c | 5 ++---
src/network/bridge_driver.c | 4 ++--
src/qemu/qemu_capabilities.c | 2 +-
src/qemu/qemu_domain.c | 2 +-
src/qemu/qemu_driver.c | 2 +-
src/qemu/qemu_hotplug.c | 2 +-
src/qemu/qemu_migration_params.c | 3 +--
src/util/virbitmap.h | 2 +-
9 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c
index a28fba4..76c5f51 100644
--- a/src/conf/domain_addr.c
+++ b/src/conf/domain_addr.c
@@ -2460,7 +2460,7 @@ virDomainUSBAddressRelease(virDomainUSBAddressSetPtr addrs,
portStr)))
return -1;
- ignore_value(virBitmapClearBit(targetHub->portmap, targetPort));
+ virBitmapClearBit(targetHub->portmap, targetPort);
return 0;
}
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index a067fb4..27b58df 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -3286,10 +3286,9 @@ virDomainIOThreadIDDefArrayInit(virDomainDefPtr def,
/* Clear 0 since we don't use it, then mark those which are
* already provided by the user */
- ignore_value(virBitmapClearBit(thrmap, 0));
+ virBitmapClearBit(thrmap, 0);
for (i = 0; i < def->niothreadids; i++)
- ignore_value(virBitmapClearBit(thrmap,
- def->iothreadids[i]->iothread_id));
+ virBitmapClearBit(thrmap, def->iothreadids[i]->iothread_id);
/* resize array */
if (VIR_REALLOC_N(def->iothreadids, iothreads) < 0)
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index c27a9c4..bf90de1 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -5058,7 +5058,7 @@ networkPlugBandwidthImpl(virNetworkObjPtr obj,
virNetworkObjSetFloorSum(obj, tmp_floor_sum);
/* update status file */
if (virNetworkObjSaveStatus(driver->stateDir, obj, network_driver->xmlopt) <
0) {
- ignore_value(virBitmapClearBit(classIdMap, next_id));
+ virBitmapClearBit(classIdMap, next_id);
tmp_floor_sum -= ifaceBand->in->floor;
virNetworkObjSetFloorSum(obj, tmp_floor_sum);
*class_id = 0;
@@ -5137,7 +5137,7 @@ networkUnplugBandwidth(virNetworkObjPtr obj,
virNetworkObjSetFloorSum(obj, tmp_floor_sum);
/* return class ID */
- ignore_value(virBitmapClearBit(classIdMap, *class_id));
+ virBitmapClearBit(classIdMap, *class_id);
/* update status file */
if (virNetworkObjSaveStatus(driver->stateDir,
obj, network_driver->xmlopt) < 0) {
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 97bbadb..3520463 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -2017,7 +2017,7 @@ void
virQEMUCapsClear(virQEMUCapsPtr qemuCaps,
virQEMUCapsFlags flag)
{
- ignore_value(virBitmapClearBit(qemuCaps->flags, flag));
+ virBitmapClearBit(qemuCaps->flags, flag);
}
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 2058290..016daed 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -279,7 +279,7 @@ qemuDomainDisableNamespace(virDomainObjPtr vm,
qemuDomainObjPrivatePtr priv = vm->privateData;
if (priv->namespaces) {
- ignore_value(virBitmapClearBit(priv->namespaces, ns));
+ virBitmapClearBit(priv->namespaces, ns);
if (virBitmapIsAllClear(priv->namespaces)) {
virBitmapFree(priv->namespaces);
priv->namespaces = NULL;
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 7d41c19..57a0f1e 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -22475,7 +22475,7 @@ qemuDomainSetGuestVcpus(virDomainPtr dom,
info[i].online = !!state;
info[i].modified = true;
- ignore_value(virBitmapClearBit(map, info[i].id));
+ virBitmapClearBit(map, info[i].id);
}
if (!virBitmapIsAllClear(map)) {
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index d94f2e4..5a1f7cd 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -6455,7 +6455,7 @@ qemuDomainFilterHotplugVcpuEntities(virDomainDefPtr def,
}
/* clear the subthreads */
- ignore_value(virBitmapClearBit(map, i));
+ virBitmapClearBit(map, i);
}
}
diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c
index 068f117..100fcdf 100644
--- a/src/qemu/qemu_migration_params.c
+++ b/src/qemu/qemu_migration_params.c
@@ -1453,8 +1453,7 @@ qemuMigrationCapsCheck(virQEMUDriverPtr driver,
* migration capabilities bitmap makes sure it won't be touched anywhere
* else.
*/
- ignore_value(virBitmapClearBit(priv->migrationCaps,
- QEMU_MIGRATION_CAP_EVENTS));
+ virBitmapClearBit(priv->migrationCaps, QEMU_MIGRATION_CAP_EVENTS);
ret = 0;
diff --git a/src/util/virbitmap.h b/src/util/virbitmap.h
index caafc86..af7ed53 100644
--- a/src/util/virbitmap.h
+++ b/src/util/virbitmap.h
@@ -61,7 +61,7 @@ int virBitmapSetBitExpand(virBitmapPtr bitmap, size_t b)
* Clear bit position @b in @bitmap
*/
int virBitmapClearBit(virBitmapPtr bitmap, size_t b)
- ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT;
+ ATTRIBUTE_NONNULL(1);
int virBitmapClearBitExpand(virBitmapPtr bitmap, size_t b)
ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT;
--
1.8.3.1