From nobody Sun Feb 8 16:36:07 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1554480287169350.6546583749372; Fri, 5 Apr 2019 09:04:47 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 346E0301F12C; Fri, 5 Apr 2019 16:04:45 +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 0FD7C10A3922; Fri, 5 Apr 2019 16:04:45 +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 C97001819AFF; Fri, 5 Apr 2019 16:04:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x35G4ZXZ003438 for ; Fri, 5 Apr 2019 12:04:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id CF7C260CD0; Fri, 5 Apr 2019 16:04:35 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 58D6360BFB for ; Fri, 5 Apr 2019 16:04:35 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Fri, 5 Apr 2019 18:04:19 +0200 Message-Id: <55f06927cbfe4806db5bbc047396807bfedfff4c.1554480066.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 07/11] qemu: block: Add and use AUTOPTR func for qemuBlockNodeNameBackingChainData 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Fri, 05 Apr 2019 16:04:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" This is a locally used helper struct but we can make use of automatic freeing for it. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_block.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 822ba44e18..2017eca139 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -88,6 +88,9 @@ qemuBlockNodeNameBackingChainDataFree(qemuBlockNodeNameBa= ckingChainDataPtr data) VIR_FREE(data); } +VIR_DEFINE_AUTOPTR_FUNC(qemuBlockNodeNameBackingChainData, + qemuBlockNodeNameBackingChainDataFree); + static void qemuBlockNodeNameBackingChainDataHashEntryFree(void *opaque, @@ -128,7 +131,7 @@ qemuBlockNodeNameGetBackingChainBacking(virJSONValuePtr= next, virHashTablePtr nodenamestable, qemuBlockNodeNameBackingChainDataP= tr *nodenamedata) { - qemuBlockNodeNameBackingChainDataPtr data =3D NULL; + VIR_AUTOPTR(qemuBlockNodeNameBackingChainData) data =3D NULL; qemuBlockNodeNameBackingChainDataPtr backingdata =3D NULL; virJSONValuePtr backing =3D virJSONValueObjectGetObject(next, "backing= "); virJSONValuePtr parent =3D virJSONValueObjectGetObject(next, "parent"); @@ -189,7 +192,6 @@ qemuBlockNodeNameGetBackingChainBacking(virJSONValuePtr= next, ret =3D 0; cleanup: - qemuBlockNodeNameBackingChainDataFree(data); return ret; } @@ -201,7 +203,7 @@ qemuBlockNodeNameGetBackingChainDisk(size_t pos ATTRIBU= TE_UNUSED, { struct qemuBlockNodeNameGetBackingChainData *data =3D opaque; const char *device =3D virJSONValueObjectGetString(item, "device"); - qemuBlockNodeNameBackingChainDataPtr devicedata =3D NULL; + VIR_AUTOPTR(qemuBlockNodeNameBackingChainData) devicedata =3D NULL; int ret =3D -1; if (qemuBlockNodeNameGetBackingChainBacking(item, data->nodenamestable, @@ -216,7 +218,6 @@ qemuBlockNodeNameGetBackingChainDisk(size_t pos ATTRIBU= TE_UNUSED, ret =3D 1; /* we don't really want to steal @item */ cleanup: - qemuBlockNodeNameBackingChainDataFree(devicedata); return ret; } --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list