From nobody Sun Feb 8 20:53:37 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1601624629; cv=none; d=zohomail.com; s=zohoarc; b=ROhSSIVLMgkAkUaL9fX2BY4H90zfrGgW5GehQ6HuSCA66ST0Iu/kMKs9rq8IOHnYCufVZS1wkXESauUAZarS+kMGEAumwTym8LCQVBqzDEI7qqYgtPkinMQ/KUkSo0cIh3nzAVPzDmDqrNCH/HSeOgp/8CiOwHdhfY5LoV4kMSs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601624628; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=kcilsRZ+/aXouqcBzG4CIjN7yyhuFrRmVz7dzVISEeg=; b=nBXOaj+r+4tQp6h7A3BdI/KIQsu60UD4M/kP9Q+h0j3iBtHj0yIDV8z6/gdfenci5Nj0OxiY5goOSJ5TiWUIY4gOYqFJZ+rgQWNe+PSPklqNeROz6av5ZUGsu+480ZPDRXQiNt1M/H8pQVV49AaUTF5RyK1Sbrwl5loiLhUXxgM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 160162462899258.19128023291785; Fri, 2 Oct 2020 00:43:48 -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-345-dzQYF7zUPuyugfXFNkSZAQ-1; Fri, 02 Oct 2020 03:43:44 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EBF96803F5D; Fri, 2 Oct 2020 07:43:38 +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 CB43873685; Fri, 2 Oct 2020 07:43:38 +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 9A97444A66; Fri, 2 Oct 2020 07:43:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0927hRe6004219 for ; Fri, 2 Oct 2020 03:43:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id 27A821972A; Fri, 2 Oct 2020 07:43:27 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7ACC719648 for ; Fri, 2 Oct 2020 07:43:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601624626; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=kcilsRZ+/aXouqcBzG4CIjN7yyhuFrRmVz7dzVISEeg=; b=OOXXmNxmxEDr+nXH0VYHUbFhIDWMk6gsahyNO0u8KhTrlUSCDaQT4045+gt9ujNh2aQfir VXW9FjenPpPAUfDwP0G+OJCVuzAa7NPQ3HkSe9I8A8lJ27iGej+qnWwBgZy70tYgd3qyUd N0+rAos9U+BCLR1X9B0ZuABzZAbTAIA= X-MC-Unique: dzQYF7zUPuyugfXFNkSZAQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 11/15] util: bitmap: Remove virBitmapNewQuiet Date: Fri, 2 Oct 2020 09:43:05 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" We no longer report any errors so all callers can be replaced by virBitmapNew. Additionally virBitmapNEw can't return NULL now so error handling is not necessary. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/libvirt_private.syms | 1 - src/util/virbitmap.c | 25 ++----------------------- src/util/virbitmap.h | 1 - src/util/virjson.c | 3 +-- tools/virt-host-validate-common.c | 4 +--- 5 files changed, 4 insertions(+), 30 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 4e66385bab..185f120f6b 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1684,7 +1684,6 @@ virBitmapNew; virBitmapNewCopy; virBitmapNewData; virBitmapNewEmpty; -virBitmapNewQuiet; virBitmapNewString; virBitmapNextClearBit; virBitmapNextSetBit; diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index a49019f884..5d224a8def 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -50,7 +50,7 @@ struct _virBitmap { /** - * virBitmapNewQuiet: + * virBitmapNew: * @size: number of bits * * Allocate a bitmap capable of containing @size bits. @@ -58,7 +58,7 @@ struct _virBitmap { * Returns a pointer to the allocated bitmap. */ virBitmapPtr -virBitmapNewQuiet(size_t size) +virBitmapNew(size_t size) { virBitmapPtr bitmap; size_t sz; @@ -84,27 +84,6 @@ virBitmapNewQuiet(size_t size) } -/** - * virBitmapNew: - * @size: number of bits - * - * Allocate a bitmap capable of containing @size bits. - * - * Returns a pointer to the allocated bitmap or NULL if either memory cann= ot be - * allocated or size is 0. Reports libvirt errors. - */ -virBitmapPtr -virBitmapNew(size_t size) -{ - virBitmapPtr ret; - - if (!(ret =3D virBitmapNewQuiet(size))) - virReportOOMError(); - - return ret; -} - - /** * virBitmapNewEmpty: * diff --git a/src/util/virbitmap.h b/src/util/virbitmap.h index 615ec6e4af..57264fef0e 100644 --- a/src/util/virbitmap.h +++ b/src/util/virbitmap.h @@ -32,7 +32,6 @@ typedef virBitmap *virBitmapPtr; /* * Allocate a bitmap capable of containing @size bits. */ -virBitmapPtr virBitmapNewQuiet(size_t size) G_GNUC_WARN_UNUSED_RESULT; virBitmapPtr virBitmapNew(size_t size) G_GNUC_WARN_UNUSED_RESULT; virBitmapPtr virBitmapNewEmpty(void) G_GNUC_WARN_UNUSED_RESULT; diff --git a/src/util/virjson.c b/src/util/virjson.c index ba43d6b667..a4fc9e990e 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -1257,8 +1257,7 @@ virJSONValueGetArrayAsBitmap(const virJSONValue *val, maxelem =3D elems[i]; } - if (!(*bitmap =3D virBitmapNewQuiet(maxelem + 1))) - return -1; + *bitmap =3D virBitmapNew(maxelem + 1); /* second pass sets the correct bits in the map */ for (i =3D 0; i < val->data.array.nvalues; i++) diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-c= ommon.c index e0e22a133a..c3784bb91d 100644 --- a/tools/virt-host-validate-common.c +++ b/tools/virt-host-validate-common.c @@ -196,8 +196,7 @@ virBitmapPtr virHostValidateGetCPUFlags(void) if (!(fp =3D fopen("/proc/cpuinfo", "r"))) return NULL; - if (!(flags =3D virBitmapNewQuiet(VIR_HOST_VALIDATE_CPU_FLAG_LAST))) - goto cleanup; + flags =3D virBitmapNew(VIR_HOST_VALIDATE_CPU_FLAG_LAST); do { char line[1024]; @@ -245,7 +244,6 @@ virBitmapPtr virHostValidateGetCPUFlags(void) virStringListFreeCount(tokens, ntokens); } while (1); - cleanup: VIR_FORCE_FCLOSE(fp); return flags; --=20 2.26.2