From nobody Mon Feb 9 10:32:23 2026 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 171291729339268.48613867000472; Fri, 12 Apr 2024 03:21:33 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 600C619D6; Fri, 12 Apr 2024 06:21:32 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id B06CA17FA; Fri, 12 Apr 2024 06:19:20 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id D7A69178D; Fri, 12 Apr 2024 06:19:10 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 5D08117D3 for ; Fri, 12 Apr 2024 06:19:10 -0400 (EDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-590-L8X_5wc2O9egBaqaFjVyBQ-1; Fri, 12 Apr 2024 06:19:08 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 966178007BA for ; Fri, 12 Apr 2024 10:19:08 +0000 (UTC) Received: from maggie.brq.redhat.com (unknown [10.43.3.102]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4147A1C060D0 for ; Fri, 12 Apr 2024 10:19:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: L8X_5wc2O9egBaqaFjVyBQ-1 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 3/5] virnetdevopenvswitch: Drop @brname arg from virNetDevOpenvswitchRemovePort() Date: Fri, 12 Apr 2024 12:19:03 +0200 Message-ID: <0d1d9c5ea482888c83d3f95ce702c88cbeb42775.1712917104.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: UTIAW66JIXMDUYL7WD24JLWNYOP6XYQK X-Message-ID-Hash: UTIAW66JIXMDUYL7WD24JLWNYOP6XYQK X-MailFrom: mprivozn@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1712917294521100001 The @brname argument of virNetDevOpenvswitchRemovePort() is and was unused ever since its introduction in v0.9.11-rc1~257. Just remove it. Signed-off-by: Michal Privoznik Reviewed-by: Peter Krempa --- src/hypervisor/domain_interface.c | 4 +--- src/util/virnetdevopenvswitch.c | 2 +- src/util/virnetdevopenvswitch.h | 4 ++-- src/util/virnetdevtap.c | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/hypervisor/domain_interface.c b/src/hypervisor/domain_inte= rface.c index 0003412065..ccf4cb94bd 100644 --- a/src/hypervisor/domain_interface.c +++ b/src/hypervisor/domain_interface.c @@ -386,7 +386,6 @@ void virDomainInterfaceVportRemove(virDomainNetDef *net) { const virNetDevVPortProfile *vport =3D virDomainNetGetActualVirtPortPr= ofile(net); - const char *brname; =20 if (!vport) return; @@ -394,8 +393,7 @@ virDomainInterfaceVportRemove(virDomainNetDef *net) if (vport->virtPortType =3D=3D VIR_NETDEV_VPORT_PROFILE_MIDONET) { ignore_value(virNetDevMidonetUnbindPort(vport)); } else if (vport->virtPortType =3D=3D VIR_NETDEV_VPORT_PROFILE_OPENVSW= ITCH) { - brname =3D virDomainNetGetActualBridgeName(net); - ignore_value(virNetDevOpenvswitchRemovePort(brname, net->ifname)); + ignore_value(virNetDevOpenvswitchRemovePort(net->ifname)); } } =20 diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitc= h.c index 7d1cd25171..f1765ae1c8 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -206,7 +206,7 @@ int virNetDevOpenvswitchAddPort(const char *brname, con= st char *ifname, * * Returns 0 in case of success or -1 in case of failure. */ -int virNetDevOpenvswitchRemovePort(const char *brname G_GNUC_UNUSED, const= char *ifname) +int virNetDevOpenvswitchRemovePort(const char *ifname) { g_autofree char *errbuf =3D NULL; g_autoptr(virCommand) cmd =3D virNetDevOpenvswitchCreateCmd(&errbuf); diff --git a/src/util/virnetdevopenvswitch.h b/src/util/virnetdevopenvswitc= h.h index e6ee985f17..a20fb5b029 100644 --- a/src/util/virnetdevopenvswitch.h +++ b/src/util/virnetdevopenvswitch.h @@ -38,8 +38,8 @@ int virNetDevOpenvswitchAddPort(const char *brname, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) G_GNUC_WARN_UNUSED_RESULT; =20 -int virNetDevOpenvswitchRemovePort(const char *brname, const char *ifname) - ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; +int virNetDevOpenvswitchRemovePort(const char *ifname) + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevOpenvswitchInterfaceGetMaster(const char *ifname, char **mast= er) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index 3bfd36fc23..9a4866a4e4 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -543,7 +543,7 @@ virNetDevTapReattachBridge(const char *tapname, int ret; VIR_INFO("Removing %s from %s", tapname, master); if (useOVS) - ret =3D virNetDevOpenvswitchRemovePort(master, tapname); + ret =3D virNetDevOpenvswitchRemovePort(tapname); else ret =3D virNetDevBridgeRemovePort(master, tapname); if (ret < 0) --=20 2.43.2 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org