From nobody Mon Feb 9 15:11:16 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=1617285317; cv=none; d=zohomail.com; s=zohoarc; b=B+CbbyFGbRzjJAwHCSMyTPn186m3q2wUR7C2etpO6x+aERpCVhZ3bWywXZ9CvquPvwac0cgE9VaG28/mROR8wO/maqft32BM/4ifzAnaKeOIdHcS7B1YvfdsmizXi5EFq/yY3ake+fWigSk7UBiO3OngTt7VxdJ1nflAw7jP3fM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617285317; 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=JPO5THN+rf9FmtoA57fdO8mn5rJrObS4mWp3Y1uQ638=; b=bPvvLLzlbCfuCnf+xR1QI7IjTBxSMCo5KkP2TuTQmfCq73MczUkzb1rzBAKZCbU4yYaIPw3icwhfU60UYyMLrMNL6Gd4JNgu2IuFPfgAPP/X+SajzIrYSf5HhyooFaXXF1zk7HXBWSnkIvZUn7PxfMZbUNzKiNIFtMixtXhmy7I= 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 1617285317092631.0148611862584; Thu, 1 Apr 2021 06:55:17 -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-211-4miWshGhOAqiGEJtRs2wcg-1; Thu, 01 Apr 2021 09:55:12 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9A2AD8B5BB9; Thu, 1 Apr 2021 13:54:15 +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 CBB181048120; Thu, 1 Apr 2021 13:54:14 +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 7B72B4A701; Thu, 1 Apr 2021 13:54:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 131DsCYk023551 for ; Thu, 1 Apr 2021 09:54:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id B3E755C239; Thu, 1 Apr 2021 13:54:12 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 021875C237 for ; Thu, 1 Apr 2021 13:54:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617285316; 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=JPO5THN+rf9FmtoA57fdO8mn5rJrObS4mWp3Y1uQ638=; b=cbjjv+pvRxnZ641+RAKllVv15KWrSQc60J1VbjivKIDWkpgB7+7+jbDDNKM+26JZ9OEkyp FdEE+ZEfvZz92ZXo0o+APA2y/uLl3a7bcYYASlzHjDD+j3aVPjcVKocYG6qVidPeryXfKc aolZJdPnpiu+1DiJJTEMFoaAjcMMRRo= X-MC-Unique: 4miWshGhOAqiGEJtRs2wcg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 27/39] virResctrlAllocNewFromInfo: Restrict variable scope and use automatic freeing Date: Thu, 1 Apr 2021 15:52:26 +0200 Message-Id: <6f7a7a81a367a46cd71f059f6dd142e333fbbcc3.1617285119.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.84 on 10.5.11.22 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" Move variables into the loop which uses them and use automatic freeing for temporarily allocated variables. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/util/virresctrl.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index fbc8e9c766..5e7c391524 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -1811,27 +1811,26 @@ static virResctrlAllocPtr virResctrlAllocNewFromInfo(virResctrlInfoPtr info) { size_t i =3D 0; - size_t j =3D 0; - size_t k =3D 0; virResctrlAllocPtr ret =3D virResctrlAllocNew(); - virBitmapPtr mask =3D NULL; if (!ret) return NULL; for (i =3D 0; i < info->nlevels; i++) { virResctrlInfoPerLevelPtr i_level =3D info->levels[i]; + size_t j =3D 0; if (!i_level) continue; for (j =3D 0; j < VIR_CACHE_TYPE_LAST; j++) { virResctrlInfoPerTypePtr i_type =3D i_level->types[j]; + g_autoptr(virBitmap) mask =3D NULL; + size_t k =3D 0; if (!i_type) continue; - virBitmapFree(mask); mask =3D virBitmapNew(i_type->bits); virBitmapSetAll(mask); @@ -1856,7 +1855,6 @@ virResctrlAllocNewFromInfo(virResctrlInfoPtr info) } cleanup: - virBitmapFree(mask); return ret; error: virObjectUnref(ret); --=20 2.29.2