Handle ethernet network interface types

These are used in the CI and were previously working when passing the
network device by tap name.

Author: bryteise

src/ch/ch_interface.c

@@ -15,6 +15,133 @@
 
 VIR_LOG_INIT("ch.ch_interface");
 
+/* chInterfaceEthernetConnect:
+ * @def: the definition of the VM
+ * @driver: ch driver data
+ * @net: pointer to the VM's interface description
+ * @tapfd: array of file descriptor return value for the new device
+ * @tapfdsize: number of file descriptors in @tapfd
+ *
+ * Called *only* called if actualType is VIR_DOMAIN_NET_TYPE_ETHERNET
+ * (i.e. if the connection is made with a tap device)
+ */
+int
+chInterfaceEthernetConnect(virDomainDefPtr def,
+                           virCHDriverPtr driver,
+                           virDomainNetDefPtr net,
+                           int *tapfd,
+                           size_t tapfdSize)
+{
+    virMacAddr tapmac;
+    int ret = -1;
+    unsigned int tap_create_flags = VIR_NETDEV_TAP_CREATE_IFUP;
+    bool template_ifname = false;
+    virCHDriverConfigPtr cfg = virCHDriverGetConfig(driver);
+    const char *tunpath = "/dev/net/tun";
+    const char *auditdev = tunpath;
+
+    if (net->backend.tap) {
+        tunpath = net->backend.tap;
+        if (!driver->privileged) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                           _("cannot use custom tap device in session mode"));
+            goto cleanup;
+        }
+    }
+
+    if (virDomainNetIsVirtioModel(net))
+        tap_create_flags |= VIR_NETDEV_TAP_CREATE_VNET_HDR;
+
+    if (net->managed_tap == VIR_TRISTATE_BOOL_NO) {
+        if (!net->ifname) {
+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                           _("target dev must be supplied when managed='no'"));
+            goto cleanup;
+        }
+        if (virNetDevExists(net->ifname) != 1) {
+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                           _("target managed='no' but specified dev doesn't exist"));
+            goto cleanup;
+        }
+        if (virNetDevMacVLanIsMacvtap(net->ifname)) {
+            auditdev = net->ifname;
+            if (virNetDevMacVLanTapOpen(net->ifname, tapfd, tapfdSize) < 0)
+                goto cleanup;
+            if (virNetDevMacVLanTapSetup(tapfd, tapfdSize,
+                                         virDomainNetIsVirtioModel(net)) < 0) {
+                goto cleanup;
+            }
+        } else {
+            if (virNetDevTapCreate(&net->ifname, tunpath, tapfd, tapfdSize,
+                                   tap_create_flags) < 0)
+                goto cleanup;
+        }
+    } else {
+        if (!net->ifname ||
+            STRPREFIX(net->ifname, VIR_NET_GENERATED_TAP_PREFIX) ||
+            strchr(net->ifname, '%')) {
+            g_free(net->ifname);
+            net->ifname = g_strdup(VIR_NET_GENERATED_TAP_PREFIX "%d");
+            /* avoid exposing vnet%d in getXMLDesc or error outputs */
+            template_ifname = true;
+        }
+        if (virNetDevTapCreate(&net->ifname, tunpath, tapfd, tapfdSize,
+                               tap_create_flags) < 0) {
+            goto cleanup;
+        }
+
+        /* The tap device's MAC address cannot match the MAC address
+         * used by the guest. This results in "received packet on
+         * vnetX with own address as source address" error logs from
+         * the kernel.
+         */
+        virMacAddrSet(&tapmac, &net->mac);
+        if (tapmac.addr[0] == 0xFE)
+            tapmac.addr[0] = 0xFA;
+        else
+            tapmac.addr[0] = 0xFE;
+
+        if (virNetDevSetMAC(net->ifname, &tapmac) < 0)
+            goto cleanup;
+
+        if (virNetDevSetOnline(net->ifname, true) < 0)
+            goto cleanup;
+    }
+
+    if (net->script &&
+        virNetDevRunEthernetScript(net->ifname, net->script) < 0)
+        goto cleanup;
+
+    if (cfg->macFilter &&
+        ebtablesAddForwardAllowIn(driver->ebtables,
+                                  net->ifname,
+                                  &net->mac) < 0)
+        goto cleanup;
+
+    if (net->filter &&
+        virDomainConfNWFilterInstantiate(def->name, def->uuid, net, false) < 0) {
+        goto cleanup;
+    }
+
+    virDomainAuditNetDevice(def, net, auditdev, true);
+
+    ret = 0;
+
+ cleanup:
+    if (ret < 0) {
+        size_t i;
+
+        virDomainAuditNetDevice(def, net, auditdev, false);
+        for (i = 0; i < tapfdSize && tapfd[i] >= 0; i++)
+            VIR_FORCE_CLOSE(tapfd[i]);
+        if (template_ifname)
+            g_free(net->ifname);
+    }
+    virObjectUnref(cfg);
+
+    return ret;
+}
+
 /* chInterfaceBridgeConnect:
  * @def: the definition of the VM
  * @driver: qemu driver data

src/ch/ch_interface.h

@@ -1,8 +1,15 @@
 #include "domain_conf.h"
 #include "ch_conf.h"
 
+int
+chInterfaceEthernetConnect(virDomainDefPtr def,
+                           virCHDriverPtr driver,
+                           virDomainNetDefPtr net,
+                           int *tapfd,
+                           size_t tapfdSize);
+
 int chInterfaceBridgeConnect(virDomainDefPtr def,
                            virCHDriverPtr driver,
                            virDomainNetDefPtr net,
                            int *tapfd,
-                           size_t *tapfdSize);
+                           size_t *tapfdSize);

src/ch/ch_process.c

@@ -589,10 +589,11 @@ chProcessNetworkPrepareDevices(virCHDriverPtr driver, virDomainObjPtr vm)
         } else if (actualType == VIR_DOMAIN_NET_TYPE_USER ) {
             virReportError(VIR_ERR_INTERNAL_ERROR,
               _("VIR_DOMAIN_NET_TYPE_USER is not a supported Network type"));
-         } else if (actualType == VIR_DOMAIN_NET_TYPE_NETWORK ) {
+        } else if (actualType == VIR_DOMAIN_NET_TYPE_NETWORK) {
             tapfdSize = net->driver.virtio.queues;
             if (!tapfdSize)
                 tapfdSize = 1;
+            VIR_ERROR("tapfd: %lu", tapfdSize);
 
             tapfd = g_new(int, tapfdSize);
 
@@ -606,7 +607,24 @@ chProcessNetworkPrepareDevices(virCHDriverPtr driver, virDomainObjPtr vm)
             // This info will be used while generating Network Json
             priv->tapfd = g_steal_pointer(&tapfd);
             priv->tapfdSize = tapfdSize;
-         }
+        } else if (actualType == VIR_DOMAIN_NET_TYPE_ETHERNET) {
+            tapfdSize = net->driver.virtio.queues;
+            if (!tapfdSize)
+                tapfdSize = 1;
+
+            tapfd = g_new(int, tapfdSize);
+
+            memset(tapfd, -1, tapfdSize * sizeof(tapfd[0]));
+
+            if (chInterfaceEthernetConnect(def, driver, net,
+                                           tapfd, tapfdSize) < 0)
+                goto cleanup;
+
+            // Store tap information in Private Data
+            // This info will be used while generating Network Json
+            priv->tapfd = g_steal_pointer(&tapfd);
+            priv->tapfdSize = tapfdSize;
+        }
     }
 
     return 0;