From nobody Fri Apr 26 04:11:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1596119782; cv=none; d=zohomail.com; s=zohoarc; b=GUU6Z/RSusH6JdEUGslKWRPKJm+yjcKyJL1C4Jt9aiqb999QndsPp+bOwvTg6hDMwAWzs4DYExGdCwsF4OWc9V4GRqdvExkhDMkmsm2V/s1/ZLNgfRKzfsCZafHagFQneRgj8xee0uQEhS388Cu4obMwdAsVdunTvLGdOU/z94g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596119782; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=QUMbjsAQCSszEiNfmUzAmNu3VxzISt5f3pn6lImYHtc=; b=YxvkEcwhbPQY2yeOqIneEKxiJDlOiaa/UBIJBKnQzr1SFSz9o/YcpBVohhcAdwdejOx4tRJLx/9pJWvtNx/iDQ0x6VwAOjTkgyWVMfg0t82HgoPo3dazmGfHfMumS1Oa1zaDeWw4Qv4j/rwf//5IUGxqzwPIqjGQtvNZ5Jvjgoc= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1596119782711571.6601851312693; Thu, 30 Jul 2020 07:36:22 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-361-zBk9fNo2NCKruHNmC7_67A-1; Thu, 30 Jul 2020 10:36:18 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9F78E800479; Thu, 30 Jul 2020 14:36:12 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 79C4C87B1C; Thu, 30 Jul 2020 14:36:12 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 2195D95A74; Thu, 30 Jul 2020 14:36:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06UERw4I023380 for ; Thu, 30 Jul 2020 10:27:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id 252512028DCC; Thu, 30 Jul 2020 14:27:58 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 076FA2026DFD for ; Thu, 30 Jul 2020 14:27:55 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 908A2800658 for ; Thu, 30 Jul 2020 14:27:55 +0000 (UTC) Received: from relay3.sw.ru (relay.sw.ru [185.231.240.75]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-169--c5_Rcu4MWuLEvsfITHN2g-1; Thu, 30 Jul 2020 10:27:51 -0400 Received: from [172.16.50.220] (helo=vz7.localdomain) by relay3.sw.ru with esmtp (Exim 4.93) (envelope-from ) id 1k19Ww-0004MR-Q9 for libvir-list@redhat.com; Thu, 30 Jul 2020 17:27:34 +0300 X-MC-Unique: zBk9fNo2NCKruHNmC7_67A-1 X-MC-Unique: -c5_Rcu4MWuLEvsfITHN2g-1 From: Nikolay Shirokovskiy To: libvir-list@redhat.com Subject: [PATCH 1/3] batch: don't require checking retvalue for virBitmapSetBit Date: Thu, 30 Jul 2020 17:27:36 +0300 Message-Id: <1596119258-782762-2-git-send-email-nshirokovskiy@virtuozzo.com> In-Reply-To: <1596119258-782762-1-git-send-email-nshirokovskiy@virtuozzo.com> References: <1596119258-782762-1-git-send-email-nshirokovskiy@virtuozzo.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 2 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Nikolay Shirokovskiy --- src/conf/capabilities.c | 2 +- src/conf/checkpoint_conf.c | 2 +- src/conf/domain_addr.c | 6 +++--- src/conf/domain_conf.c | 4 ++-- src/conf/node_device_conf.c | 2 +- src/conf/snapshot_conf.c | 2 +- src/conf/storage_conf.c | 2 +- src/libxl/libxl_capabilities.c | 2 +- src/network/bridge_driver.c | 2 +- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_domain_address.c | 4 ++-- src/qemu/qemu_driver.c | 6 +++--- src/qemu/qemu_hotplug.c | 4 ++-- src/qemu/qemu_migration_cookie.c | 4 ++-- src/qemu/qemu_migration_params.c | 15 +++++++-------- src/qemu/qemu_monitor.c | 2 +- src/qemu/qemu_slirp.c | 2 +- src/test/test_driver.c | 2 +- src/util/virbitmap.h | 2 +- src/util/vircommand.c | 2 +- src/util/virdnsmasq.c | 2 +- src/util/virhostcpu.c | 2 +- src/util/virjson.c | 2 +- src/util/virnetdev.c | 10 +++++----- src/util/virnuma.c | 4 ++-- src/util/virprocess.c | 4 ++-- src/util/virresctrl.c | 2 +- src/util/virstoragefile.c | 2 +- src/vmx/vmx.c | 2 +- tests/qemumonitorjsontest.c | 2 +- tests/testutils.c | 2 +- tests/virbitmaptest.c | 28 ++++++++++++++-------------- tools/virsh-domain.c | 4 ++-- tools/virt-host-validate-common.c | 2 +- 34 files changed, 68 insertions(+), 69 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 610e6e8..7115a88 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -1581,7 +1581,7 @@ virCapabilitiesHostNUMAInitFake(virCapsHostNUMAPtr ca= ps) for (c =3D 0; c < nodeinfo.cores; c++) { g_autoptr(virBitmap) siblings =3D virBitmapNew(ncpus); for (t =3D 0; t < nodeinfo.threads; t++) - ignore_value(virBitmapSetBit(siblings, id + t)); + virBitmapSetBit(siblings, id + t); =20 for (t =3D 0; t < nodeinfo.threads; t++) { if (virHostCPUGetOnline(id, &tmp) < 0) diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c index 1f93595..ac40f86 100644 --- a/src/conf/checkpoint_conf.c +++ b/src/conf/checkpoint_conf.c @@ -351,7 +351,7 @@ virDomainCheckpointAlignDisks(virDomainCheckpointDefPtr= def) disk->name); goto cleanup; } - ignore_value(virBitmapSetBit(map, idx)); + virBitmapSetBit(map, idx); disk->idx =3D idx; =20 if (STRNEQ(disk->name, def->parent.dom->disks[idx]->dst)) { diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 1068cbf..a28fba4 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1694,7 +1694,7 @@ virDomainVirtioSerialAddrReserve(virDomainDefPtr def = G_GNUC_UNUSED, return -1; } =20 - ignore_value(virBitmapSetBit(map, info->addr.vioserial.port)); + virBitmapSetBit(map, info->addr.vioserial.port); =20 return 0; } @@ -2201,7 +2201,7 @@ virDomainUSBAddressSetAddHub(virDomainUSBAddressSetPt= r addrs, hub->info.addr.usb.bus, portStr); goto cleanup; } - ignore_value(virBitmapSetBit(targetHub->portmap, targetPort)); + virBitmapSetBit(targetHub->portmap, targetPort); targetHub->ports[targetPort] =3D newHub; newHub =3D NULL; =20 @@ -2414,7 +2414,7 @@ virDomainUSBAddressReserve(virDomainDeviceInfoPtr inf= o, return -1; } =20 - ignore_value(virBitmapSetBit(targetHub->portmap, targetPort)); + virBitmapSetBit(targetHub->portmap, targetPort); =20 return 0; } diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 386b04b..a067fb4 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2009,7 +2009,7 @@ virDomainDefGetOnlineVcpumap(const virDomainDef *def) =20 for (i =3D 0; i < def->maxvcpus; i++) { if (def->vcpus[i]->online) - ignore_value(virBitmapSetBit(ret, i)); + virBitmapSetBit(ret, i); } =20 return ret; @@ -4483,7 +4483,7 @@ virDomainDefRejectDuplicateControllers(virDomainDefPt= r def) cont->idx); goto cleanup; } - ignore_value(virBitmapSetBit(bitmaps[cont->type], cont->idx)); + virBitmapSetBit(bitmaps[cont->type], cont->idx); } =20 ret =3D 0; diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index c540153..9aa55bd 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -1160,7 +1160,7 @@ virNodeDevCapNetParseXML(xmlXPathContextPtr ctxt, tmp); goto out; } - ignore_value(virBitmapSetBit(net->features, val)); + virBitmapSetBit(net->features, val); VIR_FREE(tmp); } =20 diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 07336e9..68ba35f 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -695,7 +695,7 @@ virDomainSnapshotAlignDisks(virDomainSnapshotDefPtr def, disk->name); goto cleanup; } - ignore_value(virBitmapSetBit(map, idx)); + virBitmapSetBit(map, idx); disk->idx =3D idx; =20 disk_snapshot =3D def->parent.dom->disks[idx]->snapshot; diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index fac5ff7..ca8c697 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1459,7 +1459,7 @@ virStorageVolDefParseXML(virStoragePoolDefPtr pool, (const char*)nodes[i]->name); return NULL; } - ignore_value(virBitmapSetBit(def->target.features, f)); + virBitmapSetBit(def->target.features, f); } VIR_FREE(nodes); } diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index beac8c8..97a5cd0 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -316,7 +316,7 @@ libxlCapsInitNuma(libxl_ctx *ctx, virCapsPtr caps) for (j =3D 0; j < nr_cpus_node[node]; j++) { if (cpus[node][j].socket_id =3D=3D cpu_topo[i].socket && cpus[node][j].core_id =3D=3D cpu_topo[i].core) - ignore_value(virBitmapSetBit(cpus[node][j].siblings, i)); + virBitmapSetBit(cpus[node][j].siblings, i); } } =20 diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 54cedd7..c27a9c4 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -5143,7 +5143,7 @@ networkUnplugBandwidth(virNetworkObjPtr obj, obj, network_driver->xmlopt) < 0) { tmp_floor_sum +=3D ifaceBand->in->floor; virNetworkObjSetFloorSum(obj, tmp_floor_sum); - ignore_value(virBitmapSetBit(classIdMap, *class_id)); + virBitmapSetBit(classIdMap, *class_id); return ret; } /* update rate for non guaranteed NICs */ diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 1a2cb87..97bbadb 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1996,7 +1996,7 @@ void virQEMUCapsSet(virQEMUCapsPtr qemuCaps, virQEMUCapsFlags flag) { - ignore_value(virBitmapSetBit(qemuCaps->flags, flag)); + virBitmapSetBit(qemuCaps->flags, flag); } =20 =20 diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 058cbda..92266fb 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -3063,7 +3063,7 @@ qemuDomainGetMemorySlotMap(const virDomainDef *def) mem =3D def->mems[i]; =20 if (mem->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DIMM) - ignore_value(virBitmapSetBit(ret, mem->info.addr.dimm.slot)); + virBitmapSetBit(ret, mem->info.addr.dimm.slot); } =20 return ret; @@ -3085,7 +3085,7 @@ qemuAssignMemoryDeviceSlot(virDomainMemoryDefPtr mem, return -1; } =20 - ignore_value(virBitmapSetBit(slotmap, nextslot)); + virBitmapSetBit(slotmap, nextslot); mem->info.type =3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DIMM; mem->info.addr.dimm.slot =3D nextslot; =20 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0ad6359..7d41c19 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14412,7 +14412,7 @@ qemuDomainSnapshotCreateInactiveExternal(virQEMUDri= verPtr driver, =20 /* If the target does not exist, we're going to create it possibly= */ if (!virFileExists(snapdisk->src->path)) - ignore_value(virBitmapSetBit(created, i)); + virBitmapSetBit(created, i); =20 if (virCommandRun(cmd, NULL) < 0) goto cleanup; @@ -22336,10 +22336,10 @@ qemuDomainGetGuestVcpusParams(virTypedParameterPt= r *params, } =20 if (info[i].online) - ignore_value(virBitmapSetBit(online, info[i].id)); + virBitmapSetBit(online, info[i].id); =20 if (info[i].offlinable) - ignore_value(virBitmapSetBit(offlinable, info[i].id)); + virBitmapSetBit(offlinable, info[i].id); } =20 #define ADD_BITMAP(name) \ diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 2691233..d94f2e4 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -6157,7 +6157,7 @@ qemuDomainSelectHotplugVcpuEntities(virDomainDefPtr d= ef, goto error; } =20 - ignore_value(virBitmapSetBit(ret, i)); + virBitmapSetBit(ret, i); } } else { *enable =3D false; @@ -6184,7 +6184,7 @@ qemuDomainSelectHotplugVcpuEntities(virDomainDefPtr d= ef, goto error; } =20 - ignore_value(virBitmapSetBit(ret, i)); + virBitmapSetBit(ret, i); } } =20 diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_coo= kie.c index 81b557e..6eaa704 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -1156,11 +1156,11 @@ qemuMigrationCookieCapsXMLParse(xmlXPathContextPtr = ctxt) if ((cap =3D qemuMigrationCapabilityTypeFromString(name)) < 0) VIR_DEBUG("unknown migration capability '%s'", name); else - ignore_value(virBitmapSetBit(caps->supported, cap)); + virBitmapSetBit(caps->supported, cap); =20 if ((automatic =3D virXMLPropString(nodes[i], "auto")) && STREQ(automatic, "yes")) - ignore_value(virBitmapSetBit(caps->automatic, cap)); + virBitmapSetBit(caps->automatic, cap); =20 VIR_FREE(name); VIR_FREE(automatic); diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_par= ams.c index fc28296..068f117 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -234,7 +234,7 @@ qemuMigrationParamsGetAlwaysOnCaps(qemuMigrationParty p= arty) if (!(qemuMigrationParamsAlwaysOn[i].party & party)) continue; =20 - ignore_value(virBitmapSetBit(caps, qemuMigrationParamsAlwaysOn[i].= cap)); + virBitmapSetBit(caps, qemuMigrationParamsAlwaysOn[i].cap); } =20 return caps; @@ -505,7 +505,7 @@ qemuMigrationParamsSetCompression(virTypedParameterPtr = params, default: continue; } - ignore_value(virBitmapSetBit(migParams->caps, cap)); + virBitmapSetBit(migParams->caps, cap); } =20 if ((migParams->params[QEMU_MIGRATION_PARAM_COMPRESS_LEVEL].set || @@ -526,8 +526,7 @@ qemuMigrationParamsSetCompression(virTypedParameterPtr = params, =20 if (!migParams->compMethods && (flags & VIR_MIGRATE_COMPRESSED)) { migParams->compMethods =3D 1ULL << QEMU_MIGRATION_COMPRESS_XBZRLE; - ignore_value(virBitmapSetBit(migParams->caps, - QEMU_MIGRATION_CAP_XBZRLE)); + virBitmapSetBit(migParams->caps, QEMU_MIGRATION_CAP_XBZRLE); } =20 return 0; @@ -553,7 +552,7 @@ qemuMigrationParamsFromFlags(virTypedParameterPtr param= s, flags & qemuMigrationParamsFlagMap[i].flag) { VIR_DEBUG("Enabling migration capability '%s'", qemuMigrationCapabilityTypeToString(cap)); - ignore_value(virBitmapSetBit(migParams->caps, cap)); + virBitmapSetBit(migParams->caps, cap); } } =20 @@ -1197,7 +1196,7 @@ qemuMigrationParamsCheck(virQEMUDriverPtr driver, =20 VIR_DEBUG("Enabling migration capability '%s'", qemuMigrationCapabilityTypeToString(cap)); - ignore_value(virBitmapSetBit(migParams->caps, cap)); + virBitmapSetBit(migParams->caps, cap); } } =20 @@ -1419,7 +1418,7 @@ qemuMigrationCapsCheck(virQEMUDriverPtr driver, if (cap < 0) { VIR_DEBUG("Unknown migration capability: '%s'", *capStr); } else { - ignore_value(virBitmapSetBit(priv->migrationCaps, cap)); + virBitmapSetBit(priv->migrationCaps, cap); VIR_DEBUG("Found migration capability: '%s'", *capStr); } } @@ -1429,7 +1428,7 @@ qemuMigrationCapsCheck(virQEMUDriverPtr driver, if (!migEvent) goto cleanup; =20 - ignore_value(virBitmapSetBit(migEvent, QEMU_MIGRATION_CAP_EVENTS)); + virBitmapSetBit(migEvent, QEMU_MIGRATION_CAP_EVENTS); =20 if (!(json =3D qemuMigrationCapsToJSON(migEvent, migEvent))) goto cleanup; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 637361d..d62d29e 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1942,7 +1942,7 @@ qemuMonitorGetCpuHalted(qemuMonitorPtr mon, =20 for (i =3D 0; i < ncpuentries; i++) { if (cpuentries[i].halted) - ignore_value(virBitmapSetBit(ret, cpuentries[i].qemu_id)); + virBitmapSetBit(ret, cpuentries[i].qemu_id); } =20 cleanup: diff --git a/src/qemu/qemu_slirp.c b/src/qemu/qemu_slirp.c index 3efc34b..b3dba8d 100644 --- a/src/qemu/qemu_slirp.c +++ b/src/qemu/qemu_slirp.c @@ -66,7 +66,7 @@ void qemuSlirpSetFeature(qemuSlirpPtr slirp, qemuSlirpFeature feature) { - ignore_value(virBitmapSetBit(slirp->features, feature)); + virBitmapSetBit(slirp->features, feature); } =20 =20 diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 993f405..2a04ccb 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1364,7 +1364,7 @@ testOpenDefault(virConnectPtr conn) virBitmapPtr siblings =3D virBitmapNew(16); if (!siblings) goto error; - ignore_value(virBitmapSetBit(siblings, i)); + virBitmapSetBit(siblings, i); privconn->cells[i / 8].cpus[(i % 8)].id =3D i; privconn->cells[i / 8].cpus[(i % 8)].socket_id =3D i / 8; privconn->cells[i / 8].cpus[(i % 8)].core_id =3D i % 8; diff --git a/src/util/virbitmap.h b/src/util/virbitmap.h index 7f1a109..caafc86 100644 --- a/src/util/virbitmap.h +++ b/src/util/virbitmap.h @@ -51,7 +51,7 @@ int virBitmapCopy(virBitmapPtr dst, virBitmapPtr src); * Set bit position @b in @bitmap */ int virBitmapSetBit(virBitmapPtr bitmap, size_t b) - ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; + ATTRIBUTE_NONNULL(1); =20 int virBitmapSetBitExpand(virBitmapPtr bitmap, size_t b) ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 5ce69ef..dfc0e11 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -471,7 +471,7 @@ virCommandMassCloseGetFDsLinux(virCommandPtr cmd G_GNUC= _UNUSED, goto cleanup; } =20 - ignore_value(virBitmapSetBit(fds, fd)); + virBitmapSetBit(fds, fd); } =20 if (rc < 0) diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index f60577b..ff1f3d9 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -629,7 +629,7 @@ static void dnsmasqCapsSet(dnsmasqCapsPtr caps, dnsmasqCapsFlags flag) { - ignore_value(virBitmapSetBit(caps->flags, flag)); + virBitmapSetBit(caps->flags, flag); } =20 =20 diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index 6cea755..a8fdc78 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -269,7 +269,7 @@ virHostCPUGetSiblingsList(unsigned int cpu) /* If the file doesn't exist, the threadis its only sibling */ ret =3D virBitmapNew(cpu + 1); if (ret) - ignore_value(virBitmapSetBit(ret, cpu)); + virBitmapSetBit(ret, cpu); } =20 return ret; diff --git a/src/util/virjson.c b/src/util/virjson.c index 6921ecc..cd6cc9d 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -1263,7 +1263,7 @@ virJSONValueGetArrayAsBitmap(const virJSONValue *val, =20 /* second pass sets the correct bits in the map */ for (i =3D 0; i < val->data.array.nvalues; i++) - ignore_value(virBitmapSetBit(*bitmap, elems[i])); + virBitmapSetBit(*bitmap, elems[i]); =20 return 0; } diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 41dc5bd..1705311 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -2828,7 +2828,7 @@ virNetDevRDMAFeature(const char *ifname, =20 if (virFileReadAll(ib_devpath, RESOURCE_FILE_LEN, &ib_res_buf) > 0= && STREQ(eth_res_buf, ib_res_buf)) { - ignore_value(virBitmapSetBit(*out, VIR_NET_DEV_FEAT_RDMA)); + virBitmapSetBit(*out, VIR_NET_DEV_FEAT_RDMA); break; } } @@ -2943,7 +2943,7 @@ virNetDevGetEthtoolFeatures(virBitmapPtr bitmap, for (i =3D 0; i < G_N_ELEMENTS(ethtool_cmds); i++) { cmd.cmd =3D ethtool_cmds[i].cmd; if (virNetDevFeatureAvailable(fd, ifr, &cmd)) - ignore_value(virBitmapSetBit(bitmap, ethtool_cmds[i].feat)); + virBitmapSetBit(bitmap, ethtool_cmds[i].feat); } =20 # if HAVE_DECL_ETHTOOL_GFLAGS @@ -2951,7 +2951,7 @@ virNetDevGetEthtoolFeatures(virBitmapPtr bitmap, if (virNetDevFeatureAvailable(fd, ifr, &cmd)) { for (i =3D 0; i < G_N_ELEMENTS(flags); i++) { if (cmd.data & flags[i].cmd) - ignore_value(virBitmapSetBit(bitmap, flags[i].feat)); + virBitmapSetBit(bitmap, flags[i].feat); } } # endif @@ -3103,7 +3103,7 @@ virNetDevSwitchdevFeature(const char *ifname, =20 if (tb[DEVLINK_ATTR_ESWITCH_MODE] && *(int *)RTA_DATA(tb[DEVLINK_ATTR_ESWITCH_MODE]) =3D=3D DEVLINK_ESW= ITCH_MODE_SWITCHDEV) { - ignore_value(virBitmapSetBit(*out, VIR_NET_DEV_FEAT_SWITCHDEV)); + virBitmapSetBit(*out, VIR_NET_DEV_FEAT_SWITCHDEV); } =20 ret =3D 0; @@ -3159,7 +3159,7 @@ virNetDevGetEthtoolGFeatures(virBitmapPtr bitmap, g_cmd->cmd =3D ETHTOOL_GFEATURES; g_cmd->size =3D GFEATURES_SIZE; if (virNetDevGFeatureAvailable(fd, ifr, g_cmd)) - ignore_value(virBitmapSetBit(bitmap, VIR_NET_DEV_FEAT_TXUDPTNL)); + virBitmapSetBit(bitmap, VIR_NET_DEV_FEAT_TXUDPTNL); return 0; } # else diff --git a/src/util/virnuma.c b/src/util/virnuma.c index eeca438..1220743 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -286,7 +286,7 @@ virNumaGetNodeCPUs(int node, =20 for (i =3D 0; i < max_n_cpus; i++) { if (MASK_CPU_ISSET(mask, i)) { - ignore_value(virBitmapSetBit(cpumap, i)); + virBitmapSetBit(cpumap, i); ncpus++; } } @@ -1035,7 +1035,7 @@ virNumaGetHostMemoryNodeset(void) =20 /* if we can't detect NUMA node size assume that it's present */ if (virNumaGetNodeMemory(i, &nodesize, NULL) < 0 || nodesize > 0) - ignore_value(virBitmapSetBit(nodeset, i)); + virBitmapSetBit(nodeset, i); } =20 return nodeset; diff --git a/src/util/virprocess.c b/src/util/virprocess.c index a9afa2e..5ff02fe 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -520,7 +520,7 @@ virProcessGetAffinity(pid_t pid) for (i =3D 0; i < ncpus; i++) { /* coverity[overrun-local] */ if (CPU_ISSET_S(i, masklen, mask)) - ignore_value(virBitmapSetBit(ret, i)); + virBitmapSetBit(ret, i); } =20 cleanup: @@ -573,7 +573,7 @@ virProcessGetAffinity(pid_t pid) =20 for (i =3D 0; i < sizeof(mask) * 8; i++) if (CPU_ISSET(i, &mask)) - ignore_value(virBitmapSetBit(ret, i)); + virBitmapSetBit(ret, i); =20 return ret; } diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index 3563fc5..5a947c7 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -2081,7 +2081,7 @@ virResctrlAllocFindUnused(virResctrlAllocPtr alloc, return -1; =20 for (i =3D last_pos; i < last_pos + need_bits; i++) - ignore_value(virBitmapSetBit(a_mask, i)); + virBitmapSetBit(a_mask, i); =20 if (virResctrlAllocUpdateMask(alloc, level, type, cache, a_mask) < 0) goto cleanup; diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 00d8e16..17472f2 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -843,7 +843,7 @@ qcow2GetFeatures(virBitmapPtr *features, bits =3D virReadBufInt64BE(buf + QCOW2v3_HDR_FEATURES_COMPATIBLE); for (i =3D 0; i < QCOW2_COMPATIBLE_FEATURE_LAST; i++) { if (bits & ((uint64_t) 1 << i)) - ignore_value(virBitmapSetBit(feat, qcow2CompatibleFeatureArray= [i])); + virBitmapSetBit(feat, qcow2CompatibleFeatureArray[i]); } =20 *features =3D feat; diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index a123a88..16bd30b 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -1547,7 +1547,7 @@ virVMXParseConfig(virVMXContext *ctx, goto cleanup; } =20 - ignore_value(virBitmapSetBit(def->cpumask, number)); + virBitmapSetBit(def->cpumask, number); } } =20 diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 741e36a..d5f205b 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -2259,7 +2259,7 @@ testQemuMonitorJSONqemuMonitorJSONGetMigrationCapabil= ities(const void *opaque) if (!bitmap) goto cleanup; =20 - ignore_value(virBitmapSetBit(bitmap, QEMU_MIGRATION_CAP_XBZRLE)); + virBitmapSetBit(bitmap, QEMU_MIGRATION_CAP_XBZRLE); if (!(json =3D qemuMigrationCapsToJSON(bitmap, bitmap))) goto cleanup; =20 diff --git a/tests/testutils.c b/tests/testutils.c index a1cd093..be9347e 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -987,7 +987,7 @@ virTestCapsBuildNUMATopology(int seq) if (!(cell_cpus[core_id].siblings =3D virBitmapNew(MAX_CPUS_IN_CELL))) goto error; - ignore_value(virBitmapSetBit(cell_cpus[core_id].siblings, id)); + virBitmapSetBit(cell_cpus[core_id].siblings, id); } id++; =20 diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c index 1c7dc1d..0bc7c87 100644 --- a/tests/virbitmaptest.c +++ b/tests/virbitmaptest.c @@ -156,7 +156,7 @@ test3(const void *data G_GNUC_UNUSED) goto error; =20 for (i =3D 0; i < size; i++) - ignore_value(virBitmapSetBit(bitmap, i)); + virBitmapSetBit(bitmap, i); =20 if (!virBitmapIsAllSet(bitmap)) goto error; @@ -321,8 +321,8 @@ test5(const void *v G_GNUC_UNUSED) if (virBitmapNextSetBit(bitmap, j) > 0) goto error; =20 - ignore_value(virBitmapSetBit(bitmap, 2)); - ignore_value(virBitmapSetBit(bitmap, 15)); + virBitmapSetBit(bitmap, 2); + virBitmapSetBit(bitmap, 15); =20 if (virBitmapToData(bitmap, &data2, &len2) < 0) goto error; @@ -376,7 +376,7 @@ test6(const void *v G_GNUC_UNUSED) =20 VIR_FREE(str); =20 - ignore_value(virBitmapSetBit(bitmap, 0)); + virBitmapSetBit(bitmap, 0); str =3D virBitmapFormat(bitmap); if (!str) goto error; @@ -386,8 +386,8 @@ test6(const void *v G_GNUC_UNUSED) =20 VIR_FREE(str); =20 - ignore_value(virBitmapSetBit(bitmap, 4)); - ignore_value(virBitmapSetBit(bitmap, 5)); + virBitmapSetBit(bitmap, 4); + virBitmapSetBit(bitmap, 5); str =3D virBitmapFormat(bitmap); if (!str) goto error; @@ -397,7 +397,7 @@ test6(const void *v G_GNUC_UNUSED) =20 VIR_FREE(str); =20 - ignore_value(virBitmapSetBit(bitmap, 6)); + virBitmapSetBit(bitmap, 6); str =3D virBitmapFormat(bitmap); if (!str) goto error; @@ -407,10 +407,10 @@ test6(const void *v G_GNUC_UNUSED) =20 VIR_FREE(str); =20 - ignore_value(virBitmapSetBit(bitmap, 13)); - ignore_value(virBitmapSetBit(bitmap, 14)); - ignore_value(virBitmapSetBit(bitmap, 15)); - ignore_value(virBitmapSetBit(bitmap, 16)); + virBitmapSetBit(bitmap, 13); + virBitmapSetBit(bitmap, 14); + virBitmapSetBit(bitmap, 15); + virBitmapSetBit(bitmap, 16); str =3D virBitmapFormat(bitmap); if (!str) goto error; @@ -420,8 +420,8 @@ test6(const void *v G_GNUC_UNUSED) =20 VIR_FREE(str); =20 - ignore_value(virBitmapSetBit(bitmap, 62)); - ignore_value(virBitmapSetBit(bitmap, 63)); + virBitmapSetBit(bitmap, 62); + virBitmapSetBit(bitmap, 63); str =3D virBitmapFormat(bitmap); if (!str) goto error; @@ -455,7 +455,7 @@ test7(const void *v G_GNUC_UNUSED) if (virBitmapIsAllSet(bitmap)) goto error; =20 - ignore_value(virBitmapSetBit(bitmap, 1)); + virBitmapSetBit(bitmap, 1); if (virBitmapIsAllSet(bitmap)) goto error; =20 diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index aaf3b9a..60dcce3 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6845,7 +6845,7 @@ virshDomainGetVcpuBitmap(vshControl *ctl, if ((nnodes =3D virXPathNodeSet("/domain/vcpus/vcpu", ctxt, &nodes)) <= =3D 0) { /* if the specific vcpu state is missing provide a fallback */ for (i =3D 0; i < curvcpus; i++) - ignore_value(virBitmapSetBit(ret, i)); + virBitmapSetBit(ret, i); =20 goto cleanup; } @@ -6858,7 +6858,7 @@ virshDomainGetVcpuBitmap(vshControl *ctl, continue; =20 if (STREQ(online, "yes")) - ignore_value(virBitmapSetBit(ret, vcpuid)); + virBitmapSetBit(ret, vcpuid); =20 VIR_FREE(online); } diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-c= ommon.c index f68c9c7..45c7e24 100644 --- a/tools/virt-host-validate-common.c +++ b/tools/virt-host-validate-common.c @@ -238,7 +238,7 @@ virBitmapPtr virHostValidateGetCPUFlags(void) int value; =20 if ((value =3D virHostValidateCPUFlagTypeFromString(tokens[i])= ) >=3D 0) - ignore_value(virBitmapSetBit(flags, value)); + virBitmapSetBit(flags, value); } =20 virStringListFreeCount(tokens, ntokens); --=20 1.8.3.1 From nobody Fri Apr 26 04:11:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1596119677; cv=none; d=zohomail.com; s=zohoarc; b=VY4MPI2ffyA+JSq/VrUfapCwa249H4gPYhENK/iDs/7U21ypJVNpCDpjGFEFdIf1vxxDmBMIrd45/RUtJYMhbgwcVisfDO//beq+pEZNj9gGYNnnPgII74hnj7/L9TXAikXuknSaBnrVCHZZ2IcQn1bYKYpH0kTUYBUJyp6y+wo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596119677; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=rbwhZHHzt+jufEt7fWW2mVYjLOtRY9tWFrzymhQjbX0=; b=H6Sj6EIiXv2sNpVPP6OikDMW67rivk9DNhpXyhBoNWXe11I3841ZP72+ZVby4qgDk30fIRGkOn/gimC6SndCC1hxF/CtamGNXTtsT1ssPcnORsQKMVtCq/VzMh9YFV0DHlKHA9PjKxix7nqjJgiHwgmXQQJreM2gfgq4hP+J1cA= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1596119677460912.9743053109999; Thu, 30 Jul 2020 07:34:37 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-145-RBrVqXvvNI2KynlcSGC-Fg-1; Thu, 30 Jul 2020 10:34:33 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D217A106B204; Thu, 30 Jul 2020 14:34:25 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B10701C6; Thu, 30 Jul 2020 14:34:25 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 75EC39A0E3; Thu, 30 Jul 2020 14:34:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06UERv41023375 for ; Thu, 30 Jul 2020 10:27:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id AE8E17D28B; Thu, 30 Jul 2020 14:27:57 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9B341FDCC9 for ; Thu, 30 Jul 2020 14:27:53 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 95B77805B00 for ; Thu, 30 Jul 2020 14:27:53 +0000 (UTC) Received: from relay3.sw.ru (relay.sw.ru [185.231.240.75]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-210-zyUJTYIFPQ-Oa-JPUQG-7w-1; Thu, 30 Jul 2020 10:27:50 -0400 Received: from [172.16.50.220] (helo=vz7.localdomain) by relay3.sw.ru with esmtp (Exim 4.93) (envelope-from ) id 1k19Ww-0004MR-RT for libvir-list@redhat.com; Thu, 30 Jul 2020 17:27:34 +0300 X-MC-Unique: RBrVqXvvNI2KynlcSGC-Fg-1 X-MC-Unique: zyUJTYIFPQ-Oa-JPUQG-7w-1 From: Nikolay Shirokovskiy To: libvir-list@redhat.com Subject: [PATCH 2/3] batch: don't require checking retvalue for virBitmapClearBit Date: Thu, 30 Jul 2020 17:27:37 +0300 Message-Id: <1596119258-782762-3-git-send-email-nshirokovskiy@virtuozzo.com> In-Reply-To: <1596119258-782762-1-git-send-email-nshirokovskiy@virtuozzo.com> References: <1596119258-782762-1-git-send-email-nshirokovskiy@virtuozzo.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 2 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Nikolay Shirokovskiy --- 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; =20 - ignore_value(virBitmapClearBit(targetHub->portmap, targetPort)); + virBitmapClearBit(targetHub->portmap, targetPort); =20 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, =20 /* 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 =3D 0; i < def->niothreadids; i++) - ignore_value(virBitmapClearBit(thrmap, - def->iothreadids[i]->iothread_id)); + virBitmapClearBit(thrmap, def->iothreadids[i]->iothread_id); =20 /* 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->xml= opt) < 0) { - ignore_value(virBitmapClearBit(classIdMap, next_id)); + virBitmapClearBit(classIdMap, next_id); tmp_floor_sum -=3D ifaceBand->in->floor; virNetworkObjSetFloorSum(obj, tmp_floor_sum); *class_id =3D 0; @@ -5137,7 +5137,7 @@ networkUnplugBandwidth(virNetworkObjPtr obj, virNetworkObjSetFloorSum(obj, tmp_floor_sum); =20 /* 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); } =20 =20 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 =3D vm->privateData; =20 if (priv->namespaces) { - ignore_value(virBitmapClearBit(priv->namespaces, ns)); + virBitmapClearBit(priv->namespaces, ns); if (virBitmapIsAllClear(priv->namespaces)) { virBitmapFree(priv->namespaces); priv->namespaces =3D 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 =3D !!state; info[i].modified =3D true; =20 - ignore_value(virBitmapClearBit(map, info[i].id)); + virBitmapClearBit(map, info[i].id); } =20 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 d= ef, } =20 /* clear the subthreads */ - ignore_value(virBitmapClearBit(map, i)); + virBitmapClearBit(map, i); } } =20 diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_par= ams.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 anywhe= re * else. */ - ignore_value(virBitmapClearBit(priv->migrationCaps, - QEMU_MIGRATION_CAP_EVENTS)); + virBitmapClearBit(priv->migrationCaps, QEMU_MIGRATION_CAP_EVENTS); =20 ret =3D 0; =20 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); =20 int virBitmapClearBitExpand(virBitmapPtr bitmap, size_t b) ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; --=20 1.8.3.1 From nobody Fri Apr 26 04:11:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1596119785; cv=none; d=zohomail.com; s=zohoarc; b=GAHEzdOpG6LiKNdVq5rn1rGeSUGgaFM3htsC1X/tkY7SarwaCPs2eYrNv536HS/VqSIAcXeOONpzNrvOTnQufyW9Yh8F+oK6vtU+vbxipAPvkRkGTOY3wCOuKpXDyiEvuLxipWFV1+uccH8Di9KxgmZv5Nd4cAN1s1A7N65rGrg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596119785; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=gZK5g54tJnOi8EWD+8pyu4DGVD4Y0BqGJKfH3S1SbVw=; b=LahH/Y/VkFOcPBBUhunusKGVSUsGbbUMs23zjHySI6T1TXOc79Dxf5CYdPIp6pjRygtOKUfKi82kcEB2bHe+hiYEzKEkXkw/Et9ZWeNCoQOTnZ2hRvEI3520U7i85mlEupCy40BxyXEZtYrpve2KQdXZ/aTq91dfpuwBHeyCjfg= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1596119785584785.6548638354393; Thu, 30 Jul 2020 07:36:25 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-360-uo8u4W89MOmUVoTd6kEA-g-1; Thu, 30 Jul 2020 10:36:22 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A41BD1DF8; Thu, 30 Jul 2020 14:36:16 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 82F4C5DA72; Thu, 30 Jul 2020 14:36:16 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 504BD95A87; Thu, 30 Jul 2020 14:36:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06UES1CF023487 for ; Thu, 30 Jul 2020 10:28:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 80A26111142D; Thu, 30 Jul 2020 14:28:01 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7B49E111143A for ; Thu, 30 Jul 2020 14:27:59 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 18F9A805C1C for ; Thu, 30 Jul 2020 14:27:59 +0000 (UTC) Received: from relay3.sw.ru (relay.sw.ru [185.231.240.75]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-265-w2FP_cPsMdKP4XHsKN1MVg-1; Thu, 30 Jul 2020 10:27:50 -0400 Received: from [172.16.50.220] (helo=vz7.localdomain) by relay3.sw.ru with esmtp (Exim 4.93) (envelope-from ) id 1k19Ww-0004MR-Sh for libvir-list@redhat.com; Thu, 30 Jul 2020 17:27:34 +0300 X-MC-Unique: uo8u4W89MOmUVoTd6kEA-g-1 X-MC-Unique: w2FP_cPsMdKP4XHsKN1MVg-1 From: Nikolay Shirokovskiy To: libvir-list@redhat.com Subject: [PATCH 3/3] batch: don't require checking retvalue for virBitmapGetBit Date: Thu, 30 Jul 2020 17:27:38 +0300 Message-Id: <1596119258-782762-4-git-send-email-nshirokovskiy@virtuozzo.com> In-Reply-To: <1596119258-782762-1-git-send-email-nshirokovskiy@virtuozzo.com> References: <1596119258-782762-1-git-send-email-nshirokovskiy@virtuozzo.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 2 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Nikolay Shirokovskiy --- src/qemu/qemu_migration_cookie.c | 4 ++-- src/qemu/qemu_migration_params.c | 10 +++++----- src/util/virbitmap.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_coo= kie.c index 6eaa704..2c95c31 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -756,8 +756,8 @@ qemuMigrationCookieCapsXMLFormat(virBufferPtr buf, bool supported =3D false; bool automatic =3D false; =20 - ignore_value(virBitmapGetBit(caps->supported, cap, &supported)); - ignore_value(virBitmapGetBit(caps->automatic, cap, &automatic)); + virBitmapGetBit(caps->supported, cap, &supported); + virBitmapGetBit(caps->automatic, cap, &automatic); if (supported) { virBufferAsprintf(buf, "\n", qemuMigrationCapabilityTypeToString(cap), diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_par= ams.c index 100fcdf..572c4b1 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -786,11 +786,11 @@ qemuMigrationCapsToJSON(virBitmapPtr caps, bool supported =3D false; bool state =3D false; =20 - ignore_value(virBitmapGetBit(caps, bit, &supported)); + virBitmapGetBit(caps, bit, &supported); if (!supported) continue; =20 - ignore_value(virBitmapGetBit(states, bit, &state)); + virBitmapGetBit(states, bit, &state); =20 cap =3D virJSONValueNewObject(); =20 @@ -1164,7 +1164,7 @@ qemuMigrationParamsCheck(virQEMUDriverPtr driver, for (cap =3D 0; cap < QEMU_MIGRATION_CAP_LAST; cap++) { bool state =3D false; =20 - ignore_value(virBitmapGetBit(migParams->caps, cap, &state)); + virBitmapGetBit(migParams->caps, cap, &state); =20 if (state && !qemuMigrationCapsGet(vm, cap)) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, @@ -1183,7 +1183,7 @@ qemuMigrationParamsCheck(virQEMUDriverPtr driver, bool remote =3D false; =20 if (remoteCaps) - ignore_value(virBitmapGetBit(remoteCaps, cap, &remote)= ); + virBitmapGetBit(remoteCaps, cap, &remote); =20 if (!remote) { VIR_DEBUG("Not enabling migration capability '%s'; it = is " @@ -1473,7 +1473,7 @@ qemuMigrationCapsGet(virDomainObjPtr vm, bool enabled =3D false; =20 if (priv->migrationCaps) - ignore_value(virBitmapGetBit(priv->migrationCaps, cap, &enabled)); + virBitmapGetBit(priv->migrationCaps, cap, &enabled); =20 return enabled; } diff --git a/src/util/virbitmap.h b/src/util/virbitmap.h index af7ed53..c0b95ad 100644 --- a/src/util/virbitmap.h +++ b/src/util/virbitmap.h @@ -75,7 +75,7 @@ bool virBitmapIsBitSet(virBitmapPtr bitmap, size_t b) * Get setting of bit position @b in @bitmap and store in @result */ int virBitmapGetBit(virBitmapPtr bitmap, size_t b, bool *result) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3) G_GNUC_WARN_UNUSED_RESULT; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3); =20 virBitmapPtr virBitmapNewString(const char *string) --=20 1.8.3.1