From nobody Sun Feb 8 19:39:34 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1578347928; cv=none; d=zohomail.com; s=zohoarc; b=OS47IK8OiiNAlxQqRYFJzgFFfIGdl7Uy0WNzE62fAw84qYYnXOmuwo5EY6uuFU1eYoUW6YvYjGJR9GubcDZSKL0QklRkQevDKN8Pn9BF2F2I8WQBv+v6t6GskrZnCXj/mvUp6yU7bIWwKps3676NS1zTP/vw5M8lQpbwmNeMYhA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578347928; 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=GyWhj9W59tx6GuG8u9BzwLnVtVFKmIzoX0aLMFo5mHQ=; b=CKCK+6xi1BRd6SsuI1ZXSICeow/IgVI/b1piesEgNTJQf/2SXIiBhNyRfh0yfHJOfblZZh9bjxVjYLXhXFyuVg4dOWkQwKfUH8xgXmv9cFvvTl2Wm7wzKmnNVvu8tafPDuqQkqx08dRa0h1brEvoZvpcr9HwknVrMgZlpAzPyHQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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 [207.211.31.81]) by mx.zohomail.com with SMTPS id 1578347928297915.0250326726739; Mon, 6 Jan 2020 13:58:48 -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-235-978y230BPJKqhyml9YHNzQ-1; Mon, 06 Jan 2020 16:58:45 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5BCF41005514; Mon, 6 Jan 2020 21:58:39 +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 311D460BEC; Mon, 6 Jan 2020 21:58:39 +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 E7738180CB3B; Mon, 6 Jan 2020 21:58:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 006LwYB2007387 for ; Mon, 6 Jan 2020 16:58:34 -0500 Received: by smtp.corp.redhat.com (Postfix) id 3C9F210166FF; Mon, 6 Jan 2020 21:58:34 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3643E101B564 for ; Mon, 6 Jan 2020 21:58:34 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (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 12C87101D231 for ; Mon, 6 Jan 2020 21:58:34 +0000 (UTC) Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-228-0d6r-OhmO_67faNKcAmGyQ-1; Mon, 06 Jan 2020 16:58:32 -0500 Received: by mail-qk1-f176.google.com with SMTP id r14so40868329qke.13 for ; Mon, 06 Jan 2020 13:58:32 -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.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jan 2020 13:58:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578347927; 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=GyWhj9W59tx6GuG8u9BzwLnVtVFKmIzoX0aLMFo5mHQ=; b=A2zdTURjZyGmE6WZnODl+Og1ktvanKYxEYLVtL4oHpxvWL3dHMOL+gZaAcjuKpu2v775tL ddXf9RG+yLZ3ebVW1rjdAc2TLNzi+4B6lSfrj7nj+IzfAeRr+TA3u/dZjx1edND4Nfuq1p 1SRdPZr+3JBrAVoLAVkFvp7n0Jisv4s= 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=CN67Wrclw0PNAqwvl3tsT+UppMuXhM3wgGT+AYegS6Y=; b=TfhLS+ke51lkcKkxCjO/Y2TqMr6Qs5Jeg0hUccbof5RJYa1pplZsO35jH6nLxaq+7A 7cWpfjNzRUBCcBnKbMV/uObOoK1AW1Eup8zgqasubKW/Qs1Z9fdU5p6JZmGX9RktsTLJ vO5WmrWbj0Eqrc67i31vkNXFDmmOJklY7AOkS1f9h3irp4vqbTYV6qKUEpJuvT+D8c1d yXTztStRVsWXjW+P/tq8NqY38M3oGbYdIz443PNstlNH3Fhlm5JxV3n2kOT6qk0oxk1W F3AVvuM9vSWcWQUYw3NEvU1wD+5cqVke05c053YDKdZIRecEDRPhQeiYf3I4GIv8rFp9 YRmg== X-Gm-Message-State: APjAAAVsgXMq8C/tRx1P3Ix0CMnfAOBLOvPnMNUJuM3ogZc5neRkKLWr D9iFc428rcjfpsVvvx1/NEhYbtj/ X-Google-Smtp-Source: APXvYqzpE/MaLUowq4okCqcMjROOy5z7haDnrcChFchN7I/GmyHHiGnj60/z7lSLoGOl20IMpAZ+KQ== X-Received: by 2002:a37:5d1:: with SMTP id 200mr83146499qkf.492.1578347911609; Mon, 06 Jan 2020 13:58:31 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 6 Jan 2020 18:57:46 -0300 Message-Id: <20200106215750.361615-23-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: 0d6r-OhmO_67faNKcAmGyQ-1 X-MC-Unique: 978y230BPJKqhyml9YHNzQ-1 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 006LwYB2007387 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 22/26] util: 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.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Remove unneeded labels of the following util files: virhostcpu.c virnetdevvportprofile.c virnetlink.c virpci.c virsocketaddr.c virstoragefile.c Signed-off-by: Daniel Henrique Barboza --- src/util/virhostcpu.c | 6 ++-- src/util/virnetdevvportprofile.c | 52 ++++++++++++++------------------ src/util/virnetlink.c | 4 +-- src/util/virpci.c | 14 +++------ src/util/virsocketaddr.c | 11 ++----- src/util/virstoragefile.c | 4 +-- 6 files changed, 35 insertions(+), 56 deletions(-) diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index 22102f2c75..7f14340f49 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -1119,7 +1119,7 @@ virHostCPUGetThreadsPerSubcore(virArch arch) * In either case, falling back to the subcore-unaware thread * counting logic is the right thing to do */ if (!virFileExists(KVM_DEVICE)) - goto out; + return 0; =20 if ((kvmfd =3D open(KVM_DEVICE, O_RDONLY)) < 0) { /* This can happen when running as a regular user if @@ -1129,8 +1129,7 @@ virHostCPUGetThreadsPerSubcore(virArch arch) virReportSystemError(errno, _("Failed to open '%s'"), KVM_DEVICE); - threads_per_subcore =3D -1; - goto out; + return -1; } =20 /* For Phyp and KVM based guests the ioctl for KVM_CAP_PPC_SMT @@ -1143,7 +1142,6 @@ virHostCPUGetThreadsPerSubcore(virArch arch) VIR_FORCE_CLOSE(kvmfd); } =20 - out: return threads_per_subcore; } =20 diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprof= ile.c index c5db49b932..5ca96132c4 100644 --- a/src/util/virnetdevvportprofile.c +++ b/src/util/virnetdevvportprofile.c @@ -518,7 +518,6 @@ virNetDevVPortProfileGetStatus(struct nlattr **tb, int3= 2_t vf, bool is8021Qbg, uint16_t *status) { - int rc =3D -1; struct nlattr *tb_port[IFLA_PORT_MAX + 1] =3D { NULL, }; =20 if (vf =3D=3D PORT_SELF_VF && nltarget_kernel) { @@ -527,12 +526,12 @@ virNetDevVPortProfileGetStatus(struct nlattr **tb, in= t32_t vf, ifla_port_policy)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("error parsing IFLA_PORT_SELF part")); - goto cleanup; + return -1; } } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("IFLA_PORT_SELF is missing")); - goto cleanup; + return -1; } } else { if (tb[IFLA_VF_PORTS]) { @@ -546,14 +545,14 @@ virNetDevVPortProfileGetStatus(struct nlattr **tb, in= t32_t vf, virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("error while iterating over " "IFLA_VF_PORTS part")); - goto cleanup; + return -1; } =20 if (nla_parse_nested(tb_port, IFLA_PORT_MAX, tb_vf_ports, ifla_port_policy)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("error parsing IFLA_VF_PORT part")); - goto cleanup; + return -1; } =20 /* This ensures that the given VF is present in the @@ -601,7 +600,7 @@ virNetDevVPortProfileGetStatus(struct nlattr **tb, int3= 2_t vf, virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("error parsing IFLA_VF_PORT " "during error reporting")); - goto cleanup; + return -1; } if (tb_port[IFLA_PORT_INSTANCE_UUID]) { virUUIDFormat((unsigned char *) @@ -613,31 +612,29 @@ virNetDevVPortProfileGetStatus(struct nlattr **tb, in= t32_t vf, *(uint32_t *)RTA_DATA(tb_port[IFLA_PORT_VF]) = : -1, uuidstr); } - goto cleanup; + return -1; } } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("IFLA_VF_PORTS is missing")); - goto cleanup; + return -1; } } =20 if (tb_port[IFLA_PORT_RESPONSE]) { *status =3D *(uint16_t *)RTA_DATA(tb_port[IFLA_PORT_RESPONSE]); - rc =3D 0; } else { if (is8021Qbg) { /* no in-progress here; may be missing */ *status =3D PORT_PROFILE_RESPONSE_INPROGRESS; - rc =3D 0; } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("no IFLA_PORT_RESPONSE found in netlink messa= ge")); - goto cleanup; + return -1; } } - cleanup: - return rc; + + return 0; } =20 =20 @@ -1051,7 +1048,6 @@ virNetDevVPortProfileOp8021Qbg(const char *ifname, enum virNetDevVPortProfileLinkOp virtPortOp, bool setlink_only) { - int rc =3D -1; int op =3D PORT_REQUEST_ASSOCIATE; struct ifla_port_vsi portVsi =3D { .vsi_mgr_id =3D virtPort->managerID, @@ -1069,7 +1065,7 @@ virNetDevVPortProfileOp8021Qbg(const char *ifname, =20 if (virNetDevVPortProfileGetPhysdevAndVlan(ifname, &physdev_ifindex, physdev_ifname, &vlanid) < = 0) { - goto cleanup; + return -1; } =20 if (vlanid < 0) @@ -1095,22 +1091,20 @@ virNetDevVPortProfileOp8021Qbg(const char *ifname, default: virReportError(VIR_ERR_INTERNAL_ERROR, _("operation type %d not supported"), virtPortOp); - goto cleanup; + return -1; } =20 - rc =3D virNetDevVPortProfileOpCommon(physdev_ifname, physdev_ifindex, - nltarget_kernel, - macaddr, - vlanid, - NULL, - &portVsi, - virtPort->instanceID, - NULL, - vf, - op, - setlink_only); - cleanup: - return rc; + return virNetDevVPortProfileOpCommon(physdev_ifname, physdev_ifindex, + nltarget_kernel, + macaddr, + vlanid, + NULL, + &portVsi, + virtPort->instanceID, + NULL, + vf, + op, + setlink_only); } =20 /* Returns 0 on success, -1 on general failure, and -2 on timeout */ diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 2542703092..710b4f5f51 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -184,16 +184,14 @@ virNetlinkCreateSocket(int protocol) } nl_socket_enable_msg_peek(nlhandle); =20 - cleanup: return nlhandle; =20 error: if (nlhandle) { nl_close(nlhandle); virNetlinkFree(nlhandle); - nlhandle =3D NULL; } - goto cleanup; + return NULL; } =20 static virNetlinkHandle * diff --git a/src/util/virpci.c b/src/util/virpci.c index 06d855a95b..0b1222373e 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -2146,32 +2146,28 @@ virPCIDeviceAddressParse(char *address, virPCIDeviceAddressPtr bdf) { char *p =3D NULL; - int ret =3D -1; =20 if ((address =3D=3D NULL) || (logStrToLong_ui(address, &p, 16, &bdf->domain) =3D=3D -1)) { - goto out; + return -1; } =20 if ((p =3D=3D NULL) || (logStrToLong_ui(p+1, &p, 16, &bdf->bus) =3D=3D -1)) { - goto out; + return -1; } =20 if ((p =3D=3D NULL) || (logStrToLong_ui(p+1, &p, 16, &bdf->slot) =3D=3D -1)) { - goto out; + return -1; } =20 if ((p =3D=3D NULL) || (logStrToLong_ui(p+1, &p, 16, &bdf->function) =3D=3D -1)) { - goto out; + return -1; } =20 - ret =3D 0; - - out: - return ret; + return 0; } =20 =20 diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index ef51d3fa7d..f90022827e 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -1102,27 +1102,24 @@ virSocketAddrPrefixToNetmask(unsigned int prefix, virSocketAddrPtr netmask, int family) { - int result =3D -1; - netmask->data.stor.ss_family =3D AF_UNSPEC; /* assume failure */ =20 if (family =3D=3D AF_INET) { int ip; =20 if (prefix > 32) - goto error; + return -1; =20 ip =3D prefix ? ~((1 << (32 - prefix)) - 1) : 0; netmask->data.inet4.sin_addr.s_addr =3D htonl(ip); netmask->data.stor.ss_family =3D AF_INET; netmask->len =3D sizeof(struct sockaddr_in); - result =3D 0; =20 } else if (family =3D=3D AF_INET6) { size_t i =3D 0; =20 if (prefix > 128) - goto error; + return -1; =20 while (prefix >=3D 8) { /* do as much as possible an entire byte at a time */ @@ -1140,11 +1137,9 @@ virSocketAddrPrefixToNetmask(unsigned int prefix, } netmask->data.stor.ss_family =3D AF_INET6; netmask->len =3D sizeof(struct sockaddr_in6); - result =3D 0; } =20 - error: - return result; + return 0; } =20 /** diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index c9f3e5f865..e46ac99219 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -533,14 +533,12 @@ qcow2GetExtensions(const char *buf, } =20 case QCOW2_HDR_EXTENSION_END: - goto done; + return 0; } =20 offset +=3D len; } =20 - done: - return 0; } =20 --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list