From nobody Sat Feb 7 09:36:39 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1536551324739281.9655513953194; Sun, 9 Sep 2018 20:48:44 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 073303D07; Mon, 10 Sep 2018 03:48:43 +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 BDAA6611C5; Mon, 10 Sep 2018 03:48:42 +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 7B80E181A139; Mon, 10 Sep 2018 03:48:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w8A3m6N2021333 for ; Sun, 9 Sep 2018 23:48:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id ADE5CD239A; Mon, 10 Sep 2018 03:48:06 +0000 (UTC) Received: from mx1.redhat.com (ext-mx16.extmail.prod.ext.phx2.redhat.com [10.5.110.45]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A6A59AB689 for ; Mon, 10 Sep 2018 03:48:04 +0000 (UTC) Received: from m50211.mail.qiye.163.com (m50211.mail.qiye.163.com [123.125.50.211]) by mx1.redhat.com (Postfix) with ESMTP id 63EAF3082A26 for ; Mon, 10 Sep 2018 03:48:01 +0000 (UTC) Received: from localhost.localdomain (unknown [58.56.27.130]) by smtp3 (Coremail) with SMTP id PdOowEDZhkJu6ZVb8BUdAg--.502S5; Mon, 10 Sep 2018 11:48:00 +0800 (CST) From: Shi Lei To: libvir-list@redhat.com Date: Mon, 10 Sep 2018 11:47:52 +0800 Message-Id: <20180910034755.31246-4-shi_lei@massclouds.com> In-Reply-To: <20180910034755.31246-1-shi_lei@massclouds.com> References: <20180910034755.31246-1-shi_lei@massclouds.com> X-CM-TRANSID: PdOowEDZhkJu6ZVb8BUdAg--.502S5 X-Coremail-Antispam: 1Uf129KBjvJXoWxtryDCF1UCry8Cr15ZF4Utwb_yoW3WrWkpF 1FqFyDtwsYqF4rGFWUAr1UGFn0yrZrXr4rt3yUuwnrZ3yfuaySgF4xCF12gan3JFyrWF15 JF4Y9F95Xa4UGaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0pR8hLnUUUUU= X-Originating-IP: [58.56.27.130] X-CM-SenderInfo: pvklsz1hl6ztxvvfz0xxgvhudrp/1tbifhC9T1rpNNMxqQAAsQ X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 212 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Mon, 10 Sep 2018 03:48:03 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Mon, 10 Sep 2018 03:48:03 +0000 (UTC) for IP:'123.125.50.211' DOMAIN:'m50211.mail.qiye.163.com' HELO:'m50211.mail.qiye.163.com' FROM:'shi_lei@massclouds.com' RCPT:'' X-RedHat-Spam-Score: -0.01 (RCVD_IN_DNSWL_NONE) 123.125.50.211 m50211.mail.qiye.163.com 123.125.50.211 m50211.mail.qiye.163.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.45 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.27 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/6] util: netdevbridge: use VIR_AUTOCLOSE instead of VIR_FORCE_CLOSE 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: , MIME-Version: 1.0 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 10 Sep 2018 03:48:43 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" By making use of GNU C's cleanup attribute handled by the VIR_AUTOCLOSE mac= ro, many of the VIR_FORCE_CLOSE calls can be dropped, which in turn leads to getting rid of many of our cleanup sections. =20 Signed-off-by: Shi Lei --- src/util/virnetdevbridge.c | 120 ++++++++++++------------------------- 1 file changed, 37 insertions(+), 83 deletions(-) diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c index bc377b5..d8528e1 100644 --- a/src/util/virnetdevbridge.c +++ b/src/util/virnetdevbridge.c @@ -81,9 +81,8 @@ static int virNetDevBridgeCmd(const char *brname, void *arg, size_t argsize) { - int s; - int ret =3D -1; struct ifdrv ifd; + VIR_AUTOCLOSE(s); =20 memset(&ifd, 0, sizeof(ifd)); =20 @@ -97,19 +96,14 @@ static int virNetDevBridgeCmd(const char *brname, virReportSystemError(ERANGE, _("Network interface name '%s' is too long"), brname); - goto cleanup; + return -1; } =20 ifd.ifd_cmd =3D op; ifd.ifd_len =3D argsize; ifd.ifd_data =3D arg; =20 - ret =3D ioctl(s, SIOCSDRVSPEC, &ifd); - - cleanup: - VIR_FORCE_CLOSE(s); - - return ret; + return ioctl(s, SIOCSDRVSPEC, &ifd); } #endif =20 @@ -167,10 +161,9 @@ static int virNetDevBridgeGet(const char *brname, const char *paramname, /* sysfs param name = */ unsigned long *value) /* current value */ { - int ret =3D -1; - int fd =3D -1; struct ifreq ifr; VIR_AUTOFREE(char *) path =3D NULL; + VIR_AUTOCLOSE(fd); =20 if (virAsprintf(&path, SYSFS_NET_DIR "%s/bridge/%s", brname, paramname= ) < 0) return -1; @@ -180,26 +173,26 @@ static int virNetDevBridgeGet(const char *brname, =20 if (virFileReadAll(path, INT_BUFSIZE_BOUND(unsigned long), &valuestr) < 0) - goto cleanup; + return -1; =20 if (virStrToLong_ul(valuestr, NULL, 10, value) < 0) { virReportSystemError(EINVAL, _("Unable to get bridge %s %s"), brname, paramname); - goto cleanup; + return -1; } } else { struct __bridge_info info; unsigned long args[] =3D { BRCTL_GET_BRIDGE_INFO, (unsigned long)&= info, 0, 0 }; =20 if ((fd =3D virNetDevSetupControl(brname, &ifr)) < 0) - goto cleanup; + return -1; =20 ifr.ifr_data =3D (char*)&args; if (ioctl(fd, SIOCDEVPRIVATE, ifr) < 0) { virReportSystemError(errno, _("Unable to get bridge %s %s"), brname, = paramname); - goto cleanup; + return -1; } =20 if (STREQ(paramname, "stp_state")) { @@ -209,14 +202,11 @@ static int virNetDevBridgeGet(const char *brname, } else { virReportSystemError(EINVAL, _("Unable to get bridge %s %s"), brname, = paramname); - goto cleanup; + return -1; } } =20 - ret =3D 0; - cleanup: - VIR_FORCE_CLOSE(fd); - return ret; + return 0; } #endif /* __linux__ */ =20 @@ -391,8 +381,7 @@ virNetDevBridgePortSetUnicastFlood(const char *brname A= TTRIBUTE_UNUSED, static int virNetDevBridgeCreateWithIoctl(const char *brname) { - int fd =3D -1; - int ret =3D -1; + VIR_AUTOCLOSE(fd); =20 if ((fd =3D virNetDevSetupControl(NULL, NULL)) < 0) return -1; @@ -400,14 +389,10 @@ virNetDevBridgeCreateWithIoctl(const char *brname) if (ioctl(fd, SIOCBRADDBR, brname) < 0) { virReportSystemError(errno, _("Unable to create bridge %s"), brname); - goto cleanup; + return -1; } =20 - ret =3D 0; - - cleanup: - VIR_FORCE_CLOSE(fd); - return ret; + return 0; } #endif =20 @@ -503,9 +488,8 @@ virNetDevBridgeCreate(const char *brname) int virNetDevBridgeCreate(const char *brname) { - int s; struct ifreq ifr; - int ret =3D - 1; + VIR_AUTOCLOSE(s); =20 if ((s =3D virNetDevSetupControl("bridge", &ifr)) < 0) return -1; @@ -513,16 +497,13 @@ virNetDevBridgeCreate(const char *brname) if (ioctl(s, SIOCIFCREATE2, &ifr) < 0) { virReportSystemError(errno, "%s", _("Unable to create bridge device")); - goto cleanup; + return -1; } =20 if (virNetDevSetName(ifr.ifr_name, brname) =3D=3D -1) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - VIR_FORCE_CLOSE(s); - return ret; + return 0; } #else int virNetDevBridgeCreate(const char *brname) @@ -545,8 +526,7 @@ int virNetDevBridgeCreate(const char *brname) static int virNetDevBridgeDeleteWithIoctl(const char *brname) { - int fd =3D -1; - int ret =3D -1; + VIR_AUTOCLOSE(fd); =20 ignore_value(virNetDevSetOnline(brname, false)); =20 @@ -556,14 +536,10 @@ virNetDevBridgeDeleteWithIoctl(const char *brname) if (ioctl(fd, SIOCBRDELBR, brname) < 0) { virReportSystemError(errno, _("Unable to delete bridge %s"), brname); - goto cleanup; + return -1; } =20 - ret =3D 0; - - cleanup: - VIR_FORCE_CLOSE(fd); - return ret; + return 0; } #endif =20 @@ -596,9 +572,8 @@ virNetDevBridgeDelete(const char *brname) int virNetDevBridgeDelete(const char *brname) { - int s; struct ifreq ifr; - int ret =3D -1; + VIR_AUTOCLOSE(s); =20 if ((s =3D virNetDevSetupControl(brname, &ifr)) < 0) return -1; @@ -607,13 +582,10 @@ virNetDevBridgeDelete(const char *brname) virReportSystemError(errno, _("Unable to remove bridge %s"), brname); - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - VIR_FORCE_CLOSE(s); - return ret; + return 0; } #else int virNetDevBridgeDelete(const char *brname ATTRIBUTE_UNUSED) @@ -637,9 +609,8 @@ int virNetDevBridgeDelete(const char *brname ATTRIBUTE_= UNUSED) int virNetDevBridgeAddPort(const char *brname, const char *ifname) { - int fd =3D -1; - int ret =3D -1; struct ifreq ifr; + VIR_AUTOCLOSE(fd); =20 if ((fd =3D virNetDevSetupControl(brname, &ifr)) < 0) return -1; @@ -647,19 +618,16 @@ int virNetDevBridgeAddPort(const char *brname, if (!(ifr.ifr_ifindex =3D if_nametoindex(ifname))) { virReportSystemError(ENODEV, _("Unable to get interface index for %s"), if= name); - goto cleanup; + return -1; } =20 if (ioctl(fd, SIOCBRADDIF, &ifr) < 0) { virReportSystemError(errno, _("Unable to add bridge %s port %s"), brname,= ifname); - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - VIR_FORCE_CLOSE(fd); - return ret; + return 0; } #elif defined(HAVE_BSD_BRIDGE_MGMT) int virNetDevBridgeAddPort(const char *brname, @@ -706,9 +674,8 @@ int virNetDevBridgeAddPort(const char *brname, int virNetDevBridgeRemovePort(const char *brname, const char *ifname) { - int fd =3D -1; - int ret =3D -1; struct ifreq ifr; + VIR_AUTOCLOSE(fd); =20 if ((fd =3D virNetDevSetupControl(brname, &ifr)) < 0) return -1; @@ -717,19 +684,16 @@ int virNetDevBridgeRemovePort(const char *brname, virReportSystemError(ENODEV, _("Unable to get interface index for %s"), if= name); =20 - goto cleanup; + return -1; } =20 if (ioctl(fd, SIOCBRDELIF, &ifr) < 0) { virReportSystemError(errno, _("Unable to remove bridge %s port %s"), brna= me, ifname); - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - VIR_FORCE_CLOSE(fd); - return ret; + return 0; } #elif defined(HAVE_BSD_BRIDGE_MGMT) int virNetDevBridgeRemovePort(const char *brname, @@ -778,19 +742,14 @@ int virNetDevBridgeRemovePort(const char *brname, int virNetDevBridgeSetSTPDelay(const char *brname, int delay) { - int fd =3D -1; - int ret =3D -1; struct ifreq ifr; + VIR_AUTOCLOSE(fd); =20 if ((fd =3D virNetDevSetupControl(brname, &ifr)) < 0) - goto cleanup; + return -1; =20 - ret =3D virNetDevBridgeSet(brname, "forward_delay", MS_TO_JIFFIES(dela= y), + return virNetDevBridgeSet(brname, "forward_delay", MS_TO_JIFFIES(delay= ), fd, &ifr); - - cleanup: - VIR_FORCE_CLOSE(fd); - return ret; } =20 =20 @@ -831,19 +790,14 @@ int virNetDevBridgeGetSTPDelay(const char *brname, int virNetDevBridgeSetSTP(const char *brname, bool enable) { - int fd =3D -1; - int ret =3D -1; struct ifreq ifr; + VIR_AUTOCLOSE(fd); =20 if ((fd =3D virNetDevSetupControl(brname, &ifr)) < 0) - goto cleanup; + return -1; =20 - ret =3D virNetDevBridgeSet(brname, "stp_state", enable ? 1 : 0, + return virNetDevBridgeSet(brname, "stp_state", enable ? 1 : 0, fd, &ifr); - - cleanup: - VIR_FORCE_CLOSE(fd); - return ret; } =20 =20 --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list