From nobody Sun Feb 8 23:59:03 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 1554480287459857.8921773922464; Fri, 5 Apr 2019 09:04:47 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 19D6C308CF96; 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 E91132656F; Fri, 5 Apr 2019 16:04:44 +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 ADC93181AC48; 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 x35G4f6U003470 for ; Fri, 5 Apr 2019 12:04:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id D8E3A60C8D; Fri, 5 Apr 2019 16:04:41 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6215460CAD for ; Fri, 5 Apr 2019 16:04:41 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Fri, 5 Apr 2019 18:04:22 +0200 Message-Id: <1e2ea793ba1a278fc0120789e64e92463876b0a4.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 10/11] qemu: block: Use VIR_RETURN_PTR 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.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Fri, 05 Apr 2019 16:04:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Demonstrate how VIR_RETURN_PTR by refactoring qemu_block.c Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_block.c | 48 +++++++++++-------------------------------- 1 file changed, 12 insertions(+), 36 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 31800919a7..7d9f7ec3ab 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -234,7 +234,6 @@ qemuBlockNodeNameGetBackingChain(virJSONValuePtr namedn= odes, struct qemuBlockNodeNameGetBackingChainData data; VIR_AUTOPTR(virHashTable) namednodestable =3D NULL; VIR_AUTOPTR(virHashTable) disks =3D NULL; - virHashTablePtr ret =3D NULL; memset(&data, 0, sizeof(data)); @@ -257,8 +256,7 @@ qemuBlockNodeNameGetBackingChain(virJSONValuePtr namedn= odes, &data) < 0) return NULL; - VIR_STEAL_PTR(ret, disks); - return ret; + VIR_RETURN_PTR(disks); } @@ -375,7 +373,6 @@ virHashTablePtr qemuBlockGetNodeData(virJSONValuePtr data) { VIR_AUTOPTR(virHashTable) nodedata =3D NULL; - virHashTablePtr ret =3D NULL; if (!(nodedata =3D virHashCreate(50, virJSONValueHashFree))) return NULL; @@ -384,8 +381,7 @@ qemuBlockGetNodeData(virJSONValuePtr data) qemuBlockNamedNodesArrayToHash, node= data) < 0) return NULL; - VIR_STEAL_PTR(ret, nodedata); - return ret; + VIR_RETURN_PTR(nodedata); } @@ -414,7 +410,6 @@ virURIPtr qemuBlockStorageSourceGetURI(virStorageSourcePtr src) { VIR_AUTOPTR(virURI) uri =3D NULL; - virURIPtr ret =3D NULL; if (src->nhosts !=3D 1) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -455,8 +450,7 @@ qemuBlockStorageSourceGetURI(virStorageSourcePtr src) if (VIR_STRDUP(uri->server, src->hosts->name) < 0) return NULL; - VIR_STEAL_PTR(ret, uri); - return ret; + VIR_RETURN_PTR(uri); } @@ -478,7 +472,6 @@ qemuBlockStorageSourceBuildJSONSocketAddress(virStorage= NetHostDefPtr host, bool legacy) { VIR_AUTOPTR(virJSONValue) server =3D NULL; - virJSONValuePtr ret =3D NULL; const char *transport; const char *field; VIR_AUTOFREE(char *) port =3D NULL; @@ -522,8 +515,7 @@ qemuBlockStorageSourceBuildJSONSocketAddress(virStorage= NetHostDefPtr host, return NULL; } - VIR_STEAL_PTR(ret, server); - return ret; + VIR_RETURN_PTR(server); } @@ -541,7 +533,6 @@ qemuBlockStorageSourceBuildHostsJSONSocketAddress(virSt= orageSourcePtr src, { VIR_AUTOPTR(virJSONValue) servers =3D NULL; VIR_AUTOPTR(virJSONValue) server =3D NULL; - virJSONValuePtr ret =3D NULL; virStorageNetHostDefPtr host; size_t i; @@ -560,8 +551,7 @@ qemuBlockStorageSourceBuildHostsJSONSocketAddress(virSt= orageSourcePtr src, server =3D NULL; } - VIR_STEAL_PTR(ret, servers); - return ret; + VIR_RETURN_PTR(servers); } @@ -610,7 +600,6 @@ qemuBlockStorageSourceBuildHostsJSONInetSocketAddress(v= irStorageSourcePtr src) { VIR_AUTOPTR(virJSONValue) servers =3D NULL; VIR_AUTOPTR(virJSONValue) server =3D NULL; - virJSONValuePtr ret =3D NULL; virStorageNetHostDefPtr host; size_t i; @@ -629,8 +618,7 @@ qemuBlockStorageSourceBuildHostsJSONInetSocketAddress(v= irStorageSourcePtr src) server =3D NULL; } - VIR_STEAL_PTR(ret, servers); - return ret; + VIR_RETURN_PTR(servers); } @@ -640,7 +628,6 @@ qemuBlockStorageSourceGetGlusterProps(virStorageSourceP= tr src, { VIR_AUTOPTR(virJSONValue) servers =3D NULL; VIR_AUTOPTR(virJSONValue) props =3D NULL; - virJSONValuePtr ret =3D NULL; if (!(servers =3D qemuBlockStorageSourceBuildHostsJSONSocketAddress(sr= c, legacy))) return NULL; @@ -662,8 +649,7 @@ qemuBlockStorageSourceGetGlusterProps(virStorageSourceP= tr src, virJSONValueObjectAdd(props, "u:debug", src->debugLevel, NULL) < 0) return NULL; - VIR_STEAL_PTR(ret, props); - return ret; + VIR_RETURN_PTR(props); } @@ -1048,7 +1034,6 @@ qemuBlockStorageSourceGetBackendProps(virStorageSourc= ePtr src, { int actualType =3D virStorageSourceGetActualType(src); VIR_AUTOPTR(virJSONValue) fileprops =3D NULL; - virJSONValuePtr ret =3D NULL; switch ((virStorageType)actualType) { case VIR_STORAGE_TYPE_BLOCK: @@ -1137,8 +1122,7 @@ qemuBlockStorageSourceGetBackendProps(virStorageSourc= ePtr src, return NULL; } - VIR_STEAL_PTR(ret, fileprops); - return ret; + VIR_RETURN_PTR(fileprops); } @@ -1266,7 +1250,6 @@ qemuBlockStorageSourceGetBlockdevFormatCommonProps(vi= rStorageSourcePtr src) int detectZeroesMode =3D virDomainDiskGetDetectZeroesMode(src->discard, src->detect_ze= roes); VIR_AUTOPTR(virJSONValue) props =3D NULL; - virJSONValuePtr ret =3D NULL; if (qemuBlockNodeNameValidate(src->nodeformat) < 0) return NULL; @@ -1292,8 +1275,7 @@ qemuBlockStorageSourceGetBlockdevFormatCommonProps(vi= rStorageSourcePtr src) if (qemuBlockStorageSourceGetBlockdevGetCacheProps(src, props) < 0) return NULL; - VIR_STEAL_PTR(ret, props); - return ret; + VIR_RETURN_PTR(props); } @@ -1302,7 +1284,6 @@ qemuBlockStorageSourceGetBlockdevFormatProps(virStora= geSourcePtr src) { const char *driver =3D NULL; VIR_AUTOPTR(virJSONValue) props =3D NULL; - virJSONValuePtr ret =3D NULL; if (!(props =3D qemuBlockStorageSourceGetBlockdevFormatCommonProps(src= ))) return NULL; @@ -1366,8 +1347,7 @@ qemuBlockStorageSourceGetBlockdevFormatProps(virStora= geSourcePtr src) virJSONValueObjectAdd(props, "s:driver", driver, NULL) < 0) return NULL; - VIR_STEAL_PTR(ret, props); - return ret; + VIR_RETURN_PTR(props); } @@ -1385,7 +1365,6 @@ qemuBlockStorageSourceGetBlockdevProps(virStorageSour= cePtr src) { bool backingSupported =3D src->format >=3D VIR_STORAGE_FILE_BACKING; VIR_AUTOPTR(virJSONValue) props =3D NULL; - virJSONValuePtr ret =3D NULL; if (virStorageSourceHasBacking(src) && !backingSupported) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -1413,8 +1392,7 @@ qemuBlockStorageSourceGetBlockdevProps(virStorageSour= cePtr src) } } - VIR_STEAL_PTR(ret, props); - return ret; + VIR_RETURN_PTR(props); } @@ -1457,7 +1435,6 @@ qemuBlockStorageSourceAttachDataPtr qemuBlockStorageSourceAttachPrepareBlockdev(virStorageSourcePtr src) { VIR_AUTOPTR(qemuBlockStorageSourceAttachData) data =3D NULL; - qemuBlockStorageSourceAttachDataPtr ret =3D NULL; if (VIR_ALLOC(data) < 0) return NULL; @@ -1469,8 +1446,7 @@ qemuBlockStorageSourceAttachPrepareBlockdev(virStorag= eSourcePtr src) data->storageNodeName =3D src->nodestorage; data->formatNodeName =3D src->nodeformat; - VIR_STEAL_PTR(ret, data); - return ret; + VIR_RETURN_PTR(data); } --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list