On Thu, Feb 15, 2018 at 05:50 PM +0100, "Daniel P. Berrangé" <berrange@xxxxxxxxxx> wrote:
> Now that we have the ability to easily open connections to secondary
> drivers, eg network:///system, it is possible to reimplement the
> virDomainNetResolveActualType method in terms of the public API. This
> avoids the need to have the network driver provide a callback for it.
>
> Reviewed-by: John Ferlan <jferlan@xxxxxxxxxx>
> Signed-off-by: Daniel P. Berrangé <berrange@xxxxxxxxxx>
> ---
> src/conf/domain_conf.c | 80 ++++++++++++++++++++++++++++++++++++++++-----
> src/conf/domain_conf.h | 11 +------
> src/network/bridge_driver.c | 76 +-----------------------------------------
> tests/Makefile.am | 7 +---
> 4 files changed, 75 insertions(+), 99 deletions(-)
>
> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
> index fb732a0c2a..4f50547580 100644
> --- a/src/conf/domain_conf.c
> +++ b/src/conf/domain_conf.c
> @@ -28823,7 +28823,6 @@ static virDomainNetNotifyActualDeviceImpl netNotify;
> static virDomainNetReleaseActualDeviceImpl netRelease;
> static virDomainNetBandwidthChangeAllowedImpl netBandwidthChangeAllowed;
> static virDomainNetBandwidthUpdateImpl netBandwidthUpdate;
> -static virDomainNetResolveActualTypeImpl netResolveActualType;
>
>
> void
> @@ -28831,15 +28830,13 @@ virDomainNetSetDeviceImpl(virDomainNetAllocateActualDeviceImpl allocate,
> virDomainNetNotifyActualDeviceImpl notify,
> virDomainNetReleaseActualDeviceImpl release,
> virDomainNetBandwidthChangeAllowedImpl bandwidthChangeAllowed,
> - virDomainNetBandwidthUpdateImpl bandwidthUpdate,
> - virDomainNetResolveActualTypeImpl resolveActualType)
> + virDomainNetBandwidthUpdateImpl bandwidthUpdate)
> {
> netAllocate = allocate;
> netNotify = notify;
> netRelease = release;
> netBandwidthChangeAllowed = bandwidthChangeAllowed;
> netBandwidthUpdate = bandwidthUpdate;
> - netResolveActualType = resolveActualType;
> }
>
> int
> @@ -28908,16 +28905,83 @@ virDomainNetBandwidthUpdate(virDomainNetDefPtr iface,
> return netBandwidthUpdate(iface, newBandwidth);
> }
>
> +/* virDomainNetResolveActualType:
> + * @iface: the original NetDef from the domain
> + *
> + * Looks up the network reference by iface, and returns the actual
> + * type of the connection without allocating any resources.
> + *
> + * Returns 0 on success, -1 on failure.
> + */
> int
> virDomainNetResolveActualType(virDomainNetDefPtr iface)
> {
> - if (!netResolveActualType) {
> - virReportError(VIR_ERR_NO_SUPPORT, "%s",
> - _("Network device resolve type not available"));
> + virConnectPtr conn = NULL;
> + virNetworkPtr net = NULL;
> + char *xml = NULL;
> + virNetworkDefPtr def = NULL;
> + int ret = -1;
> +
> + if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK)
> + return iface->type;
> +
> + if (iface->data.network.actual)
> + return iface->data.network.actual->type;
> +
> + if (!(conn = virGetConnectNetwork()))
> return -1;
> +
> + if (!(net = virNetworkLookupByName(conn, iface->data.network.name)))
> + goto cleanup;
> +
> + if (!(xml = virNetworkGetXMLDesc(net, 0)))
> + goto cleanup;
> +
> + if (!(def = virNetworkDefParseString(xml)))
> + goto cleanup;
> +
> + if ((def->forward.type == VIR_NETWORK_FORWARD_NONE) ||
> + (def->forward.type == VIR_NETWORK_FORWARD_NAT) ||
> + (def->forward.type == VIR_NETWORK_FORWARD_ROUTE) ||
> + (def->forward.type == VIR_NETWORK_FORWARD_OPEN)) {
> + /* for these forward types, the actual net type really *is*
> + * NETWORK; we just keep the info from the portgroup in
> + * iface->data.network.actual
> + */
> + ret = VIR_DOMAIN_NET_TYPE_NETWORK;
> +
> + } else if ((def->forward.type == VIR_NETWORK_FORWARD_BRIDGE) &&
> + def->bridge) {
> +
> + /* <forward type='bridge'/> <bridge name='xxx'/>
> + * is VIR_DOMAIN_NET_TYPE_BRIDGE
> + */
> +
> + ret = VIR_DOMAIN_NET_TYPE_BRIDGE;
> +
> + } else if (def->forward.type == VIR_NETWORK_FORWARD_HOSTDEV) {
> +
> + ret = VIR_DOMAIN_NET_TYPE_HOSTDEV;
> +
> + } else if ((def->forward.type == VIR_NETWORK_FORWARD_BRIDGE) ||
> + (def->forward.type == VIR_NETWORK_FORWARD_PRIVATE) ||
> + (def->forward.type == VIR_NETWORK_FORWARD_VEPA) ||
> + (def->forward.type == VIR_NETWORK_FORWARD_PASSTHROUGH)) {
> +
> + /* <forward type='bridge|private|vepa|passthrough'> are all
> + * VIR_DOMAIN_NET_TYPE_DIRECT.
> + */
> +
> + ret = VIR_DOMAIN_NET_TYPE_DIRECT;
> +
> }
>
> - return netResolveActualType(iface);
> + cleanup:
> + virNetworkDefFree(def);
> + VIR_FREE(xml);
> + virObjectUnref(conn);
> + virObjectUnref(net);
To follow the order of ref/unref, I would swap the calls
virObjectUnref(conn) and virObjectUnref(net). Even if it's not necessary
here.
> + return ret;
> }
[…snip]
--
Beste Grüße / Kind regards
Marc Hartmayer
IBM Deutschland Research & Development GmbH
Vorsitzende des Aufsichtsrats: Martina Koederitz
Geschäftsführung: Dirk Wittkopp
Sitz der Gesellschaft: Böblingen
Registergericht: Amtsgericht Stuttgart, HRB 243294
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
