From nobody Mon Feb 9 23:01:30 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 1553277703164262.3907325438497; Fri, 22 Mar 2019 11:01:43 -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 4E147308623F; Fri, 22 Mar 2019 18:01:41 +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 151A85D9E1; Fri, 22 Mar 2019 18:01:41 +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 B1FEE3FA51; Fri, 22 Mar 2019 18:01:40 +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 x2MI1V7n009004 for ; Fri, 22 Mar 2019 14:01:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id 676715D9D6; Fri, 22 Mar 2019 18:01:31 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id E35FD5D9D2 for ; Fri, 22 Mar 2019 18:01:30 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Fri, 22 Mar 2019 19:00:58 +0100 Message-Id: <5db0f6b1769d5d412d3070f28f0f244174a0dc9d.1553277561.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 Subject: [libvirt] [PATCH v2 22/29] qemu: Remove cleanup in qemuDomainObjPrivateXMLParseJobNBDSource 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.42]); Fri, 22 Mar 2019 18:01:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_domain.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 9323421e49..c7454ce821 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2717,42 +2717,39 @@ qemuDomainObjPrivateXMLParseJobNBDSource(xmlNodePtr= node, qemuDomainDiskPrivatePtr diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); VIR_AUTOFREE(char *) format =3D NULL; VIR_AUTOFREE(char *) type =3D NULL; - int ret =3D -1; VIR_AUTOUNREF(virStorageSourcePtr) migrSource =3D NULL; xmlNodePtr sourceNode; ctxt->node =3D node; - if (!(ctxt->node =3D virXPathNode("./migrationSource", ctxt))) { - ret =3D 0; - goto cleanup; - } + if (!(ctxt->node =3D virXPathNode("./migrationSource", ctxt))) + return 0; if (!(migrSource =3D virStorageSourceNew())) - goto cleanup; + return -1; if (!(type =3D virXMLPropString(ctxt->node, "type"))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("missing storage source type")); - goto cleanup; + return -1; } if (!(format =3D virXMLPropString(ctxt->node, "format"))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("missing storage source format")); - goto cleanup; + return -1; } if ((migrSource->type =3D virStorageTypeFromString(type)) <=3D 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown storage source type '%s'"), type); - goto cleanup; + return -1; } if ((migrSource->format =3D virStorageFileFormatTypeFromString(format)= ) <=3D 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown storage source format '%s'"), format); - goto cleanup; + return -1; } if ((sourceNode =3D virXPathNode("./source", ctxt))) @@ -2760,17 +2757,14 @@ qemuDomainObjPrivateXMLParseJobNBDSource(xmlNodePtr= node, if (virDomainStorageSourceParse(ctxt->node, ctxt, migrSource, VIR_DOMAIN_DEF_PARSE_STATUS, NULL) < 0) - goto cleanup; + return -1; if ((ctxt->node =3D virXPathNode("./privateData", ctxt)) && qemuStorageSourcePrivateDataParse(ctxt, migrSource) < 0) - goto cleanup; + return -1; VIR_STEAL_PTR(diskPriv->migrSource, migrSource); - 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