From nobody Sun Feb 8 18:30:22 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1578347901; cv=none; d=zohomail.com; s=zohoarc; b=F9RpzrDpw50MdYDSRKcYBgZaNR2ZJ529SudbA8fWN5HKw3bubKYoAdpPTkx0IkNiLPveHSC2l/fzE/QmfyTH8tEY9QnDoklXtdbP0thdvF5RLHhoDwOKXefi5U6yyRB0Ux/qKgdChcFjw99Qwz87rfb6552jLWC08UTPgvYPN+g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578347901; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UaGeYIn9UN2+neUDo6+9y2yZ8cWOnAgKeLcgrjbPBls=; b=I551DKzQgbxNsno9jUYUNF4CgnJXimAWbir/8K75jlJMUAh8YYUcdzyFMoinLAFqYbE/vevp8SBmqL3WoadIzAdMd1Ugop6GDtisvPAkPllLNHYLueLk6xmK90JlmYCdxHYnakZyNhXUJt14GPim9fmqKFY2JuW5YX4I1XuSR/s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1578347901966467.52759178920985; Mon, 6 Jan 2020 13:58:21 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-31-2W_JT65uOLGG8QxUvHPWgA-1; Mon, 06 Jan 2020 16:58:18 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id D5B9D1005516; Mon, 6 Jan 2020 21:58:12 +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 AC30310840F5; Mon, 6 Jan 2020 21:58:12 +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 DE54681C7C; Mon, 6 Jan 2020 21:58:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 006Lw7VC007173 for ; Mon, 6 Jan 2020 16:58:07 -0500 Received: by smtp.corp.redhat.com (Postfix) id E6530F84E6; Mon, 6 Jan 2020 21:58:06 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E072CF9AB6 for ; Mon, 6 Jan 2020 21:58:06 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B4476800147 for ; Mon, 6 Jan 2020 21:58:06 +0000 (UTC) Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com [209.85.222.180]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-345-_71bq9yvNwyqKHaGv_CCCw-1; Mon, 06 Jan 2020 16:58:04 -0500 Received: by mail-qk1-f180.google.com with SMTP id z76so41254710qka.2 for ; Mon, 06 Jan 2020 13:58:04 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c6:655b:9e1c:e865:3705:e1df]) by smtp.gmail.com with ESMTPSA id x34sm23898440qtd.20.2020.01.06.13.58.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jan 2020 13:58:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578347900; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=UaGeYIn9UN2+neUDo6+9y2yZ8cWOnAgKeLcgrjbPBls=; b=BQPDmtPHSkqthl+7fg13foO4P6NY1H+0vQZncXBX1iGfos6xhcNGtTItc5anRiIpBra6FK XVGPJQWgoagkVdeCp6WD86RhoVv4M4iTV6QMWKCApKqAquyAvwGHUqyLDXItFffKz5pQP4 pD3KgxcaBqTBcN2dJ43YFFWMLOYLtxU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+DDhVzmYYANDNmGgWmUxj3cJMWbiEHBrpmiR10vuB0M=; b=qi2f0Hwh9BauoKMwolfosUtz2McoRlmj6jNiA6ZlP4BsAiZeE4KtXtn7sM0xCMR4QP N0zn+YwcAKFC40VilnvxP0RkCCRklV1MA6bR8dqULzXBgVz38R3+76oo48ZXZKJ4XXjh W6AMpir0dgFpzzS1bKBLoBqTxfPxw5pw7ToNENbpGrryGSsKDmZB60ye0Soc7NNWYqPX qALBnpXHVvUHHuZWYI69YO64ji0xSOmFrro6uY4xrt6/IR5OU7XIHSVww+BuiMHjlDcG iKwuj+aZXn/bZfzzEbGJLAnraiStrugSBXSLAaHOL/2STjfUNv+2KgyqyDp6anDd05zh XB9Q== X-Gm-Message-State: APjAAAXomKp2KSW3NJV4LCdu495B10HDgFq+yozaQIzCbZ4oLWdN/CgN p6wwDAis9la8OAe28OBBEBshmvEl X-Google-Smtp-Source: APXvYqxJOkp94Y0RzR/ZdSSxrudTcPOoVbw/0Fc2Nemmbe1Sz9ogf5JIs5P18X8gaV5oKiRgIG9DkA== X-Received: by 2002:a37:88c2:: with SMTP id k185mr86677684qkd.317.1578347884002; Mon, 06 Jan 2020 13:58:04 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 6 Jan 2020 18:57:28 -0300 Message-Id: <20200106215750.361615-5-danielhb413@gmail.com> In-Reply-To: <20200106215750.361615-1-danielhb413@gmail.com> References: <20200106215750.361615-1-danielhb413@gmail.com> MIME-Version: 1.0 X-MC-Unique: _71bq9yvNwyqKHaGv_CCCw-1 X-MC-Unique: 2W_JT65uOLGG8QxUvHPWgA-1 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 006Lw7VC007173 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 04/26] conf/domain_conf.c: remove unneeded labels 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: , 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-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza --- src/conf/domain_conf.c | 192 ++++++++++++++--------------------------- 1 file changed, 65 insertions(+), 127 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ee33b7caf0..c026fdf45c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3682,8 +3682,6 @@ virDomainObjSetDefTransient(virDomainXMLOptionPtr xml= opt, virDomainObjPtr domain, void *parseOpaque) { - int ret =3D -1; - if (!domain->persistent) return 0; =20 @@ -3692,11 +3690,9 @@ virDomainObjSetDefTransient(virDomainXMLOptionPtr xm= lopt, =20 if (!(domain->newDef =3D virDomainDefCopy(domain->def, xmlopt, parseOpaque, false))) - goto out; + return -1; =20 - ret =3D 0; - out: - return ret; + return 0; } =20 =20 @@ -7701,7 +7697,6 @@ static int virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node, virDomainHostdevDefPtr def) { - int ret =3D -1; bool got_product, got_vendor; xmlNodePtr cur; virDomainHostdevSubsysUSBPtr usbsrc =3D &def->source.subsys.u.usb; @@ -7715,7 +7710,7 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unknown startup policy '%s'"), startupPolicy); - goto out; + return -1; } } =20 @@ -7738,12 +7733,12 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr nod= e, if (virStrToLong_ui(vendor, NULL, 0, &usbsrc->vendor) = < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot parse vendor id %s"), ven= dor); - goto out; + return -1; } } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("usb vendor needs id")); - goto out; + return -1; } } else if (virXMLNodeNameEqual(cur, "product")) { g_autofree char *product =3D virXMLPropString(cur, "id"); @@ -7755,12 +7750,12 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr nod= e, virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot parse product %s"), product); - goto out; + return -1; } } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("usb product needs id")); - goto out; + return -1; } } else if (virXMLNodeNameEqual(cur, "address")) { g_autofree char *bus =3D NULL; @@ -7771,12 +7766,12 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr nod= e, if (virStrToLong_ui(bus, NULL, 0, &usbsrc->bus) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot parse bus %s"), bus); - goto out; + return -1; } } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("usb address needs bus id")); - goto out; + return -1; } =20 device =3D virXMLPropString(cur, "device"); @@ -7785,18 +7780,18 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr nod= e, virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot parse device %s"), device); - goto out; + return -1; } } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("usb address needs device id")); - goto out; + return -1; } } else { virReportError(VIR_ERR_INTERNAL_ERROR, _("unknown usb source type '%s'"), cur->name); - goto out; + return -1; } } cur =3D cur->next; @@ -7805,23 +7800,21 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr nod= e, if (got_vendor && usbsrc->vendor =3D=3D 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("vendor cannot be 0.")); - goto out; + return -1; } =20 if (!got_vendor && got_product) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("missing vendor")); - goto out; + return -1; } if (got_vendor && !got_product) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("missing product")); - goto out; + return -1; } =20 - ret =3D 0; - out: - return ret; + return 0; } =20 /* The internal XML for host PCI device's original states: @@ -7865,7 +7858,6 @@ virDomainHostdevSubsysPCIDefParseXML(xmlNodePtr node, virDomainHostdevDefPtr def, unsigned int flags) { - int ret =3D -1; xmlNodePtr cur; =20 cur =3D node->children; @@ -7876,25 +7868,23 @@ virDomainHostdevSubsysPCIDefParseXML(xmlNodePtr nod= e, &def->source.subsys.u.pci.addr; =20 if (virPCIDeviceAddressParseXML(cur, addr) < 0) - goto out; + return -1; } else if ((flags & VIR_DOMAIN_DEF_PARSE_PCI_ORIG_STATES) && virXMLNodeNameEqual(cur, "origstates")) { virDomainHostdevOrigStatesPtr states =3D &def->origstates; if (virDomainHostdevSubsysPCIOrigStatesDefParseXML(cur, st= ates) < 0) - goto out; + return -1; } else { virReportError(VIR_ERR_INTERNAL_ERROR, _("unknown pci source type '%s'"), cur->name); - goto out; + return -1; } } cur =3D cur->next; } =20 - ret =3D 0; - out: - return ret; + return 0; } =20 =20 @@ -8622,7 +8612,6 @@ virDomainHostdevDefParseXMLCaps(xmlNodePtr node G_GNU= C_UNUSED, virDomainHostdevDefPtr def) { xmlNodePtr sourcenode; - int ret =3D -1; =20 /* @type is passed in from the caller rather than read from the * xml document, because it is specified in different places for @@ -8638,18 +8627,18 @@ virDomainHostdevDefParseXMLCaps(xmlNodePtr node G_G= NUC_UNUSED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown host device source address type '%s'= "), type); - goto error; + return -1; } } else { virReportError(VIR_ERR_XML_ERROR, "%s", _("missing source address type")); - goto error; + return -1; } =20 if (!(sourcenode =3D virXPathNode("./source", ctxt))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Missing element in hostdev device")); - goto error; + return -1; } =20 switch (def->source.caps.type) { @@ -8658,7 +8647,7 @@ virDomainHostdevDefParseXMLCaps(xmlNodePtr node G_GNU= C_UNUSED, virXPathString("string(./source/block[1])", ctxt))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Missing element in hostdev storage d= evice")); - goto error; + return -1; } break; case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_MISC: @@ -8666,7 +8655,7 @@ virDomainHostdevDefParseXMLCaps(xmlNodePtr node G_GNU= C_UNUSED, virXPathString("string(./source/char[1])", ctxt))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Missing element in hostdev character = device")); - goto error; + return -1; } break; case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_NET: @@ -8674,21 +8663,20 @@ virDomainHostdevDefParseXMLCaps(xmlNodePtr node G_G= NUC_UNUSED, virXPathString("string(./source/interface[1])", ctxt))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Missing element in hostdev net d= evice")); - goto error; + return -1; } if (virDomainNetIPInfoParseXML(_("Domain hostdev device"), ctxt, &def->source.caps.u.net.ip) <= 0) - goto error; + return -1; break; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("address type=3D'%s' not supported in hostdev int= erfaces"), virDomainHostdevCapsTypeToString(def->source.caps.t= ype)); - goto error; + return -1; } - ret =3D 0; - error: - return ret; + + return 0; } =20 =20 @@ -9166,13 +9154,11 @@ virDomainLeaseDefParseXML(xmlNodePtr node) def->lockspace =3D g_steal_pointer(&lockspace); def->path =3D g_steal_pointer(&path); =20 - cleanup: return def; =20 error: virDomainLeaseDefFree(def); - def =3D NULL; - goto cleanup; + return NULL; } =20 static int @@ -11084,13 +11070,11 @@ virDomainControllerDefParseXML(virDomainXMLOption= Ptr xmlopt, break; } =20 - cleanup: return def; =20 error: virDomainControllerDefFree(def); - def =3D NULL; - goto cleanup; + return NULL; } =20 =20 @@ -11277,13 +11261,11 @@ virDomainFSDefParseXML(virDomainXMLOptionPtr xmlo= pt, if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags) < 0) goto error; =20 - cleanup: return def; =20 error: virDomainFSDefFree(def); - def =3D NULL; - goto cleanup; + return NULL; } =20 static int @@ -13037,13 +13019,11 @@ virDomainChrDefParseXML(virDomainXMLOptionPtr xml= opt, goto error; } =20 - cleanup: return def; =20 error: virDomainChrDefFree(def); - def =3D NULL; - goto cleanup; + return NULL; } =20 static virDomainSmartcardDefPtr @@ -13167,13 +13147,11 @@ virDomainSmartcardDefParseXML(virDomainXMLOptionP= tr xmlopt, goto error; } =20 - cleanup: return def; =20 error: virDomainSmartcardDefFree(def); - def =3D NULL; - goto cleanup; + return NULL; } =20 /* Parse the XML definition for a TPM device @@ -13295,13 +13273,11 @@ virDomainTPMDefParseXML(virDomainXMLOptionPtr xml= opt, if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags) < 0) goto error; =20 - cleanup: return def; =20 error: virDomainTPMDefFree(def); - def =3D NULL; - goto cleanup; + return NULL; } =20 static virDomainPanicDefPtr @@ -13327,13 +13303,11 @@ virDomainPanicDefParseXML(virDomainXMLOptionPtr x= mlopt, goto error; } =20 - cleanup: return panic; =20 error: virDomainPanicDefFree(panic); - panic =3D NULL; - goto cleanup; + return NULL; } =20 /* Parse the XML definition for an input device */ @@ -13485,13 +13459,11 @@ virDomainInputDefParseXML(virDomainXMLOptionPtr x= mlopt, &def->virtio) < 0) goto error; =20 - cleanup: return def; =20 error: virDomainInputDefFree(def); - def =3D NULL; - goto cleanup; + return NULL; } =20 =20 @@ -13524,13 +13496,11 @@ virDomainHubDefParseXML(virDomainXMLOptionPtr xml= opt, if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags) < 0) goto error; =20 - cleanup: return def; =20 error: virDomainHubDefFree(def); - def =3D NULL; - goto cleanup; + return NULL; } =20 =20 @@ -13649,12 +13619,11 @@ virDomainTimerDefParseXML(xmlNodePtr node, } } =20 - cleanup: return def; =20 error: VIR_FREE(def); - goto cleanup; + return def; } =20 =20 @@ -14525,13 +14494,12 @@ virDomainGraphicsDefParseXML(virDomainXMLOptionPt= r xmlopt, break; } =20 - cleanup: return def; =20 error: virDomainGraphicsDefFree(def); def =3D NULL; - goto cleanup; + return NULL; } =20 =20 @@ -14551,13 +14519,11 @@ virDomainSoundCodecDefParseXML(xmlNodePtr node) goto error; } =20 - cleanup: return def; =20 error: virDomainSoundCodecDefFree(def); - def =3D NULL; - goto cleanup; + return NULL; } =20 =20 @@ -14613,13 +14579,11 @@ virDomainSoundDefParseXML(virDomainXMLOptionPtr x= mlopt, if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags) < 0) goto error; =20 - cleanup: return def; =20 error: virDomainSoundDefFree(def); - def =3D NULL; - goto cleanup; + return NULL; } =20 =20 @@ -14703,13 +14667,11 @@ virDomainWatchdogDefParseXML(virDomainXMLOptionPt= r xmlopt, if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags) < 0) goto error; =20 - cleanup: return def; =20 error: virDomainWatchdogDefFree(def); - def =3D NULL; - goto cleanup; + return NULL; } =20 =20 @@ -14816,13 +14778,12 @@ virDomainRNGDefParseXML(virDomainXMLOptionPtr xml= opt, &def->virtio) < 0) goto error; =20 - cleanup: return def; =20 error: virDomainRNGDefFree(def); def =3D NULL; - goto cleanup; + return NULL; } =20 =20 @@ -14882,13 +14843,11 @@ virDomainMemballoonDefParseXML(virDomainXMLOption= Ptr xmlopt, &def->virtio) < 0) goto error; =20 - cleanup: return def; =20 error: virDomainMemballoonDefFree(def); - def =3D NULL; - goto cleanup; + return NULL; } =20 static virDomainNVRAMDefPtr @@ -15334,13 +15293,11 @@ virSysinfoParseXML(xmlNodePtr node, goto error; } =20 - cleanup: return def; =20 error: virSysinfoDefFree(def); - def =3D NULL; - goto cleanup; + return NULL; } =20 unsigned int @@ -15528,16 +15485,15 @@ virDomainVideoDriverDefParseXML(xmlNodePtr node) return NULL; =20 if (VIR_ALLOC(def) < 0) - goto cleanup; + return def; =20 if ((val =3D virDomainVideoVGAConfTypeFromString(vgaconf)) <=3D 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown vgaconf value '%s'"), vgaconf); - goto cleanup; + return def; } def->vgaconf =3D val; =20 - cleanup: return def; } =20 @@ -15691,13 +15647,11 @@ virDomainVideoDefParseXML(virDomainXMLOptionPtr x= mlopt, =20 def->driver =3D virDomainVideoDriverDefParseXML(node); =20 - cleanup: return def; =20 error: virDomainVideoDefFree(def); - def =3D NULL; - goto cleanup; + return NULL; } =20 static virDomainHostdevDefPtr @@ -15767,13 +15721,11 @@ virDomainHostdevDefParseXML(virDomainXMLOptionPtr= xmlopt, } } =20 - cleanup: return def; =20 error: virDomainHostdevDefFree(def); - def =3D NULL; - goto cleanup; + return NULL; } =20 =20 @@ -15840,14 +15792,11 @@ virDomainRedirdevDefParseXML(virDomainXMLOptionPt= r xmlopt, goto error; } =20 - - cleanup: return def; =20 error: virDomainRedirdevDefFree(def); - def =3D NULL; - goto cleanup; + return NULL; } =20 /* @@ -15963,13 +15912,11 @@ virDomainRedirFilterUSBDevDefParseXML(xmlNodePtr = node) goto error; } =20 - cleanup: return def; =20 error: VIR_FREE(def); - def =3D NULL; - goto cleanup; + return NULL; } =20 static virDomainRedirFilterDefPtr @@ -16268,13 +16215,11 @@ virDomainSEVDefParseXML(xmlNodePtr sevNode, def->dh_cert =3D virXPathString("string(./dhCert)", ctxt); def->session =3D virXPathString("string(./session)", ctxt); =20 - cleanup: return def; =20 error: virDomainSEVDefFree(def); - def =3D NULL; - goto cleanup; + return NULL; } =20 static virDomainMemoryDefPtr @@ -18222,7 +18167,7 @@ virDomainIdmapDefParseXML(xmlXPathContextPtr ctxt, VIR_XPATH_NODE_AUTORESTORE(ctxt); =20 if (VIR_ALLOC_N(idmap, num) < 0) - goto cleanup; + return idmap; =20 for (i =3D 0; i < num; i++) { ctxt->node =3D node[i]; @@ -18232,7 +18177,7 @@ virDomainIdmapDefParseXML(xmlXPathContextPtr ctxt, virReportError(VIR_ERR_XML_ERROR, "%s", _("invalid idmap start/target/count settings")); VIR_FREE(idmap); - goto cleanup; + return NULL; } } =20 @@ -18244,10 +18189,9 @@ virDomainIdmapDefParseXML(xmlXPathContextPtr ctxt, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("You must map the root user of container")); VIR_FREE(idmap); - goto cleanup; + return NULL; } =20 - cleanup: return idmap; } =20 @@ -18284,13 +18228,12 @@ virDomainIOThreadIDDefParseXML(xmlNodePtr node) goto error; } =20 - cleanup: return iothrid; =20 error: virDomainIOThreadIDDefFree(iothrid); iothrid =3D NULL; - goto cleanup; + return iothrid; } =20 =20 @@ -28984,18 +28927,15 @@ virDomainObjFormat(virDomainObjPtr obj, =20 if (xmlopt->privateData.format && xmlopt->privateData.format(&buf, obj) < 0) - goto error; + return NULL; =20 if (virDomainDefFormatInternal(obj->def, xmlopt, &buf, flags) < 0) - goto error; + return NULL; =20 virBufferAdjustIndent(&buf, -2); virBufferAddLit(&buf, "\n"); =20 return virBufferContentAndReset(&buf); - - error: - return NULL; } =20 static bool @@ -29302,7 +29242,7 @@ virDomainChrDefForeach(virDomainDefPtr def, rc =3D -1; =20 if (abortOnError && rc !=3D 0) - goto done; + return rc; } =20 for (i =3D 0; i < def->nparallels; i++) { @@ -29312,7 +29252,7 @@ virDomainChrDefForeach(virDomainDefPtr def, rc =3D -1; =20 if (abortOnError && rc !=3D 0) - goto done; + return rc; } =20 for (i =3D 0; i < def->nchannels; i++) { @@ -29322,7 +29262,7 @@ virDomainChrDefForeach(virDomainDefPtr def, rc =3D -1; =20 if (abortOnError && rc !=3D 0) - goto done; + return rc; } for (i =3D 0; i < def->nconsoles; i++) { if (virDomainSkipBackcompatConsole(def, i, false)) @@ -29333,10 +29273,9 @@ virDomainChrDefForeach(virDomainDefPtr def, rc =3D -1; =20 if (abortOnError && rc !=3D 0) - goto done; + return rc; } =20 - done: return rc; } =20 @@ -29357,10 +29296,9 @@ virDomainSmartcardDefForeach(virDomainDefPtr def, rc =3D -1; =20 if (abortOnError && rc !=3D 0) - goto done; + return rc; } =20 - done: return rc; } =20 --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list