From nobody Mon Feb 9 01:00:52 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 1552924563477935.0027420625172; Mon, 18 Mar 2019 08:56:03 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AD9418F872; Mon, 18 Mar 2019 15:56:01 +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 79807605C9; Mon, 18 Mar 2019 15:56:01 +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 3123E181A26B; Mon, 18 Mar 2019 15:56:01 +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 x2IFtcYE022685 for ; Mon, 18 Mar 2019 11:55:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3B15E1001DC8; Mon, 18 Mar 2019 15:55:38 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id B78881001E6A for ; Mon, 18 Mar 2019 15:55:37 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Mon, 18 Mar 2019 16:55:03 +0100 Message-Id: <0f493eab21f19802027de319e48ea7b4d89b1d74.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 14/34] cleanup error path in virDomainStorageSourceParse 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 18 Mar 2019 15:56:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0c650ffc2c..ef164f3375 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9070,7 +9070,6 @@ virDomainStorageSourceParse(xmlNodePtr node, virStorageSourcePtr src, unsigned int flags) { - int ret =3D -1; VIR_XPATH_NODE_AUTORESTORE(ctxt); xmlNodePtr tmp; @@ -9088,34 +9087,34 @@ virDomainStorageSourceParse(xmlNodePtr node, break; case VIR_STORAGE_TYPE_NETWORK: if (virDomainDiskSourceNetworkParse(node, ctxt, src, flags) < 0) - goto cleanup; + return -1; break; case VIR_STORAGE_TYPE_VOLUME: if (virDomainDiskSourcePoolDefParse(node, &src->srcpool) < 0) - goto cleanup; + return -1; break; case VIR_STORAGE_TYPE_NONE: case VIR_STORAGE_TYPE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected disk type %s"), virStorageTypeToString(src->type)); - goto cleanup; + return -1; } if ((tmp =3D virXPathNode("./auth", ctxt)) && !(src->auth =3D virStorageAuthDefParse(tmp, ctxt))) - goto cleanup; + return -1; if ((tmp =3D virXPathNode("./encryption", ctxt)) && !(src->encryption =3D virStorageEncryptionParseNode(tmp, ctxt))) - goto cleanup; + return -1; if (virDomainDiskSourcePRParse(node, ctxt, &src->pr) < 0) - goto cleanup; + return -1; if (virSecurityDeviceLabelDefParseXML(&src->seclabels, &src->nseclabel= s, ctxt, flags) < 0) - goto cleanup; + return -1; /* People sometimes pass a bogus '' source path when they mean to omit= the * source element completely (e.g. CDROM without media). This is just a @@ -9123,10 +9122,7 @@ virDomainStorageSourceParse(xmlNodePtr node, if (src->path && !*src->path) VIR_FREE(src->path); - 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