From nobody Mon Feb 9 13:59:22 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 1552924567781558.9158358082651; Mon, 18 Mar 2019 08:56:07 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id E445181DF2; Mon, 18 Mar 2019 15:56:03 +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 AD5195ED37; Mon, 18 Mar 2019 15:56:03 +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 5FD1B3D389; Mon, 18 Mar 2019 15:56:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x2IFtbnl022677 for ; Mon, 18 Mar 2019 11:55:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6A2A41001DC8; Mon, 18 Mar 2019 15:55:37 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id E61011001E6A for ; Mon, 18 Mar 2019 15:55:36 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Mon, 18 Mar 2019 16:55:02 +0100 Message-Id: <5a020e840617c99d99e60021413a1e4667e19a59.1552924270.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 13/34] conf: Simplify error paths in storage source component parsers 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.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 18 Mar 2019 15:56:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" virDomainDiskSourcePrivateDataParse and virDomainDiskSourcePRParse don't need the 'cleanup' label any more thanks to VIR_XPATH_NODE_AUTORESTORE. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index fb98629c77..0c650ffc2c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9028,7 +9028,6 @@ virDomainDiskSourcePrivateDataParse(xmlNodePtr node, virDomainXMLOptionPtr xmlopt) { VIR_XPATH_NODE_AUTORESTORE(ctxt); - int ret =3D -1; if (!(flags & VIR_DOMAIN_DEF_PARSE_STATUS) || !xmlopt || !xmlopt->privateData.storageParse) @@ -9036,18 +9035,13 @@ virDomainDiskSourcePrivateDataParse(xmlNodePtr node, ctxt->node =3D node; - if (!(ctxt->node =3D virXPathNode("./privateData", ctxt))) { - ret =3D 0; - goto cleanup; - } + if (!(ctxt->node =3D virXPathNode("./privateData", ctxt))) + return 0; if (xmlopt->privateData.storageParse(ctxt, src) < 0) - goto cleanup; - - ret =3D 0; + return -1; - cleanup: - return ret; + return 0; } @@ -9057,21 +9051,16 @@ virDomainDiskSourcePRParse(xmlNodePtr node, virStoragePRDefPtr *pr) { VIR_XPATH_NODE_AUTORESTORE(ctxt); - int ret =3D -1; ctxt->node =3D node; - if (!(ctxt->node =3D virXPathNode("./reservations", ctxt))) { - ret =3D 0; - goto cleanup; - } + if (!(ctxt->node =3D virXPathNode("./reservations", ctxt))) + return 0; if (!(*pr =3D virStoragePRDefParseXML(ctxt))) - goto cleanup; + return -1; - ret =3D 0; - cleanup: - return ret; + return 0; } --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list