From nobody Mon Feb 9 06:34:04 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1558355944; cv=none; d=zoho.com; s=zohoarc; b=lKxgJJ2XPva8U9sB/7/p2upvhjRPdgY60fki8wRxw4Hk/m4fJvckWp4nJ6QPhTLRmear/PtcTORZ8TJ25gIXjl5WUa4OtTL2+IiHunjAloXt4L5d4UQZ2H22Pgq8WjihgICRGPdas9Kd8Er1fV4qNXTTeTEKUQ3qM4FHnxNLI7I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558355944; 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:ARC-Authentication-Results; bh=oDYUHaLWcfwVj4MW5JuajhgOHj0Su9N3/iTT4ui6nDA=; b=kssyIZtdNUJR4S7j6PYXKdLQ2Z6joBWM9zMR1lUiKzXFqqlFRKGXq+DuHpab03ioXa+nkxBA+I9VaL6zqTBbKT3quM+JohjguoJvuZElyijZM9iHPYfeFWUzeKga7qCldlIbboaNCp/ASEQXZyq1lb2hhRQHopOWvDRsUtUxdb0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1558355944084179.87560324272897; Mon, 20 May 2019 05:39:04 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 248A83689B; Mon, 20 May 2019 12:39:01 +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 EEDE75DE88; Mon, 20 May 2019 12:39:00 +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 42B031843662; Mon, 20 May 2019 12:39:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x4KCcCHl031948 for ; Mon, 20 May 2019 08:38:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id A567C5D704; Mon, 20 May 2019 12:38:12 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2FEC05D6A6 for ; Mon, 20 May 2019 12:38:12 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Mon, 20 May 2019 14:38:02 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 5/6] networkStartNetworkVirtual: Dissolve 'err1' label in 'error' 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: , 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 20 May 2019 12:39:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik --- src/network/bridge_driver.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 4c920d1fdd..59c9780a7e 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2387,7 +2387,7 @@ networkStartNetworkVirtual(virNetworkDriverStatePtr d= river, if (!(macMapFile =3D virMacMapFileName(driver->dnsmasqStateDir, def->bridge)) || !(macmap =3D virMacMapNew(macMapFile))) - goto err1; + goto error; =20 virNetworkObjSetMacMap(obj, macmap); macmap =3D NULL; @@ -2398,21 +2398,21 @@ networkStartNetworkVirtual(virNetworkDriverStatePtr= driver, * expects milliseconds */ if (virNetDevBridgeSetSTPDelay(def->bridge, def->delay * 1000) < 0) - goto err1; + goto error; =20 if (virNetDevBridgeSetSTP(def->bridge, def->stp ? true : false) < 0) - goto err1; + goto error; =20 /* Disable IPv6 on the bridge if there are no IPv6 addresses * defined, and set other IPv6 sysctl tunables appropriately. */ if (networkSetIPv6Sysctls(obj) < 0) - goto err1; + goto error; =20 /* Add "once per network" rules */ if (def->forward.type !=3D VIR_NETWORK_FORWARD_OPEN && networkAddFirewallRules(def) < 0) - goto err1; + goto error; =20 firewalRulesAdded =3D true; =20 @@ -2518,10 +2518,6 @@ networkStartNetworkVirtual(virNetworkDriverStatePtr = driver, def->forward.type !=3D VIR_NETWORK_FORWARD_OPEN) networkRemoveFirewallRules(def); =20 - err1: - if (!save_err) - virErrorPreserveLast(&save_err); - if (macTapIfName) { VIR_FORCE_CLOSE(tapfd); ignore_value(virNetDevTapDelete(macTapIfName, NULL)); --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list