]> xenbits.xensource.com Git - libvirt.git/commitdiff
network: fix ability to use openvswitch with vlans
authorDaniel P. Berrangé <berrange@redhat.com>
Thu, 8 Aug 2019 12:42:24 +0000 (13:42 +0100)
committerDaniel P. Berrangé <berrange@redhat.com>
Thu, 8 Aug 2019 13:16:22 +0000 (14:16 +0100)
Use the correct enum constant when validating vlan usage.
This fixes a merge error in

  commit 6cb0ec48bd95c95489a987e05a88e8bcf1f9109c
  Author: Daniel P. Berrangé <berrange@redhat.com>
  Date:   Mon Sep 3 17:34:22 2018 +0100

    network: convert networkAllocateActualDevice to virNetworkPortDef

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
src/network/bridge_driver.c

index 41fa89a4afb18fe9fb33cd86a0efb8f6ec743fe4..72e118643f8ca7676074b061fb9e2374dafd2680 100644 (file)
@@ -4814,7 +4814,7 @@ networkAllocatePort(virNetworkObjPtr obj,
         if (!(port->plugtype == VIR_NETWORK_PORT_PLUG_TYPE_HOSTDEV_PCI ||
               (port->plugtype == VIR_NETWORK_PORT_PLUG_TYPE_DIRECT &&
                port->plug.direct.mode == VIR_NETDEV_MACVLAN_MODE_PASSTHRU) ||
-              (port->plugtype == VIR_DOMAIN_NET_TYPE_BRIDGE &&
+              (port->plugtype == VIR_NETWORK_PORT_PLUG_TYPE_BRIDGE &&
                port->virtPortProfile &&
                port->virtPortProfile->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH))) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,