From nobody Sun Feb 8 14:51:50 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 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=1571737185; cv=none; d=zoho.com; s=zohoarc; b=mGttOTF7Gs2Ifi3cybLH3qo9486r4Z6kvhVpgMwtgy9kxxcA7Ip50/l0PaYVmbNAlaxt8tpQVdJVw+mpNuuYu+rGUcCsrSwZshUOcNlGcNDHWbHgn8BQO50KZckRRioQ8AjhMooHm+qDOGmCy9fEEWvsMlHhr6h8pIyAtYRmJoU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571737185; 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=wPxyshNdiF5ynDKXFP6ij4bFcxWVTPSrL/liZ1eIgP8=; b=gJ6QtCYuZhcG1Plk3hCC+FaZAl23RznIl0PIiTYhcVwncBfwy7lYLIcT/fb734letYerHptunLUdnmuBFZiy7s+b7AZh5OwdKCmSMWHAXMZKmb/TYuKFgjUVrsTTwkMfPe5HNE5VFvyajx4IKAxIA1rDYB8IL7MbjvFpiNyQHS0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 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-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1571737185196694.3216938174918; Tue, 22 Oct 2019 02:39:45 -0700 (PDT) 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-66-dMfFZc5NMBOtOtuJdkKwng-1; Tue, 22 Oct 2019 05:39:42 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 41DFA107AD31; Tue, 22 Oct 2019 09:39:36 +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 13FE55D6A9; Tue, 22 Oct 2019 09:39:36 +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 C87D41A504; Tue, 22 Oct 2019 09:39:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9LIJp9K000693 for ; Mon, 21 Oct 2019 14:19:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id 972B860C63; Mon, 21 Oct 2019 18:19:51 +0000 (UTC) Received: from mx1.redhat.com (ext-mx29.extmail.prod.ext.phx2.redhat.com [10.5.110.70]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8E68360C4E for ; Mon, 21 Oct 2019 18:19:51 +0000 (UTC) Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 581F91918676 for ; Mon, 21 Oct 2019 18:19:50 +0000 (UTC) Received: by mail-qt1-f194.google.com with SMTP id u22so22428308qtq.13 for ; Mon, 21 Oct 2019 11:19:50 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:7979:d16f:4e5e:8e8d:1141]) by smtp.gmail.com with ESMTPSA id d205sm9248741qke.96.2019.10.21.11.19.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2019 11:19:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571737184; 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=wPxyshNdiF5ynDKXFP6ij4bFcxWVTPSrL/liZ1eIgP8=; b=cYXaSwSMW9VzyvI8hvb/gYV34ophZJtueRdWi0qY5mbFxjy7pSa2KEtrDr/4xjTn4AqWrE eHOyQrw/RG0/OivSSCwizu/wjQQvJpXzAZTL8LuJukI0kamDZrMal8ozpo0V2cK1yYaWAA b/XfCVALbMnDRfkgSkGPK1neFbTWwQ4= 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=svozyyvaMZwe0pC3dxDy84LejiV/2DLYWya9YohE15w=; b=Ee6n/6hJX2PVECW872/G4f0yOMxOszKUzpPTdMnnwdVPoh5UmM/sSvEWG8O0doXM/B DBegP7gzzCY0KEY4SICqmMHwpZUcNli2JxARfZCd1Us6s4YWQE8yIa+jnGBWHub1VrKZ 1PCk28FUX6EWtb/EtJiPsSmrjn4Lax0OqBiSM0pGfEC3stoImVKv0F8Q1+yiOJRGSOF0 C6GHd90ljAy2NqqDTEiB6r48xpGBzeKudpzbUJUQdu2LmlkMwYKZM3LHKMrv3OFH5+0c ++TQMY4P5MGaq5sggAyCYIuTpLS756/xIG3B6gOQZy5igUkQaQX6ntMpZ4NbvpdJXyvt 7izQ== X-Gm-Message-State: APjAAAUUdtXmV3e8vIuPQfTieK+V45M5OSp+YIYs+1s62z45V11e0bV3 bwfDfm6AzoSbBKQtAOqIjxCtk4BMKY0= X-Google-Smtp-Source: APXvYqwH73A6tw/9EFblRE5eUnOjomK5mHmutqVo989Hijytqf4TMzBBGZ92HvPyz1beCHGhQd4y4w== X-Received: by 2002:ac8:730c:: with SMTP id x12mr14097784qto.193.1571681989160; Mon, 21 Oct 2019 11:19:49 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 21 Oct 2019 15:19:07 -0300 Message-Id: <20191021181911.14986-18-danielhb413@gmail.com> In-Reply-To: <20191021181911.14986-1-danielhb413@gmail.com> References: <20191021181911.14986-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.70]); Mon, 21 Oct 2019 18:19:50 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.70]); Mon, 21 Oct 2019 18:19:50 +0000 (UTC) for IP:'209.85.160.194' DOMAIN:'mail-qt1-f194.google.com' HELO:'mail-qt1-f194.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.131 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS) 209.85.160.194 mail-qt1-f194.google.com 209.85.160.194 mail-qt1-f194.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.70 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 17/21] bridge_driver.c: remove unneeded cleanup 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.79 on 10.5.11.15 X-MC-Unique: dMfFZc5NMBOtOtuJdkKwng-1 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 Reviewed-by: J=C3=A1n Tomko --- src/network/bridge_driver.c | 172 ++++++++++++++---------------------- 1 file changed, 68 insertions(+), 104 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index fcaa6a48ae..0ba7f91c20 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1010,7 +1010,7 @@ networkKillDaemon(pid_t pid, daemonName, pid, networkName, signame, virStrerror(errno, ebuf, sizeof(ebuf))); } - goto cleanup; + return ret; } /* NB: since networks have no reference count like * domains, there is no safe way to unlock the network @@ -1032,7 +1032,6 @@ networkKillDaemon(pid_t pid, VIR_WARN("Timed out waiting after SIG%s to %s process %d " "(network '%s')", signame, daemonName, pid, networkName); - cleanup: return ret; } =20 @@ -3205,19 +3204,15 @@ networkConnectListAllNetworks(virConnectPtr conn, unsigned int flags) { virNetworkDriverStatePtr driver =3D networkGetDriver(); - int ret =3D -1; =20 virCheckFlags(VIR_CONNECT_LIST_NETWORKS_FILTERS_ALL, -1); =20 if (virConnectListAllNetworksEnsureACL(conn) < 0) - goto cleanup; - - ret =3D virNetworkObjListExport(conn, driver->networks, nets, - virConnectListAllNetworksCheckACL, - flags); + return -1; =20 - cleanup: - return ret; + return virNetworkObjListExport(conn, driver->networks, nets, + virConnectListAllNetworksCheckACL, + flags); } =20 =20 @@ -3233,14 +3228,13 @@ networkConnectNetworkEventRegisterAny(virConnectPtr= conn, int ret =3D -1; =20 if (virConnectNetworkEventRegisterAnyEnsureACL(conn) < 0) - goto cleanup; + return -1; =20 if (virNetworkEventStateRegisterID(conn, driver->networkEventState, net, eventID, callback, opaque, freecb, &ret) < 0) ret =3D -1; =20 - cleanup: return ret; } =20 @@ -3250,20 +3244,16 @@ networkConnectNetworkEventDeregisterAny(virConnectP= tr conn, int callbackID) { virNetworkDriverStatePtr driver =3D networkGetDriver(); - int ret =3D -1; =20 if (virConnectNetworkEventDeregisterAnyEnsureACL(conn) < 0) - goto cleanup; + return -1; =20 if (virObjectEventStateDeregisterID(conn, driver->networkEventState, callbackID, true) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -3367,24 +3357,20 @@ static int networkBridgeNameValidate(virNetworkObjListPtr nets, virNetworkDefPtr def) { - int ret =3D -1; - if (def->bridge && !strstr(def->bridge, "%d")) { if (virNetworkObjBridgeInUse(nets, def->bridge, def->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("bridge name '%s' already in use."), def->bridge); - goto cleanup; + return -1; } } else { /* Allocate a bridge name */ if (networkFindUnusedBridgeName(nets, def) < 0) - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -4537,7 +4523,6 @@ networkAllocatePort(virNetworkObjPtr obj, virPortGroupDefPtr portgroup =3D NULL; virNetworkForwardIfDefPtr dev =3D NULL; size_t i; - int ret =3D -1; virNetDevVPortProfilePtr portprofile =3D NULL; =20 netdef =3D virNetworkObjGetDef(obj); @@ -4547,7 +4532,7 @@ networkAllocatePort(virNetworkObjPtr obj, virReportError(VIR_ERR_OPERATION_INVALID, _("network '%s' is not active"), netdef->name); - goto cleanup; + return -1; } =20 VIR_DEBUG("Interface port group %s", port->group); @@ -4561,7 +4546,7 @@ networkAllocatePort(virNetworkObjPtr obj, if (portgroup && portgroup->bandwidth && virNetDevBandwidthCopy(&port->bandwidth, portgroup->bandwidth) < 0) - goto cleanup; + return -1; } =20 if (port->vlan.nTags =3D=3D 0) { @@ -4572,7 +4557,7 @@ networkAllocatePort(virNetworkObjPtr obj, vlan =3D &netdef->vlan; =20 if (vlan && virNetDevVlanCopy(&port->vlan, vlan) < 0) - goto cleanup; + return -1; } =20 if (!port->trustGuestRxFilters) { @@ -4590,7 +4575,7 @@ networkAllocatePort(virNetworkObjPtr obj, netdef->virtPortProfile, portgroup ? portgroup->virtPortProfile : NULL) <= 0) { - goto cleanup; + return -1; } if (portprofile) { VIR_FREE(port->virtPortProfile); @@ -4618,18 +4603,18 @@ networkAllocatePort(virNetworkObjPtr obj, "'%s' which uses IP forwarding"), virNetDevVPortTypeToString(port->virtPortProfil= e->virtPortType), netdef->name); - goto cleanup; + return -1; } =20 if (networkPlugBandwidth(obj, &port->mac, port->bandwidth, &port->= class_id) < 0) - goto cleanup; + return -1; break; =20 case VIR_NETWORK_FORWARD_HOSTDEV: { port->plugtype =3D VIR_NETWORK_PORT_PLUG_TYPE_HOSTDEV_PCI; =20 if (networkCreateInterfacePool(netdef) < 0) - goto cleanup; + return -1; =20 /* pick first dev with 0 connections */ for (i =3D 0; i < netdef->forward.nifs; i++) { @@ -4643,7 +4628,7 @@ networkAllocatePort(virNetworkObjPtr obj, _("network '%s' requires exclusive access " "to interfaces, but none are available"), netdef->name); - goto cleanup; + return -1; } port->plug.hostdevpci.addr =3D dev->device.pci; port->plug.hostdevpci.driver =3D netdef->forward.driverName; @@ -4659,7 +4644,7 @@ networkAllocatePort(virNetworkObjPtr obj, "via PCI passthrough"), virNetDevVPortTypeToString(port->virtPortPr= ofile->virtPortType), netdef->name); - goto cleanup; + return -1; } } break; @@ -4683,12 +4668,12 @@ networkAllocatePort(virNetworkObjPtr obj, "'%s' which uses a bridge device"), virNetDevVPortTypeToString(port->virtPo= rtProfile->virtPortType), netdef->name); - goto cleanup; + return -1; } } =20 if (networkPlugBandwidth(obj, &port->mac, port->bandwidth, &po= rt->class_id) < 0) - goto cleanup; + return -1; break; } =20 @@ -4722,7 +4707,7 @@ networkAllocatePort(virNetworkObjPtr obj, "'%s' which uses a macvtap device"), virNetDevVPortTypeToString(port->virtPortPr= ofile->virtPortType), netdef->name); - goto cleanup; + return -1; } } =20 @@ -4734,12 +4719,12 @@ networkAllocatePort(virNetworkObjPtr obj, _("network '%s' uses a direct mode, but " "has no forward dev and no interface pool"), netdef->name); - goto cleanup; + return -1; } else { /* pick an interface from the pool */ =20 if (networkCreateInterfacePool(netdef) < 0) - goto cleanup; + return -1; =20 /* PASSTHROUGH mode, and PRIVATE Mode + 802.1Qbh both * require exclusive access to a device, so current @@ -4774,7 +4759,7 @@ networkAllocatePort(virNetworkObjPtr obj, _("network '%s' requires exclusive access " "to interfaces, but none are available"), netdef->name); - goto cleanup; + return -1; } port->plug.direct.linkdev =3D g_strdup(dev->device.dev); } @@ -4783,15 +4768,15 @@ networkAllocatePort(virNetworkObjPtr obj, case VIR_NETWORK_FORWARD_LAST: default: virReportEnumRangeError(virNetworkForwardType, netdef->forward.typ= e); - goto cleanup; + return -1; } =20 if (virNetworkObjMacMgrAdd(obj, driver->dnsmasqStateDir, port->ownername, &port->mac) < 0) - goto cleanup; + return -1; =20 if (virNetDevVPortProfileCheckComplete(port->virtPortProfile, true) < = 0) - goto cleanup; + return -1; =20 /* make sure that everything now specified for the device is * actually supported on this type of network. NB: network, @@ -4816,7 +4801,7 @@ networkAllocatePort(virNetworkObjPtr obj, "is requesting a vlan tag, but that is not " "supported for this type of network"), netdef->name); - goto cleanup; + return -1; } } =20 @@ -4827,7 +4812,7 @@ networkAllocatePort(virNetworkObjPtr obj, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("bandwidth settings are not supported " "for hostdev interfaces")); - goto cleanup; + return -1; } =20 netdef->connections++; @@ -4841,15 +4826,13 @@ networkAllocatePort(virNetworkObjPtr obj, netdef->connections--; if (dev) dev->connections--; - goto cleanup; + return -1; } networkLogAllocation(netdef, dev, &port->mac, true); =20 VIR_DEBUG("Port allocated"); =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -4869,7 +4852,6 @@ networkNotifyPort(virNetworkObjPtr obj, virNetworkDefPtr netdef; virNetworkForwardIfDefPtr dev =3D NULL; size_t i; - int ret =3D -1; =20 netdef =3D virNetworkObjGetDef(obj); =20 @@ -4877,14 +4859,14 @@ networkNotifyPort(virNetworkObjPtr obj, virReportError(VIR_ERR_OPERATION_INVALID, _("network '%s' is not active"), netdef->name); - goto cleanup; + return -1; } =20 switch (port->plugtype) { case VIR_NETWORK_PORT_PLUG_TYPE_NONE: virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unexpectedly got a network port without a plug")= ); - goto cleanup; + return -1; =20 case VIR_NETWORK_PORT_PLUG_TYPE_NETWORK: case VIR_NETWORK_PORT_PLUG_TYPE_BRIDGE: @@ -4892,13 +4874,13 @@ networkNotifyPort(virNetworkObjPtr obj, if (!netdef->bridge) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unexpectedly got a network port without a ne= twork bridge")); - goto cleanup; + return -1; } break; =20 case VIR_NETWORK_PORT_PLUG_TYPE_DIRECT: if (networkCreateInterfacePool(netdef) < 0) - goto cleanup; + return -1; =20 /* find the matching interface and increment its connections */ for (i =3D 0; i < netdef->forward.nifs; i++) { @@ -4917,7 +4899,7 @@ networkNotifyPort(virNetworkObjPtr obj, "in use by network port '%s'"), netdef->name, port->plug.direct.linkdev, port->uuid); - goto cleanup; + return -1; } =20 /* PASSTHROUGH mode and PRIVATE Mode + 802.1Qbh both require @@ -4933,14 +4915,14 @@ networkNotifyPort(virNetworkObjPtr obj, _("network '%s' claims dev=3D'%s' is already in= " "use by a different port"), netdef->name, port->plug.direct.linkdev); - goto cleanup; + return -1; } break; =20 case VIR_NETWORK_PORT_PLUG_TYPE_HOSTDEV_PCI: =20 if (networkCreateInterfacePool(netdef) < 0) - goto cleanup; + return -1; =20 /* find the matching interface and increment its connections */ for (i =3D 0; i < netdef->forward.nifs; i++) { @@ -4962,7 +4944,7 @@ networkNotifyPort(virNetworkObjPtr obj, port->plug.hostdevpci.addr.bus, port->plug.hostdevpci.addr.slot, port->plug.hostdevpci.addr.function); - goto cleanup; + return -1; } =20 /* PASSTHROUGH mode, PRIVATE Mode + 802.1Qbh, and hostdev (PCI @@ -4978,7 +4960,7 @@ networkNotifyPort(virNetworkObjPtr obj, netdef->name, dev->device.pci.domain, dev->device.pci.bus, dev->device.pci.slot, dev->device.pci.function); - goto cleanup; + return -1; } =20 break; @@ -4986,7 +4968,7 @@ networkNotifyPort(virNetworkObjPtr obj, case VIR_NETWORK_PORT_PLUG_TYPE_LAST: default: virReportEnumRangeError(virNetworkPortPlugType, port->plugtype); - goto cleanup; + return -1; } =20 netdef->connections++; @@ -4999,13 +4981,11 @@ networkNotifyPort(virNetworkObjPtr obj, if (dev) dev->connections--; netdef->connections--; - goto cleanup; + return -1; } networkLogAllocation(netdef, dev, &port->mac, true); =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -5028,7 +5008,6 @@ networkReleasePort(virNetworkObjPtr obj, virNetworkDefPtr netdef; virNetworkForwardIfDefPtr dev =3D NULL; size_t i; - int ret =3D -1; =20 netdef =3D virNetworkObjGetDef(obj); =20 @@ -5041,7 +5020,7 @@ networkReleasePort(virNetworkObjPtr obj, case VIR_NETWORK_PORT_PLUG_TYPE_BRIDGE: if (networkUnplugBandwidth(obj, port->bandwidth, &port->class_id) < 0) - goto cleanup; + return -1; break; =20 case VIR_NETWORK_PORT_PLUG_TYPE_DIRECT: @@ -5050,7 +5029,7 @@ networkReleasePort(virNetworkObjPtr obj, _("network '%s' uses a direct mode, but " "has no forward dev and no interface pool"), netdef->name); - goto cleanup; + return -1; } =20 for (i =3D 0; i < netdef->forward.nifs; i++) { @@ -5067,7 +5046,7 @@ networkReleasePort(virNetworkObjPtr obj, _("network '%s' doesn't have dev=3D'%s' " "in use by domain"), netdef->name, port->plug.direct.linkdev); - goto cleanup; + return -1; } break; =20 @@ -5077,7 +5056,7 @@ networkReleasePort(virNetworkObjPtr obj, _("network '%s' uses a hostdev mode, but " "has no forward dev and no interface pool"), netdef->name); - goto cleanup; + return -1; } =20 for (i =3D 0; i < netdef->forward.nifs; i++) { @@ -5099,14 +5078,14 @@ networkReleasePort(virNetworkObjPtr obj, port->plug.hostdevpci.addr.bus, port->plug.hostdevpci.addr.slot, port->plug.hostdevpci.addr.function); - goto cleanup; + return -1; } break; =20 case VIR_NETWORK_PORT_PLUG_TYPE_LAST: default: virReportEnumRangeError(virNetworkPortPlugType, port->plugtype); - goto cleanup; + return -1; } =20 virNetworkObjMacMgrDel(obj, driver->dnsmasqStateDir, port->ownername, = &port->mac); @@ -5119,9 +5098,7 @@ networkReleasePort(virNetworkObjPtr obj, VIR_HOOK_SUBOP_BEGIN); networkLogAllocation(netdef, dev, &port->mac, false); =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -5152,7 +5129,6 @@ networkCheckBandwidth(virNetworkObjPtr obj, virMacAddrPtr ifaceMac, unsigned long long *new_rate) { - int ret =3D -1; virNetworkDefPtr def =3D virNetworkObjGetDef(obj); virNetDevBandwidthPtr netBand =3D def->bandwidth; unsigned long long tmp_floor_sum =3D virNetworkObjGetFloorSum(obj); @@ -5201,7 +5177,7 @@ networkCheckBandwidth(virNetworkObjPtr obj, tmp_floor_sum, netBand->in->peak, def->name); - goto cleanup; + return -1; } } else if (tmp_floor_sum > netBand->in->average) { /* tmp_floor_sum can be between 'average' and 'peak' iff 'peak' is= set. @@ -5215,15 +5191,13 @@ networkCheckBandwidth(virNetworkObjPtr obj, tmp_floor_sum, netBand->in->average, def->name); - goto cleanup; + return -1; } =20 if (new_rate) *new_rate =3D tmp_new_rate; - ret =3D 0; =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -5266,20 +5240,19 @@ networkPlugBandwidthImpl(virNetworkObjPtr obj, unsigned long long tmp_floor_sum =3D virNetworkObjGetFloorSum(obj); ssize_t next_id =3D 0; int plug_ret; - int ret =3D -1; =20 /* generate new class_id */ if ((next_id =3D networkNextClassID(obj)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not generate next class ID")); - goto cleanup; + return -1; } =20 plug_ret =3D virNetDevBandwidthPlug(def->bridge, def->bandwidth, mac, ifaceBand, next_id); if (plug_ret < 0) { ignore_value(virNetDevBandwidthUnplug(def->bridge, next_id)); - goto cleanup; + return -1; } =20 /* QoS was set, generate new class ID */ @@ -5294,7 +5267,7 @@ networkPlugBandwidthImpl(virNetworkObjPtr obj, virNetworkObjSetFloorSum(obj, tmp_floor_sum); *class_id =3D 0; ignore_value(virNetDevBandwidthUnplug(def->bridge, next_id)); - goto cleanup; + return -1; } /* update rate for non guaranteed NICs */ new_rate -=3D tmp_floor_sum; @@ -5303,9 +5276,7 @@ networkPlugBandwidthImpl(virNetworkObjPtr obj, VIR_WARN("Unable to update rate for 1:2 class on %s bridge", def->bridge); =20 - ret =3D 0; - cleanup: - return ret; + return 0; } =20 =20 @@ -5315,7 +5286,6 @@ networkPlugBandwidth(virNetworkObjPtr obj, virNetDevBandwidthPtr ifaceBand, unsigned int *class_id) { - int ret =3D -1; int plug_ret; unsigned long long new_rate =3D 0; char ifmac[VIR_MAC_STRING_BUFLEN]; @@ -5323,24 +5293,19 @@ networkPlugBandwidth(virNetworkObjPtr obj, if ((plug_ret =3D networkCheckBandwidth(obj, ifaceBand, NULL, mac, &new_rate)) < 0) { /* helper reported error */ - goto cleanup; + return -1; } =20 - if (plug_ret > 0) { + if (plug_ret > 0) /* no QoS needs to be set; claim success */ - ret =3D 0; - goto cleanup; - } + return 0; =20 virMacAddrFormat(mac, ifmac); =20 if (networkPlugBandwidthImpl(obj, mac, ifaceBand, class_id, new_rate) = < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -5360,7 +5325,7 @@ networkUnplugBandwidth(virNetworkObjPtr obj, if (!def->bandwidth || !def->bandwidth->in) { VIR_WARN("Network %s has no bandwidth but unplug requested", def->name); - goto cleanup; + return 0; } /* we must remove class from bridge */ new_rate =3D def->bandwidth->in->average; @@ -5370,7 +5335,7 @@ networkUnplugBandwidth(virNetworkObjPtr obj, =20 ret =3D virNetDevBandwidthUnplug(def->bridge, *class_id); if (ret < 0) - goto cleanup; + return ret; /* update sum of 'floor'-s of attached NICs */ tmp_floor_sum -=3D ifaceBand->in->floor; virNetworkObjSetFloorSum(obj, tmp_floor_sum); @@ -5383,7 +5348,7 @@ networkUnplugBandwidth(virNetworkObjPtr obj, tmp_floor_sum +=3D ifaceBand->in->floor; virNetworkObjSetFloorSum(obj, tmp_floor_sum); ignore_value(virBitmapSetBit(classIdMap, *class_id)); - goto cleanup; + return ret; } /* update rate for non guaranteed NICs */ new_rate -=3D tmp_floor_sum; @@ -5395,7 +5360,6 @@ networkUnplugBandwidth(virNetworkObjPtr obj, *class_id =3D 0; } =20 - cleanup: return ret; } =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list