From nobody Sun Feb 8 10:48:38 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1545663683551513.2037176751188; Mon, 24 Dec 2018 07:01:23 -0800 (PST) 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 203973DBFA; Mon, 24 Dec 2018 15:01:21 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C1E2860BEC; Mon, 24 Dec 2018 15:01:20 +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 56FC73F5D6; Mon, 24 Dec 2018 15:01:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id wBOF196i001456 for ; Mon, 24 Dec 2018 10:01:09 -0500 Received: by smtp.corp.redhat.com (Postfix) id BBB4B60C66; Mon, 24 Dec 2018 15:01:09 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-27.ams2.redhat.com [10.36.112.27]) by smtp.corp.redhat.com (Postfix) with ESMTP id 91D1E60C68; Mon, 24 Dec 2018 15:01:08 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Mon, 24 Dec 2018 14:59:15 +0000 Message-Id: <20181224145915.8700-28-berrange@redhat.com> In-Reply-To: <20181224145915.8700-1-berrange@redhat.com> References: <20181224145915.8700-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 27/27] conf: switch over to use network port APIs for virt drivers 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-Type: text/plain; charset="utf-8" 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.30]); Mon, 24 Dec 2018 15:01:22 +0000 (UTC) Change the domain conf so invoke the new network port public APIs instead of the network callbacks. Signed-off-by: Daniel P. Berrang=C3=A9 --- src/conf/domain_conf.c | 125 ++++++++++++++++++-------- src/conf/domain_conf.h | 21 +---- src/network/bridge_driver.c | 172 ------------------------------------ 3 files changed, 90 insertions(+), 228 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e384c60dfd..689a397e44 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11022,6 +11022,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlop= t, char *type =3D NULL; char *network =3D NULL; char *portgroup =3D NULL; + char *portid =3D NULL; char *bridge =3D NULL; char *dev =3D NULL; char *ifname =3D NULL; @@ -11104,6 +11105,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlop= t, virXMLNodeNameEqual(cur, "source")) { network =3D virXMLPropString(cur, "network"); portgroup =3D virXMLPropString(cur, "portgroup"); + portid =3D virXMLPropString(cur, "portid"); } else if (!internal && def->type =3D=3D VIR_DOMAIN_NET_TYPE_INTERNAL && virXMLNodeNameEqual(cur, "source")) { @@ -11312,12 +11314,20 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xml= opt, "specified with = ")); goto error; } + if (portid && + virUUIDParse(portid, def->data.network.portid) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to parse port id '%s'"), portid); + goto error; + } + def->data.network.name =3D network; network =3D NULL; def->data.network.portgroup =3D portgroup; portgroup =3D NULL; def->data.network.actual =3D actual; actual =3D NULL; + break; =20 case VIR_DOMAIN_NET_TYPE_VHOSTUSER: @@ -11830,6 +11840,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlop= t, VIR_FREE(macaddr); VIR_FREE(network); VIR_FREE(portgroup); + VIR_FREE(portid); VIR_FREE(address); VIR_FREE(port); VIR_FREE(vhostuser_type); @@ -24941,6 +24952,11 @@ virDomainActualNetDefContentsFormat(virBufferPtr b= uf, def->data.network.name); virBufferEscapeString(buf, " portgroup=3D'%s'", def->data.network.portgroup); + if (virUUIDIsValid(def->data.network.portid)) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(def->data.network.portid, uuidstr); + virBufferAsprintf(buf, " portid=3D'%s'", uuidstr); + } } if (actualType =3D=3D VIR_DOMAIN_NET_TYPE_BRIDGE || actualType =3D=3D VIR_DOMAIN_NET_TYPE_NETWORK) { @@ -30519,6 +30535,7 @@ virDomainNetDefActualFromNetworkPort(virDomainNetDe= fPtr iface, if (VIR_STRDUP(actual->data.bridge.brname, port->plug.bridge.brname) < 0) goto error; + actual->type =3D VIR_DOMAIN_NET_TYPE_BRIDGE; actual->data.bridge.macTableManager =3D port->plug.bridge.macTable= Manager; break; =20 @@ -30526,10 +30543,12 @@ virDomainNetDefActualFromNetworkPort(virDomainNet= DefPtr iface, if (VIR_STRDUP(actual->data.direct.linkdev, port->plug.direct.linkdev) < 0) goto error; + actual->type =3D VIR_DOMAIN_NET_TYPE_DIRECT; actual->data.direct.mode =3D port->plug.direct.mode; break; =20 case VIR_NETWORK_PORT_PLUG_TYPE_HOSTDEV_PCI: + actual->type =3D VIR_DOMAIN_NET_TYPE_HOSTDEV; actual->data.hostdev.def.parent =3D iface; actual->data.hostdev.def.info =3D &iface->info; actual->data.hostdev.def.mode =3D VIR_DOMAIN_HOSTDEV_MODE_SUBSYS; @@ -30707,48 +30726,82 @@ virDomainNetDefActualToNetworkPort(virDomainDefPt= r dom, return NULL; } =20 -static virDomainNetAllocateActualDeviceImpl netAllocate; -static virDomainNetNotifyActualDeviceImpl netNotify; -static virDomainNetReleaseActualDeviceImpl netRelease; static virDomainNetBandwidthChangeAllowedImpl netBandwidthChangeAllowed; static virDomainNetBandwidthUpdateImpl netBandwidthUpdate; =20 =20 void -virDomainNetSetDeviceImpl(virDomainNetAllocateActualDeviceImpl allocate, - virDomainNetNotifyActualDeviceImpl notify, - virDomainNetReleaseActualDeviceImpl release, - virDomainNetBandwidthChangeAllowedImpl bandwidth= ChangeAllowed, +virDomainNetSetDeviceImpl(virDomainNetBandwidthChangeAllowedImpl bandwidth= ChangeAllowed, virDomainNetBandwidthUpdateImpl bandwidthUpdate) { - netAllocate =3D allocate; - netNotify =3D notify; - netRelease =3D release; netBandwidthChangeAllowed =3D bandwidthChangeAllowed; netBandwidthUpdate =3D bandwidthUpdate; } =20 -int -virDomainNetAllocateActualDevice(virConnectPtr conn, - virDomainDefPtr dom, - virDomainNetDefPtr iface) + +static int +virDomainNetCreatePort(virConnectPtr conn, + virDomainDefPtr dom, + virDomainNetDefPtr iface, + unsigned int flags) { virNetworkPtr net =3D NULL; int ret =3D -1; - - if (!netAllocate) { - virReportError(VIR_ERR_NO_SUPPORT, "%s", - _("Virtual networking driver is not available")); - return -1; - } + virNetworkPortDefPtr portdef =3D NULL; + virNetworkPortPtr port =3D NULL; + char *portxml =3D NULL; + virErrorPtr saved; =20 if (!(net =3D virNetworkLookupByName(conn, iface->data.network.name))) return -1; =20 - ret =3D netAllocate(net, dom, iface); + if (!(portdef =3D virDomainNetDefToNetworkPort(dom, iface))) + goto cleanup; + + if (!(portxml =3D virNetworkPortDefFormat(portdef))) + goto cleanup; + + virNetworkPortDefFree(portdef); + portdef =3D NULL; + + if (!(port =3D virNetworkPortCreateXML(net, portxml, flags))) + goto cleanup; + + VIR_FREE(portxml); + + if (!(portxml =3D virNetworkPortGetXMLDesc(port, 0))) + goto deleteport; + + if (!(portdef =3D virNetworkPortDefParseString(portxml))) + goto deleteport; =20 + if (virDomainNetDefActualFromNetworkPort(iface, portdef) < 0) + goto deleteport; + + virNetworkPortGetUUID(port, iface->data.network.portid); + + ret =3D 0; + cleanup: + virNetworkPortDefFree(portdef); + VIR_FREE(portxml); + virObjectUnref(port); virObjectUnref(net); return ret; + + deleteport: + saved =3D virSaveLastError(); + virNetworkPortDelete(port, 0); + virSetError(saved); + virFreeError(saved); + goto cleanup; +} + +int +virDomainNetAllocateActualDevice(virConnectPtr conn, + virDomainDefPtr dom, + virDomainNetDefPtr iface) +{ + return virDomainNetCreatePort(conn, dom, iface, 0); } =20 void @@ -30756,36 +30809,34 @@ virDomainNetNotifyActualDevice(virConnectPtr conn, virDomainDefPtr dom, virDomainNetDefPtr iface) { - virNetworkPtr net =3D NULL; - - if (!netNotify) + if (virUUIDIsValid(iface->data.network.portid)) return; =20 - if (!(net =3D virNetworkLookupByName(conn, iface->data.network.name))) - return; - - netNotify(net, dom, iface); - - virObjectUnref(net); + virDomainNetCreatePort(conn, dom, iface, + VIR_NETWORK_PORT_CREATE_RECLAIM); } =20 =20 int virDomainNetReleaseActualDevice(virConnectPtr conn, - virDomainDefPtr dom, + virDomainDefPtr dom ATTRIBUTE_UNUSED, virDomainNetDefPtr iface) { virNetworkPtr net =3D NULL; - int ret; - - if (!netRelease) - return 0; + virNetworkPortPtr port =3D NULL; + int ret =3D -1; =20 if (!(net =3D virNetworkLookupByName(conn, iface->data.network.name))) - return -1; + goto cleanup; + + if (!(port =3D virNetworkPortLookupByUUID(net, iface->data.network.por= tid))) + goto cleanup; =20 - ret =3D netRelease(net, dom, iface); + if (virNetworkPortDelete(port, 0) < 0) + goto cleanup; =20 + cleanup: + virObjectUnref(port); virObjectUnref(net); return ret; } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 0f672d718e..1f271fde84 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1027,6 +1027,7 @@ struct _virDomainNetDef { struct { char *name; char *portgroup; + unsigned char portid[VIR_UUID_BUFLEN]; /* actual has info about the currently used physical * device (if the network is of type * bridge/private/vepa/passthrough). This is saved in the @@ -3622,21 +3623,6 @@ virNetworkPortDefPtr virDomainNetDefActualToNetworkPort(virDomainDefPtr dom, virDomainNetDefPtr iface); =20 -typedef int -(*virDomainNetAllocateActualDeviceImpl)(virNetworkPtr net, - virDomainDefPtr dom, - virDomainNetDefPtr iface); - -typedef void -(*virDomainNetNotifyActualDeviceImpl)(virNetworkPtr net, - virDomainDefPtr dom, - virDomainNetDefPtr iface); - -typedef int -(*virDomainNetReleaseActualDeviceImpl)(virNetworkPtr net, - virDomainDefPtr dom, - virDomainNetDefPtr iface); - typedef bool (*virDomainNetBandwidthChangeAllowedImpl)(virDomainNetDefPtr iface, virNetDevBandwidthPtr newBandwid= th); @@ -3647,10 +3633,7 @@ typedef int =20 =20 void -virDomainNetSetDeviceImpl(virDomainNetAllocateActualDeviceImpl allocate, - virDomainNetNotifyActualDeviceImpl notify, - virDomainNetReleaseActualDeviceImpl release, - virDomainNetBandwidthChangeAllowedImpl bandwidth= ChangeAllowed, +virDomainNetSetDeviceImpl(virDomainNetBandwidthChangeAllowedImpl bandwidth= ChangeAllowed, virDomainNetBandwidthUpdateImpl bandwidthUpdate); =20 int diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 8401b72bc8..a8d89a4b4d 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -4765,52 +4765,6 @@ networkAllocatePort(virNetworkObjPtr obj, } =20 =20 -static int -networkAllocateActualDevice(virNetworkPtr net, - virDomainDefPtr dom, - virDomainNetDefPtr iface) -{ - virNetworkDriverStatePtr driver =3D networkGetDriver(); - virNetworkPortDefPtr port =3D NULL; - virNetworkObjPtr obj; - int ret =3D -1; - - obj =3D virNetworkObjFindByName(driver->networks, net->name); - if (!obj) { - virReportError(VIR_ERR_NO_NETWORK, - _("no network with matching name '%s'"), - net->name); - return -1; - } - - if (iface->type !=3D VIR_DOMAIN_NET_TYPE_NETWORK) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Expected a interface for a virtual network")); - goto cleanup; - } - - if (!(port =3D virDomainNetDefToNetworkPort(dom, iface))) - goto cleanup; - - if (networkAllocatePort(obj, port) < 0) - goto cleanup; - - VIR_DEBUG("Populating net def"); - if (virDomainNetDefActualFromNetworkPort(iface, port) < 0) - goto cleanup; - - ret =3D 0; - cleanup: - if (ret < 0) { - virDomainActualNetDefFree(iface->data.network.actual); - iface->data.network.actual =3D NULL; - } - virNetworkPortDefFree(port); - virNetworkObjEndAPI(&obj); - return ret; -} - - /* networkNotifyPort: * @obj: the network to notify * @port: the port definition to notify @@ -5007,72 +4961,6 @@ networkNotifyPort(virNetworkObjPtr obj, } =20 =20 -static void -networkNotifyActualDevice(virNetworkPtr net, - virDomainDefPtr dom, - virDomainNetDefPtr iface) -{ - virNetworkDriverStatePtr driver =3D networkGetDriver(); - virDomainNetType actualType =3D virDomainNetGetActualType(iface); - virNetworkObjPtr obj; - virNetworkDefPtr netdef; - virNetworkPortDefPtr port =3D NULL; - - obj =3D virNetworkObjFindByName(driver->networks, net->name); - if (!obj) { - virReportError(VIR_ERR_NO_NETWORK, - _("no network with matching name '%s'"), - net->name); - goto cleanup; - } - - if (iface->type !=3D VIR_DOMAIN_NET_TYPE_NETWORK) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Expected a interface for a virtual network")); - goto cleanup; - } - - netdef =3D virNetworkObjGetDef(obj); - - if (!virNetworkObjIsActive(obj)) { - virReportError(VIR_ERR_OPERATION_INVALID, - _("network '%s' is not active"), - netdef->name); - goto cleanup; - } - - /* if we're restarting libvirtd after an upgrade from a version - * that didn't save bridge name in actualNetDef for - * actualType=3D=3Dnetwork, we need to copy it in so that it will be - * available in all cases - */ - if (actualType =3D=3D VIR_DOMAIN_NET_TYPE_BRIDGE && - !iface->data.network.actual->data.bridge.brname && - (VIR_STRDUP(iface->data.network.actual->data.bridge.brname, - netdef->bridge) < 0)) - goto cleanup; - - /* Older libvirtd uses actualType=3D=3Dnetwork, but we now - * just use actualType=3D=3Dbridge, as nothing needs to - * distinguish the two cases, and this simplifies virt - * drive code */ - if (actualType =3D=3D VIR_DOMAIN_NET_TYPE_NETWORK) { - iface->data.network.actual->type =3D VIR_DOMAIN_NET_TYPE_BRIDGE; - actualType =3D VIR_DOMAIN_NET_TYPE_BRIDGE; - } - - if (!(port =3D virDomainNetDefActualToNetworkPort(dom, iface))) - goto cleanup; - - if (networkNotifyPort(obj, port) < 0) - goto cleanup; - - cleanup: - virNetworkObjEndAPI(&obj); - virNetworkPortDefFree(port); -} - - /* networkReleasePort: * @obj: the network to release from * @port: the port definition to release @@ -5188,63 +5076,6 @@ networkReleasePort(virNetworkObjPtr obj, } =20 =20 -/* networkReleaseActualDevice: - * @dom: domain definition that @iface belongs to - * @iface: a domain's NetDef (interface definition) - * - * Given a domain element that previously had its - * element filled in (and possibly a physical device allocated to it), - * free up the physical device for use by someone else, and free the - * virDomainActualNetDef. - * - * Returns 0 on success, -1 on failure. - */ -static int -networkReleaseActualDevice(virNetworkPtr net, - virDomainDefPtr dom, - virDomainNetDefPtr iface) -{ - virNetworkDriverStatePtr driver =3D networkGetDriver(); - virNetworkObjPtr obj; - virNetworkPortDefPtr port =3D NULL; - int ret =3D -1; - - obj =3D virNetworkObjFindByName(driver->networks, net->name); - if (!obj) { - virReportError(VIR_ERR_NO_NETWORK, - _("no network with matching name '%s'"), - net->name); - goto cleanup; - } - - if (iface->type !=3D VIR_DOMAIN_NET_TYPE_NETWORK) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Expected a interface for a virtual network")); - goto cleanup; - } - - if (iface->data.network.actual =3D=3D NULL) { - ret =3D 0; - goto cleanup; - } - - if (!(port =3D virDomainNetDefActualToNetworkPort(dom, iface))) - goto cleanup; - - if (networkReleasePort(obj, port) < 0) - goto cleanup; - - ret =3D 0; - cleanup: - virNetworkObjEndAPI(&obj); - if (iface->type =3D=3D VIR_DOMAIN_NET_TYPE_NETWORK) { - virDomainActualNetDefFree(iface->data.network.actual); - iface->data.network.actual =3D NULL; - } - virNetworkPortDefFree(port); - return ret; -} - =20 /** * networkCheckBandwidth: @@ -5966,9 +5797,6 @@ networkRegister(void) return -1; =20 virDomainNetSetDeviceImpl( - networkAllocateActualDevice, - networkNotifyActualDevice, - networkReleaseActualDevice, networkBandwidthChangeAllowed, networkBandwidthUpdate); =20 --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list