From nobody Fri May 16 03:34:05 2025 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.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; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1498649891231484.87595557807913; Wed, 28 Jun 2017 04:38:11 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6D6607EBD7; Wed, 28 Jun 2017 11:38:08 +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 4483888FF3; Wed, 28 Jun 2017 11:38:08 +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 E88601833033; Wed, 28 Jun 2017 11:38:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v5SBbgBU004304 for ; Wed, 28 Jun 2017 07:37:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id C16797ABEC; Wed, 28 Jun 2017 11:37:42 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-36.phx2.redhat.com [10.3.116.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 87BFE5C3FB for ; Wed, 28 Jun 2017 11:37:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 6D6607EBD7 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 6D6607EBD7 From: John Ferlan To: libvir-list@redhat.com Date: Wed, 28 Jun 2017 07:37:36 -0400 Message-Id: <20170628113738.27502-3-jferlan@redhat.com> In-Reply-To: <20170628113738.27502-1-jferlan@redhat.com> References: <20170628113738.27502-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/4] hotplug: Create helper to remove vport 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 28 Jun 2017 11:38:09 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Combine and "clean up" a bit two places that are removing the vport Signed-off-by: John Ferlan --- src/qemu/qemu_hotplug.c | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index a486fb4..1af85be 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -937,6 +937,23 @@ qemuDomainAttachDeviceDiskLive(virConnectPtr conn, } =20 =20 +static void +qemuDomainNetDeviceVportRemove(virDomainNetDefPtr net) +{ + virNetDevVPortProfilePtr vport =3D virDomainNetGetActualVirtPortProfil= e(net); + + 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) { + const char *brname =3D virDomainNetGetActualBridgeName(net); + ignore_value(virNetDevOpenvswitchRemovePort(brname, net->ifname)); + } +} + + int qemuDomainAttachNetDevice(virQEMUDriverPtr driver, virDomainObjPtr vm, @@ -954,7 +971,6 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, size_t queueSize =3D 0; char *nicstr =3D NULL; char *netstr =3D NULL; - virNetDevVPortProfilePtr vport =3D NULL; int ret =3D -1; int vlan; bool releaseaddr =3D false; @@ -1302,16 +1318,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, cfg->stateDir)); } =20 - vport =3D virDomainNetGetActualVirtPortProfile(net); - if (vport) { - if (vport->virtPortType =3D=3D VIR_NETDEV_VPORT_PROFILE_MI= DONET) { - ignore_value(virNetDevMidonetUnbindPort(vport)); - } else if (vport->virtPortType =3D=3D VIR_NETDEV_VPORT_PRO= FILE_OPENVSWITCH) { - ignore_value(virNetDevOpenvswitchRemovePort( - virDomainNetGetActualBridgeName(net), - net->ifname)); - } - } + qemuDomainNetDeviceVportRemove(net); } =20 virDomainNetRemoveHostdev(vm->def, net); @@ -3949,7 +3956,6 @@ qemuDomainRemoveNetDevice(virQEMUDriverPtr driver, { virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv =3D vm->privateData; - virNetDevVPortProfilePtr vport; virObjectEventPtr event; char *hostnet_name =3D NULL; char *charDevAlias =3D NULL; @@ -4038,16 +4044,7 @@ qemuDomainRemoveNetDevice(virQEMUDriverPtr driver, cfg->stateDir)); } =20 - vport =3D virDomainNetGetActualVirtPortProfile(net); - 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)); - } - } + qemuDomainNetDeviceVportRemove(net); =20 networkReleaseActualDevice(vm->def, net); virDomainNetDefFree(net); --=20 2.9.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list