From nobody Mon Feb 9 09:28:52 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1628075039; cv=none; d=zohomail.com; s=zohoarc; b=aPWu1dwKLAEHUk/jTRxbZhpqV/n0PSrLdTVHAzDhQLptOLdmOqyVYMhUpmMnDHFXehcz7Y7xKuby5K70874IC6JRHYFSFHy2FyW4ItlE4NWqXYaPcAtBH9B5F18x6pR0Fi4wWptuereV50W/3E6rxoIvxNS2DAie7W/YsL4jmMg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628075039; 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=fcLKluAibg4QFrZBGd/1PelF5nBm+agm2wO+8fzQC64=; b=MBZt6Envp/GNecbMCfO1tm75PLrmED674bc2MJq+y40fSq9gcz/sir6ayBNVlDSIlLO7BlaLGqrhdgwwRdwmPQIquIn5KjYcws8G+qlRS+RPjfvMAF3B6n77zZA1bOj7Oq6D87QxXWijdk54zSsOFBUjS3tJHFLDhtBGj2/W1FU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1628075039257485.10742534735266; Wed, 4 Aug 2021 04:03:59 -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-38-0oD0234hO4OSz8CddKvUXw-1; Wed, 04 Aug 2021 07:03:56 -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 8A9661084F64; Wed, 4 Aug 2021 11:03:49 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3B95F29676; Wed, 4 Aug 2021 11:03:49 +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 02DB0181A2AA; Wed, 4 Aug 2021 11:03:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 174B3HF1014344 for ; Wed, 4 Aug 2021 07:03:17 -0400 Received: by smtp.corp.redhat.com (Postfix) id 30ED317B73; Wed, 4 Aug 2021 11:03:17 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7BE095D9DC for ; Wed, 4 Aug 2021 11:03:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628075038; 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=fcLKluAibg4QFrZBGd/1PelF5nBm+agm2wO+8fzQC64=; b=dONFGeV/umCl/NC6PMQITpwPcTj2HB0s1UaNlDpKrmHWXHDVR8yiK0Vc9wJMAiAIYtHbBw O+qmrnXJ06m6WlNga0VohNGJMqQBWhrXO2AM8gw7lUmEdAEJ30xQ8W+b0T6ttmPwanPNO2 NLy3hpLrF4ORVmOmIm+wKtipsUARo2c= X-MC-Unique: 0oD0234hO4OSz8CddKvUXw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 22/23] virStorageBackendLogicalParseVolExtents: Move 'extents' inside the loop Date: Wed, 4 Aug 2021 13:02:42 +0200 Message-Id: <3a5cd8810df61b81c29cc6132097fb6790d75a86.1628074874.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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 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) X-ZM-MESSAGEID: 1628075039624100002 Content-Type: text/plain; charset="utf-8" It's used only inside the loop filling the extents, move it there and restructure the code so that 'extent.path' doesn't have to be freed. Signed-off-by: Peter Krempa --- src/storage/storage_backend_logical.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_ba= ckend_logical.c index cffa2c8849..90e7c9e41d 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -128,11 +128,8 @@ virStorageBackendLogicalParseVolExtents(virStorageVolD= ef *vol, unsigned long long offset; unsigned long long size; unsigned long long length; - virStorageVolSourceExtent extent; g_autofree char *regex =3D NULL; - memset(&extent, 0, sizeof(extent)); - /* Assume 1 extent (the regex for 'devices' is "(\\S+)") and only * check the 'stripes' field if we have a striped, mirror, or one of * the raid (raid1, raid4, raid5*, raid6*, or raid10) segtypes in which @@ -189,11 +186,12 @@ virStorageBackendLogicalParseVolExtents(virStorageVol= Def *vol, * is the whole matched string. */ for (i =3D 0; i < nextents; i++) { - size_t j; g_autofree char *offset_str =3D NULL; + virStorageVolSourceExtent extent; + size_t j =3D (i * 2) + 1; + + memset(&extent, 0, sizeof(extent)); - j =3D (i * 2) + 1; - extent.path =3D g_match_info_fetch(info, j); offset_str =3D g_match_info_fetch(info, j + 1); if (virStrToLong_ull(offset_str, NULL, 10, &offset) < 0) { @@ -201,6 +199,8 @@ virStorageBackendLogicalParseVolExtents(virStorageVolDe= f *vol, _("malformed volume extent offset value")); goto cleanup; } + + extent.path =3D g_match_info_fetch(info, j); extent.start =3D offset * size; extent.end =3D (offset * size) + length; @@ -210,7 +210,6 @@ virStorageBackendLogicalParseVolExtents(virStorageVolDe= f *vol, ret =3D 0; cleanup: - VIR_FREE(extent.path); return ret; } --=20 2.31.1