From nobody Sun Feb 8 20:17:34 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1663577733; cv=none; d=zohomail.com; s=zohoarc; b=QSrixJNZhZkAyzbDvlQ4zoJaajfqIVvX0qcq66/vpIN8tDTIVNb82iiFLO7r8D5neMFPWZAaphntxWmoLe6e4VsMtvhc+ebctKAXnz5kyCP74AuwNIrODNkwotK6udf9jT/NHErnGV/y/0LP5EKGmZZvAOj1eJhr01l2Q47+V5w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663577733; h=Content-Type:Content-Transfer-Encoding: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=bGnr/Zz9EHY+hGdQDnPcJj+QaviTgR8YOIc4E4rOYlo=; b=aj2kke0yfMPlVNlHG6ZgKt26kiEacdTV13sN4dtFX8sLxdDVR+cvW0fZ4gByz0eKcZz/Dufpw4nORQ7rcZopoT44ZHaSwUPrejPNosBhV5jo2j66gMTWBtpWKTBM7DWZfZMMbf7Z8WoJpepvWFh0KMMWDh7ZC22UhoBKltK5RSQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1663577733866750.8703039804356; Mon, 19 Sep 2022 01:55:33 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-662-Za0-w404P--Tl485f0lVMA-1; Mon, 19 Sep 2022 04:55:30 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8BB2A3C119AA; Mon, 19 Sep 2022 08:55:27 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 75CA640C2066; Mon, 19 Sep 2022 08:55:27 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 42B4E1946A42; Mon, 19 Sep 2022 08:55:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id AA40F1946586 for ; Mon, 19 Sep 2022 08:55:26 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 9EE4D40C6EC2; Mon, 19 Sep 2022 08:55:26 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id DB28B40C6EC4 for ; Mon, 19 Sep 2022 08:55:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1663577731; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=bGnr/Zz9EHY+hGdQDnPcJj+QaviTgR8YOIc4E4rOYlo=; b=LHYwNGwy12uH3XFTxtZpaL2Q620e9r23q2saogwMHfO0b2fkbdVcwdLAfi1w4RaFbqKU+b 7VNST1ksM2wGCPT1sQ7nPeNPypyNj2XUe2h/hGaTOq06Wfbxq+zerGmqTb/x/9wE4wWFrj r6bToMYAbTLGSmy5oVX2QhSWklkLu+E= X-MC-Unique: Za0-w404P--Tl485f0lVMA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 03/37] conf: domain: Remove 'error' label in virDomainNetDefParseXML Date: Mon, 19 Sep 2022 10:54:48 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1663577735124100002 Content-Type: text/plain; charset="utf-8" The 'error' label was an alias to 'return NULL;'. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 155 ++++++++++++++++++++--------------------- 1 file changed, 76 insertions(+), 79 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7f5efa205c..a544ab6ce4 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8889,21 +8889,21 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, if ((rv =3D virXMLPropEnum(node, "type", virDomainNetTypeFromString, VIR_XML_PROP_NONE, &def->type)) < 0) - goto error; + return NULL; if (rv =3D=3D 0) def->type =3D VIR_DOMAIN_NET_TYPE_USER; if (virXMLPropTristateBool(node, "trustGuestRxFilters", VIR_XML_PROP_N= ONE, &def->trustGuestRxFilters) < 0) - goto error; + return NULL; if ((source_node =3D virXPathNode("./source", ctxt))) { xmlNodePtr tmpnode =3D ctxt->node; ctxt->node =3D source_node; if (virDomainNetIPInfoParseXML(_("interface host IP"), ctxt, &def-= >hostIP) < 0) - goto error; + return NULL; ctxt->node =3D tmpnode; if (def->type =3D=3D VIR_DOMAIN_NET_TYPE_NETWORK) { @@ -8947,7 +8947,7 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, "Use (for host-side) " "or (for guest-side) inst= ead."), dev, dev, dev); - goto error; + return NULL; } if (def->type =3D=3D VIR_DOMAIN_NET_TYPE_VHOSTUSER) { @@ -8955,7 +8955,7 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, vhostuser_path =3D virXMLPropString(source_node, "path"); vhostuser_mode =3D virXMLPropString(source_node, "mode"); if (virDomainChrSourceReconnectDefParseXML(&reconnect, source_= node, ctxt) < 0) - goto error; + return NULL; } if (def->type =3D=3D VIR_DOMAIN_NET_TYPE_VDPA) @@ -8985,7 +8985,7 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, if (!(def->virtPortProfile =3D virNetDevVPortProfileParse(virtualport_node, VIR_VPORT_XML_GENERATE_MISS= ING_DEFAULTS))) { - goto error; + return NULL; } } else if (def->type =3D=3D VIR_DOMAIN_NET_TYPE_BRIDGE || def->type =3D=3D VIR_DOMAIN_NET_TYPE_DIRECT || @@ -8994,14 +8994,14 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, =3D virNetDevVPortProfileParse(virtualport_node, VIR_VPO= RT_XML_GENERATE_MISSING_DEFAULTS| VIR_VPORT_XML_REQUIRE_ALL_A= TTRIBUTES| VIR_VPORT_XML_REQUIRE_TYPE)= )) { - goto error; + return NULL; } } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _(" element unsupported for" " "), virDomainNetTypeToString(def->type)); - goto error; + return NULL; } } @@ -9019,7 +9019,7 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, if ((driver_node =3D virXPathNode("./driver", ctxt)) && (virDomainVirtioOptionsParseXML(driver_node, &def->virtio) < 0)) - goto error; + return NULL; if ((filterref_node =3D virXPathNode("./filterref", ctxt))) { filter =3D virXMLPropString(filterref_node, "filter"); @@ -9031,16 +9031,16 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, (actual_node =3D virXPathNode("./actual", ctxt)) && (virDomainActualNetDefParseXML(actual_node, ctxt, def, &actual, flags, xmlopt) < 0)) - goto error; + return NULL; if ((bandwidth_node =3D virXPathNode("./bandwidth", ctxt)) && (virNetDevBandwidthParse(&def->bandwidth, NULL, bandwidth_node, def->type =3D=3D VIR_DOMAIN_NET_TYPE_NETW= ORK) < 0)) - goto error; + return NULL; if ((vlan_node =3D virXPathNode("./vlan", ctxt)) && (virNetDevVlanParse(vlan_node, ctxt, &def->vlan) < 0)) - goto error; + return NULL; if ((tap =3D virXPathString("string(./backend/@tap)", ctxt))) def->backend.tap =3D virFileSanitizePath(tap); @@ -9055,13 +9055,13 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, virReportError(VIR_ERR_XML_ERROR, _("unable to parse mac address '%s'"), (const char *)macaddr); - goto error; + return NULL; } if (virMacAddrIsMulticast(&def->mac)) { virReportError(VIR_ERR_XML_ERROR, _("expected unicast mac address, found multicas= t '%s'"), (const char *)macaddr); - goto error; + return NULL; } } else { virDomainNetGenerateMAC(xmlopt, &def->mac); @@ -9072,22 +9072,22 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, virDomainNetMacTypeTypeFromString, VIR_XML_PROP_NONZERO, &def->mac_type) < 0) - goto error; + return NULL; if (virXMLPropTristateBool(mac_node, "check", VIR_XML_PROP_NONE, &def->mac_check) < 0) - goto error; + return NULL; if (virDomainDeviceInfoParseXML(xmlopt, node, ctxt, &def->info, flags | VIR_DOMAIN_DEF_PARSE_ALLOW_BOOT | VIR_DOMAIN_DEF_PARSE_ALLOW_ROM) < 0)= { - goto error; + return NULL; } if (model !=3D NULL && virDomainNetSetModelString(def, model) < 0) - goto error; + return NULL; switch (def->type) { case VIR_DOMAIN_NET_TYPE_NETWORK: @@ -9095,13 +9095,13 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("No 'network' attribute " "specified with = ")); - goto error; + return NULL; } if (portid && virUUIDParse(portid, def->data.network.portid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to parse port id '%s'"), portid); - goto error; + return NULL; } def->data.network.name =3D g_steal_pointer(&network); @@ -9115,7 +9115,7 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, _("Wrong or no 'type' attribute " "specified with . " "vhostuser requires the virtio-net* frontend"= )); - goto error; + return NULL; } if (STRNEQ_NULLABLE(vhostuser_type, "unix")) { @@ -9129,7 +9129,7 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, _("No 'type' attribute " "specified for ")); - goto error; + return NULL; } if (vhostuser_path =3D=3D NULL) { @@ -9137,7 +9137,7 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, _("No 'path' attribute " "specified with ")); - goto error; + return NULL; } if (vhostuser_mode =3D=3D NULL) { @@ -9145,11 +9145,11 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, _("No 'mode' attribute " "specified with ")); - goto error; + return NULL; } if (!(def->data.vhostuser =3D virDomainChrSourceDefNew(xmlopt))) - goto error; + return NULL; def->data.vhostuser->type =3D VIR_DOMAIN_CHR_TYPE_UNIX; def->data.vhostuser->data.nix.path =3D g_steal_pointer(&vhostuser_= path); @@ -9160,7 +9160,7 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("'reconnect' attribute unsupported " "'server' mode for ")); - goto error; + return NULL; } } else if (STREQ(vhostuser_mode, "client")) { def->data.vhostuser->data.nix.listen =3D false; @@ -9170,7 +9170,7 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, _("Wrong 'mode' attribute " "specified with ")); - goto error; + return NULL; } break; @@ -9179,7 +9179,7 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("No 'dev' attribute " "specified with ")); - goto error; + return NULL; } def->data.vdpa.devicepath =3D g_steal_pointer(&dev); break; @@ -9189,7 +9189,7 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("No 'bridge' attribute " "specified with "= )); - goto error; + return NULL; } def->data.bridge.brname =3D g_steal_pointer(&bridge); break; @@ -9202,13 +9202,13 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("No 'port' attribute " "specified with socket interface")); - goto error; + return NULL; } if (virStrToLong_i(port, NULL, 10, &def->data.socket.port) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot parse 'port' attribute " "with socket interface")); - goto error; + return NULL; } if (address =3D=3D NULL) { @@ -9218,7 +9218,7 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("No 'address' attribute " "specified with socket interface")); - goto error; + return NULL; } } else { def->data.socket.address =3D g_steal_pointer(&address); @@ -9231,20 +9231,20 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("No 'port' attribute " "specified with socket interface")); - goto error; + return NULL; } if (virStrToLong_i(localport, NULL, 10, &def->data.socket.localpor= t) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot parse 'port' attribute " "with socket interface")); - goto error; + return NULL; } if (localaddr =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("No 'address' attribute " "specified with socket interface")); - goto error; + return NULL; } else { def->data.socket.localaddr =3D g_steal_pointer(&localaddr); } @@ -9255,7 +9255,7 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("No 'name' attribute specified " "with ")); - goto error; + return NULL; } def->data.internal.name =3D g_steal_pointer(&internal); break; @@ -9265,14 +9265,14 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("No 'dev' attribute specified " "with ")); - goto error; + return NULL; } if (mode !=3D NULL) { if ((val =3D virNetDevMacVLanModeTypeFromString(mode)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Unknown mode has been specified")); - goto error; + return NULL; } def->data.direct.mode =3D val; } else { @@ -9297,7 +9297,7 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, hostdev->mode =3D VIR_DOMAIN_HOSTDEV_MODE_SUBSYS; if (virDomainHostdevDefParseXMLSubsys(node, ctxt, addrtype, hostdev, flags, xmlopt) < 0)= { - goto error; + return NULL; } break; @@ -9306,46 +9306,46 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, virReportError(VIR_ERR_XML_ERROR, _("Missing source switchid for interface type '= %s'"), virDomainNetTypeToString(def->type)); - goto error; + return NULL; } if (!portid) { virReportError(VIR_ERR_XML_ERROR, _("Missing source portid for interface type '%s= '"), virDomainNetTypeToString(def->type)); - goto error; + return NULL; } if (!connectionid) { virReportError(VIR_ERR_XML_ERROR, _("Missing source connectionid for interface ty= pe '%s'"), virDomainNetTypeToString(def->type)); - goto error; + return NULL; } if (!portgroup) { virReportError(VIR_ERR_XML_ERROR, _("Missing source portgroup for interface type = '%s'"), virDomainNetTypeToString(def->type)); - goto error; + return NULL; } if (virUUIDParse(switchid, def->data.vds.switch_id) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to parse switchid '%s'"), switchid); - goto error; + return NULL; } if (virStrToLong_ll(portid, NULL, 0, &def->data.vds.port_id) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to parse portid '%s'"), portid); - goto error; + return NULL; } if (virStrToLong_ll(connectionid, NULL, 0, &def->data.vds.connecti= on_id) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to parse connectionid '%s'"), connect= ionid); - goto error; + return NULL; } def->data.vds.portgroup_id =3D g_steal_pointer(&portgroup); @@ -9361,7 +9361,7 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, if (virDomainNetIPInfoParseXML(_("guest interface"), ctxt, &def->guestIP) < 0) - goto error; + return NULL; if (managed_tap) { bool state =3D false; @@ -9369,7 +9369,7 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, virReportError(VIR_ERR_XML_ERROR, _("invalid 'managed' value '%s'"), managed_tap); - goto error; + return NULL; } def->managed_tap =3D virTristateBoolFromBool(state); } @@ -9404,28 +9404,28 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, virDomainNetBackendTypeFromString, VIR_XML_PROP_NONZERO, &def->driver.virtio.name) < 0) - goto error; + return NULL; if (virXMLPropEnum(driver_node, "txmode", virDomainNetVirtioTxModeTypeFromString, VIR_XML_PROP_NONZERO, &def->driver.virtio.txmode) < 0) - goto error; + return NULL; if (virXMLPropTristateSwitch(driver_node, "ioeventfd", VIR_XML_PROP_NONE, &def->driver.virtio.ioeventfd) < 0) - goto error; + return NULL; if (virXMLPropTristateSwitch(driver_node, "event_idx", VIR_XML_PROP_NONE, &def->driver.virtio.event_idx) < 0) - goto error; + return NULL; if (virXMLPropUInt(driver_node, "queues", 10, VIR_XML_PROP_NONE, &def->driver.virtio.queues) < 0) - goto error; + return NULL; /* There's always at least one TX/RX queue. */ if (def->driver.virtio.queues =3D=3D 1) @@ -9434,74 +9434,74 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, if (virXMLPropUInt(driver_node, "rx_queue_size", 10, VIR_XML_PROP_NONE, &def->driver.virtio.rx_queue_size) < 0) - goto error; + return NULL; if (virXMLPropUInt(driver_node, "tx_queue_size", 10, VIR_XML_PROP_NONE, &def->driver.virtio.tx_queue_size) < 0) - goto error; + return NULL; if (virXMLPropTristateSwitch(driver_node, "rss", VIR_XML_PROP_NONE, &def->driver.virtio.rss) < 0) - goto error; + return NULL; if (virXMLPropTristateSwitch(driver_node, "rss_hash_report", VIR_XML_PROP_NONE, &def->driver.virtio.rss_hash_report) = < 0) - goto error; + return NULL; if ((tmpNode =3D virXPathNode("./driver/host", ctxt))) { if (virXMLPropTristateSwitch(tmpNode, "csum", VIR_XML_PROP_NON= E, &def->driver.virtio.host.csum) < = 0) - goto error; + return NULL; if (virXMLPropTristateSwitch(tmpNode, "gso", VIR_XML_PROP_NONE, &def->driver.virtio.host.gso) < 0) - goto error; + return NULL; if (virXMLPropTristateSwitch(tmpNode, "tso4", VIR_XML_PROP_NON= E, &def->driver.virtio.host.tso4) < = 0) - goto error; + return NULL; if (virXMLPropTristateSwitch(tmpNode, "tso6", VIR_XML_PROP_NON= E, &def->driver.virtio.host.tso6) < = 0) - goto error; + return NULL; if (virXMLPropTristateSwitch(tmpNode, "ecn", VIR_XML_PROP_NONE, &def->driver.virtio.host.ecn) < 0) - goto error; + return NULL; if (virXMLPropTristateSwitch(tmpNode, "ufo", VIR_XML_PROP_NONE, &def->driver.virtio.host.ufo) < 0) - goto error; + return NULL; if (virXMLPropTristateSwitch(tmpNode, "mrg_rxbuf", VIR_XML_PROP_NONE, &def->driver.virtio.host.mrg_rxbu= f) < 0) - goto error; + return NULL; } if ((tmpNode =3D virXPathNode("./driver/guest", ctxt))) { if (virXMLPropTristateSwitch(tmpNode, "csum", VIR_XML_PROP_NON= E, &def->driver.virtio.guest.csum) <= 0) - goto error; + return NULL; if (virXMLPropTristateSwitch(tmpNode, "tso4", VIR_XML_PROP_NON= E, &def->driver.virtio.guest.tso4) <= 0) - goto error; + return NULL; if (virXMLPropTristateSwitch(tmpNode, "tso6", VIR_XML_PROP_NON= E, &def->driver.virtio.guest.tso6) <= 0) - goto error; + return NULL; if (virXMLPropTristateSwitch(tmpNode, "ecn", VIR_XML_PROP_NONE, &def->driver.virtio.guest.ecn) < = 0) - goto error; + return NULL; if (virXMLPropTristateSwitch(tmpNode, "ufo", VIR_XML_PROP_NONE, &def->driver.virtio.guest.ufo) < = 0) - goto error; + return NULL; } def->backend.vhost =3D g_steal_pointer(&vhost_path); } @@ -9512,7 +9512,7 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown interface link state '%s'"), linkstate); - goto error; + return NULL; } } @@ -9540,12 +9540,12 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, case VIR_DOMAIN_NET_TYPE_LAST: default: virReportEnumRangeError(virDomainNetType, def->type); - goto error; + return NULL; } } if (virDomainNetTeamingInfoParseXML(ctxt, &def->teaming) < 0) - goto error; + return NULL; rv =3D virXPathULong("string(./tune/sndbuf)", ctxt, &def->tune.sndbuf); if (rv >=3D 0) { @@ -9553,28 +9553,25 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, } else if (rv =3D=3D -2) { virReportError(VIR_ERR_XML_ERROR, "%s", _("sndbuf must be a positive integer")); - goto error; + return NULL; } if (virXPathUInt("string(./mtu/@size)", ctxt, &def->mtu) < -1) { virReportError(VIR_ERR_XML_ERROR, "%s", _("malformed mtu size")); - goto error; + return NULL; } node =3D virXPathNode("./coalesce", ctxt); if (node) { if (virDomainNetDefCoalesceParseXML(node, ctxt, &def->coalesce) < = 0) - goto error; + return NULL; } if (virNetworkPortOptionsParseXML(ctxt, &def->isolatedPort) < 0) - goto error; + return NULL; return g_steal_pointer(&def); - - error: - return NULL; } static int --=20 2.37.1