From nobody Mon Feb 9 06:02:22 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 1712917350399786.819396568905; Fri, 12 Apr 2024 03:22:30 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 385A3181A; Fri, 12 Apr 2024 06:22:29 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id A7EAE18E3; Fri, 12 Apr 2024 06:19:23 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 0DEB617DB; Fri, 12 Apr 2024 06:19:12 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 E30D617D3 for ; Fri, 12 Apr 2024 06:19:10 -0400 (EDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-551-UO70VbFVNyWZkNf3FA0hUw-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 0D3302932483 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 91F331C060D1 for ; Fri, 12 Apr 2024 10:19:07 +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: UO70VbFVNyWZkNf3FA0hUw-1 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 2/5] hypervisor: Introduce and use virDomainInterfaceVportRemove() Date: Fri, 12 Apr 2024 12:19:02 +0200 Message-ID: <1f8779a7aa32189f824a4460d50129bf2dde1e5d.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: NTNQ2NM76UCWF44CWMZFRMGAVJ4JJHDA X-Message-ID-Hash: NTNQ2NM76UCWF44CWMZFRMGAVJ4JJHDA 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: 1712917352735100001 Both LXC and QEMU drivers have the same code to remove vport when removing a domain's interface. Instead of repeating the same pattern in both drivers, move the code into hypervisor agnostic location (src/hypervisor/) and switch to calling this new function. Signed-off-by: Michal Privoznik Reviewed-by: Peter Krempa --- src/hypervisor/domain_interface.c | 38 ++++++++++++++++++++++--------- src/hypervisor/domain_interface.h | 1 + src/libvirt_private.syms | 1 + src/lxc/lxc_driver.c | 9 +++----- src/lxc/lxc_process.c | 18 +++++---------- src/qemu/qemu_hotplug.c | 22 ++---------------- 6 files changed, 40 insertions(+), 49 deletions(-) diff --git a/src/hypervisor/domain_interface.c b/src/hypervisor/domain_inte= rface.c index 853814fe78..0003412065 100644 --- a/src/hypervisor/domain_interface.c +++ b/src/hypervisor/domain_interface.c @@ -374,6 +374,32 @@ virDomainInterfaceStopDevices(virDomainDef *def) return 0; } =20 + +/** + * virDomainInterfaceVportRemove: + * @net: a net definition in the VM + * + * Removes vport profile from corresponding bridge. + * NOP if no vport profile is present in @net. + */ +void +virDomainInterfaceVportRemove(virDomainNetDef *net) +{ + const virNetDevVPortProfile *vport =3D virDomainNetGetActualVirtPortPr= ofile(net); + const char *brname; + + if (!vport) + return; + + 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)); + } +} + + /** * virDomainInterfaceDeleteDevice: * @def: domain definition @@ -390,10 +416,8 @@ virDomainInterfaceDeleteDevice(virDomainDef *def, bool priv_net_created, char *stateDir) { - const virNetDevVPortProfile *vport =3D NULL; g_autoptr(virConnect) conn =3D NULL; =20 - vport =3D virDomainNetGetActualVirtPortProfile(net); switch (virDomainNetGetActualType(net)) { case VIR_DOMAIN_NET_TYPE_DIRECT: if (priv_net_created) { @@ -435,15 +459,7 @@ virDomainInterfaceDeleteDevice(virDomainDef *def, /* release the physical device (or any other resources used by * this interface in the network driver */ - if (vport) { - if (vport->virtPortType =3D=3D VIR_NETDEV_VPORT_PROFILE_MIDONET) { - ignore_value(virNetDevMidonetUnbindPort(vport)); - } else if (vport->virtPortType =3D=3D VIR_NETDEV_VPORT_PROFILE_OPE= NVSWITCH) { - ignore_value(virNetDevOpenvswitchRemovePort( - virDomainNetGetActualBridgeName(net), - net->ifname)); - } - } + virDomainInterfaceVportRemove(net); =20 /* kick the device out of the hostdev list too */ virDomainNetRemoveHostdev(def, net); diff --git a/src/hypervisor/domain_interface.h b/src/hypervisor/domain_inte= rface.h index 3d15e000cc..8047fdadfa 100644 --- a/src/hypervisor/domain_interface.h +++ b/src/hypervisor/domain_interface.h @@ -39,6 +39,7 @@ int virDomainInterfaceStartDevice(virDomainNetDef *net); int virDomainInterfaceStartDevices(virDomainDef *def); int virDomainInterfaceStopDevice(virDomainNetDef *net); int virDomainInterfaceStopDevices(virDomainDef *def); +void virDomainInterfaceVportRemove(virDomainNetDef *net); void virDomainInterfaceDeleteDevice(virDomainDef *def, virDomainNetDef *net, bool priv_net_created, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 84e30b711c..8642305a8b 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1642,6 +1642,7 @@ virDomainInterfaceStartDevice; virDomainInterfaceStartDevices; virDomainInterfaceStopDevice; virDomainInterfaceStopDevices; +virDomainInterfaceVportRemove; =20 =20 # hypervisor/virclosecallbacks.h diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 39992bdf96..89ef9416aa 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -70,6 +70,7 @@ #include "virhostdev.h" #include "netdev_bandwidth_conf.h" #include "virutil.h" +#include "domain_interface.h" =20 #define VIR_FROM_THIS VIR_FROM_LXC =20 @@ -4042,7 +4043,6 @@ lxcDomainDetachDeviceNetLive(virDomainObj *vm, int detachidx, ret =3D -1; virDomainNetType actualType; virDomainNetDef *detach =3D NULL; - const virNetDevVPortProfile *vport =3D NULL; virErrorPtr save_err =3D NULL; =20 if ((detachidx =3D virDomainNetFindIdx(vm->def, dev->data.net)) < 0) @@ -4098,11 +4098,8 @@ lxcDomainDetachDeviceNetLive(virDomainObj *vm, =20 virDomainConfNWFilterTeardown(detach); =20 - vport =3D virDomainNetGetActualVirtPortProfile(detach); - if (vport && vport->virtPortType =3D=3D VIR_NETDEV_VPORT_PROFILE_OPENV= SWITCH) - ignore_value(virNetDevOpenvswitchRemovePort( - virDomainNetGetActualBridgeName(detach), - detach->ifname)); + virDomainInterfaceVportRemove(detach); + ret =3D 0; cleanup: if (!ret) { diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index bfdcefd01b..30ff4eb3d0 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -49,6 +49,7 @@ #include "virprocess.h" #include "netdev_bandwidth_conf.h" #include "virutil.h" +#include "domain_interface.h" =20 #define VIR_FROM_THIS VIR_FROM_LXC =20 @@ -149,7 +150,6 @@ static void virLXCProcessCleanup(virLXCDriver *driver, { size_t i; virLXCDomainObjPrivate *priv =3D vm->privateData; - const virNetDevVPortProfile *vport =3D NULL; g_autoptr(virLXCDriverConfig) cfg =3D virLXCDriverGetConfig(driver); g_autoptr(virConnect) conn =3D NULL; =20 @@ -210,13 +210,9 @@ static void virLXCProcessCleanup(virLXCDriver *driver, =20 for (i =3D 0; i < vm->def->nnets; i++) { virDomainNetDef *iface =3D vm->def->nets[i]; - vport =3D virDomainNetGetActualVirtPortProfile(iface); + if (iface->ifname) { - if (vport && - vport->virtPortType =3D=3D VIR_NETDEV_VPORT_PROFILE_OPENVS= WITCH) - ignore_value(virNetDevOpenvswitchRemovePort( - virDomainNetGetActualBridgeName(iface), - iface->ifname)); + virDomainInterfaceVportRemove(iface); ignore_value(virNetDevVethDelete(iface->ifname)); } if (iface->type =3D=3D VIR_DOMAIN_NET_TYPE_NETWORK) { @@ -637,11 +633,9 @@ virLXCProcessSetupInterfaces(virLXCDriver *driver, virErrorPreserveLast(&save_err); for (i =3D 0; i < def->nnets; i++) { virDomainNetDef *iface =3D def->nets[i]; - const virNetDevVPortProfile *vport =3D virDomainNetGetActualVi= rtPortProfile(iface); - if (vport && vport->virtPortType =3D=3D VIR_NETDEV_VPORT_PROFI= LE_OPENVSWITCH) - ignore_value(virNetDevOpenvswitchRemovePort( - virDomainNetGetActualBridgeName(iface), - iface->ifname)); + + virDomainInterfaceVportRemove(iface); + if (iface->type =3D=3D VIR_DOMAIN_NET_TYPE_NETWORK && netconn) virDomainNetReleaseActualDevice(netconn, iface); } diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 62dc879ed4..054053729c 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1091,24 +1091,6 @@ qemuDomainAttachDeviceDiskLive(virQEMUDriver *driver, } =20 =20 -static void -qemuDomainNetDeviceVportRemove(virDomainNetDef *net) -{ - const virNetDevVPortProfile *vport =3D virDomainNetGetActualVirtPortPr= ofile(net); - const char *brname; - - if (!vport) - return; - - 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)); - } -} - - static int qemuDomainAttachNetDevice(virQEMUDriver *driver, virDomainObj *vm, @@ -1414,7 +1396,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, cfg->stateDir); } =20 - qemuDomainNetDeviceVportRemove(net); + virDomainInterfaceVportRemove(net); } =20 if (teardownlabel && @@ -4895,7 +4877,7 @@ qemuDomainRemoveNetDevice(virQEMUDriver *driver, VIR_WARN("Unable to restore security label on vhostuser char d= evice"); } =20 - qemuDomainNetDeviceVportRemove(net); + virDomainInterfaceVportRemove(net); =20 if (net->type =3D=3D VIR_DOMAIN_NET_TYPE_NETWORK) { g_autoptr(virConnect) conn =3D virGetConnectNetwork(); --=20 2.43.2 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org