[libvirt] [PATCH v4 04/29] network: use 'bridge' as actual type instead of 'network'

[Daniel P. Berrangé]

Ports allocated on virtual networks with type=nat|route|open all get
given an actual type of 'network'.

Only ports in networks with type=bridge use an actual type of 'bridge'.

This distinction makes little sense since the virtualization drivers
will treat both actual types in exactly the same way, as they're all
just bridge devices a VM needs to be connected to.

This doesn't affect user visible XML since the "actual" device XML
is internal only, but we need code to convert the data upgrades.

Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
---
 src/conf/domain_conf.c      | 28 +++++++++++++++++++++++-----
 src/network/bridge_driver.c | 11 +++--------
 src/qemu/qemu_driver.c      |  2 +-
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 0df3c2ed49..1dde45a6fd 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -5081,6 +5081,19 @@ virDomainDiskDefPostParse(virDomainDiskDefPtr disk,
         return -1;
     }
 
+    /* Older libvirtd uses actualType==network, but we now
+     * just use actualType==bridge, as nothing needs to
+     * distinguish the two cases, and this simplifies virt
+     * drive code */
+    if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK &&
+        net->data.network.actual != NULL  &&
+        net->data.network.actual->type == VIR_DOMAIN_NET_TYPE_NETWORK) {
+        char mac[VIR_MAC_STRING_BUFLEN];
+        virMacAddrFormat(&net->mac, mac);
+        VIR_DEBUG("Updating NIC %s actual type to bridge", mac);
+        net->data.network.actual->type = VIR_DOMAIN_NET_TYPE_BRIDGE;
+    }
+
     return 0;
 }
 
@@ -11267,11 +11280,16 @@ virDomainActualNetDefParseXML(xmlNodePtr node,
     }
 
     bandwidth_node = virXPathNode("./bandwidth", ctxt);
-    if (bandwidth_node &&
-        virNetDevBandwidthParse(&actual->bandwidth,
-                                bandwidth_node,
-                                def->type == VIR_DOMAIN_NET_TYPE_NETWORK) < 0)
-        goto error;
+    if (bandwidth_node) {
+        bool allowFloor =
+            (actual->type == VIR_DOMAIN_NET_TYPE_NETWORK) ||
+            (actual->type == VIR_DOMAIN_NET_TYPE_BRIDGE &&
+             actual->data.bridge.brname != NULL);
+        if (virNetDevBandwidthParse(&actual->bandwidth,
+                                    bandwidth_node,
+                                    allowFloor) < 0)
+            goto error;
+    }
 
     vlanNode = virXPathNode("./vlan", ctxt);
     if (vlanNode && virNetDevVlanParse(vlanNode, ctxt, &actual->vlan) < 0)
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 6ed0bf1e8e..4055939ade 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -4491,11 +4491,7 @@ networkAllocateActualDevice(virNetworkPtr net,
     case VIR_NETWORK_FORWARD_NAT:
     case VIR_NETWORK_FORWARD_ROUTE:
     case 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
-         */
-        iface->data.network.actual->type = VIR_DOMAIN_NET_TYPE_NETWORK;
+        iface->data.network.actual->type = VIR_DOMAIN_NET_TYPE_BRIDGE;
 
         /* we also store the bridge device and macTableManager settings
          * in iface->data.network.actual->data.bridge for later use
@@ -5454,9 +5450,8 @@ networkBandwidthGenericChecks(virDomainNetDefPtr iface,
     virNetDevBandwidthPtr ifaceBand;
     unsigned long long old_floor, new_floor;
 
-    if (virDomainNetGetActualType(iface) != VIR_DOMAIN_NET_TYPE_NETWORK &&
-        (virDomainNetGetActualType(iface) != VIR_DOMAIN_NET_TYPE_BRIDGE ||
-         iface->data.network.actual->data.bridge.brname == NULL)) {
+    if (virDomainNetGetActualType(iface) != VIR_DOMAIN_NET_TYPE_BRIDGE ||
+        iface->data.network.actual->data.bridge.brname == NULL) {
         /* This is not an interface that's plugged into a network.
          * We don't care. Thus from our POV bandwidth change is allowed. */
         return false;
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index c443c881d5..31d8647eee 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -4567,7 +4567,7 @@ processNicRxFilterChangedEvent(virQEMUDriverPtr driver,
         syncNicRxFilterDeviceOptions(def->ifname, guestFilter, hostFilter);
     }
 
-    if (virDomainNetGetActualType(def) == VIR_DOMAIN_NET_TYPE_NETWORK) {
+    if (virDomainNetGetActualType(def) == VIR_DOMAIN_NET_TYPE_BRIDGE) {
         const char *brname = virDomainNetGetActualBridgeName(def);
 
         /* For libivrt network connections, set the following TUN/TAP network
-- 
2.20.1