Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20170201' into staging

[qemu.git] / net / tap-bsd.c

diff --git a/net/tap-bsd.c b/net/tap-bsd.c
index 937a94b11f41e9f2f182bb41f80a7b11127b73ed..6c9692263d3662d82ffeea8ed56e427d18931fa9 100644 (file)
--- a/net/tap-bsd.c
+++ b/net/tap-bsd.c
@@ -22,18 +22,26 @@
  * THE SOFTWARE.
  */
 
  * THE SOFTWARE.
  */
 

-#include "net/tap.h"
-#include "qemu-common.h"
-#include "sysemu.h"
-#include "qemu-error.h"
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "tap_int.h"
+#include "qemu/cutils.h"
+#include "sysemu/sysemu.h"
+#include "qemu/error-report.h"

 
 

-#ifdef __NetBSD__
+#if defined(__NetBSD__) || defined(__FreeBSD__)

 #include <sys/ioctl.h>
 #include <net/if.h>
 #include <net/if_tap.h>
 #endif
 
 #include <sys/ioctl.h>
 #include <net/if.h>
 #include <net/if_tap.h>
 #endif
 

-int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required)
+#if defined(__OpenBSD__)
+#include <sys/param.h>
+#endif
+
+#ifndef __FreeBSD__
+int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
+             int vnet_hdr_required, int mq_required, Error **errp)

 {
     int fd;
 #ifdef TAPGIFNAME
 {
     int fd;
 #ifdef TAPGIFNAME


@@ -43,7 +51,6 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required
     struct stat s;
 #endif
 
     struct stat s;
 #endif
 

-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)

     /* if no ifname is given, always start the search from tap0/tun0. */
     int i;
     char dname[100];
     /* if no ifname is given, always start the search from tap0/tun0. */
     int i;
     char dname[100];


@@ -52,7 +59,7 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required
         if (*ifname) {
             snprintf(dname, sizeof dname, "/dev/%s", ifname);
         } else {
         if (*ifname) {
             snprintf(dname, sizeof dname, "/dev/%s", ifname);
         } else {

-#if defined(__OpenBSD__)
+#if defined(__OpenBSD__) && OpenBSD < 201605

             snprintf(dname, sizeof dname, "/dev/tun%d", i);
 #else
             snprintf(dname, sizeof dname, "/dev/tap%d", i);
             snprintf(dname, sizeof dname, "/dev/tun%d", i);
 #else
             snprintf(dname, sizeof dname, "/dev/tap%d", i);


@@ -70,32 +77,19 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required
         }
     }
     if (fd < 0) {
         }
     }
     if (fd < 0) {

-        error_report("warning: could not open %s (%s): no virtual network emulation",
-                   dname, strerror(errno));
-        return -1;
-    }
-#else
-    TFR(fd = open("/dev/tap", O_RDWR));
-    if (fd < 0) {
-        fprintf(stderr,
-            "warning: could not open /dev/tap: no virtual network emulation: %s\n",
-            strerror(errno));
+        error_setg_errno(errp, errno, "could not open %s", dname);

         return -1;
     }
         return -1;
     }

-#endif

 
 #ifdef TAPGIFNAME
     if (ioctl(fd, TAPGIFNAME, (void *)&ifr) < 0) {
 
 #ifdef TAPGIFNAME
     if (ioctl(fd, TAPGIFNAME, (void *)&ifr) < 0) {

-        fprintf(stderr, "warning: could not get tap name: %s\n",
-            strerror(errno));
+        error_setg_errno(errp, errno, "could not get tap name");

         return -1;
     }
     pstrcpy(ifname, ifname_size, ifr.ifr_name);
 #else
     if (fstat(fd, &s) < 0) {
         return -1;
     }
     pstrcpy(ifname, ifname_size, ifr.ifr_name);
 #else
     if (fstat(fd, &s) < 0) {

-        fprintf(stderr,
-            "warning: could not stat /dev/tap: no virtual network emulation: %s\n",
-            strerror(errno));
+        error_setg_errno(errp, errno, "could not stat %s", dname);

         return -1;
     }
     dev = devname(s.st_rdev, S_IFCHR);
         return -1;
     }
     dev = devname(s.st_rdev, S_IFCHR);


@@ -107,8 +101,8 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required
         *vnet_hdr = 0;
 
         if (vnet_hdr_required && !*vnet_hdr) {
         *vnet_hdr = 0;
 
         if (vnet_hdr_required && !*vnet_hdr) {

-            error_report("vnet_hdr=1 requested, but no kernel "
-                         "support for IFF_VNET_HDR available");
+            error_setg(errp, "vnet_hdr=1 requested, but no kernel "
+                       "support for IFF_VNET_HDR available");

             close(fd);
             return -1;
         }
             close(fd);
             return -1;
         }


@@ -117,9 +111,104 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required
     return fd;
 }
 
     return fd;
 }
 

-int tap_set_sndbuf(int fd, QemuOpts *opts)
+#else /* __FreeBSD__ */
+
+#define PATH_NET_TAP "/dev/tap"
+
+static int tap_open_clone(char *ifname, int ifname_size, Error **errp)
+{
+    int fd, s, ret;
+    struct ifreq ifr;
+
+    TFR(fd = open(PATH_NET_TAP, O_RDWR));
+    if (fd < 0) {
+        error_setg_errno(errp, errno, "could not open %s", PATH_NET_TAP);
+        return -1;
+    }
+
+    memset(&ifr, 0, sizeof(ifr));
+
+    ret = ioctl(fd, TAPGIFNAME, (void *)&ifr);
+    if (ret < 0) {
+        error_setg_errno(errp, errno, "could not get tap interface name");
+        close(fd);
+        return -1;
+    }
+
+    if (ifname[0] != '\0') {
+        /* User requested the interface to have a specific name */
+        s = socket(AF_LOCAL, SOCK_DGRAM, 0);
+        if (s < 0) {
+            error_setg_errno(errp, errno,
+                             "could not open socket to set interface name");
+            close(fd);
+            return -1;
+        }
+        ifr.ifr_data = ifname;
+        ret = ioctl(s, SIOCSIFNAME, (void *)&ifr);
+        close(s);
+        if (ret < 0) {
+            error_setg(errp, "could not set tap interface name");
+            close(fd);
+            return -1;
+        }
+    } else {
+        pstrcpy(ifname, ifname_size, ifr.ifr_name);
+    }
+
+    return fd;
+}
+
+int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
+             int vnet_hdr_required, int mq_required, Error **errp)
+{
+    int fd = -1;
+
+    /* If the specified tap device already exists just use it. */
+    if (ifname[0] != '\0') {
+        char dname[100];
+        snprintf(dname, sizeof dname, "/dev/%s", ifname);
+        TFR(fd = open(dname, O_RDWR));
+        if (fd < 0 && errno != ENOENT) {
+            error_setg_errno(errp, errno, "could not open %s", dname);
+            return -1;
+        }
+    }
+
+    if (fd < 0) {
+        /* Tap device not specified or does not exist. */
+        if ((fd = tap_open_clone(ifname, ifname_size, errp)) < 0) {
+            return -1;
+        }
+    }
+
+    if (*vnet_hdr) {
+        /* BSD doesn't have IFF_VNET_HDR */
+        *vnet_hdr = 0;
+
+        if (vnet_hdr_required && !*vnet_hdr) {
+            error_setg(errp, "vnet_hdr=1 requested, but no kernel "
+                       "support for IFF_VNET_HDR available");
+            goto error;
+        }
+    }
+    if (mq_required) {
+        error_setg(errp, "mq_required requested, but no kernel support"
+                   " for IFF_MULTI_QUEUE available");
+        goto error;
+    }
+
+    fcntl(fd, F_SETFL, O_NONBLOCK);
+    return fd;
+
+error:
+    close(fd);
+    return -1;
+}
+#endif /* __FreeBSD__ */
+
+void tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp)

 {
 {

-    return 0;

 }
 
 int tap_probe_vnet_hdr(int fd)
 }
 
 int tap_probe_vnet_hdr(int fd)


@@ -141,7 +230,32 @@ void tap_fd_set_vnet_hdr_len(int fd, int len)
 {
 }
 
 {
 }
 

+int tap_fd_set_vnet_le(int fd, int is_le)
+{
+    return -EINVAL;
+}
+
+int tap_fd_set_vnet_be(int fd, int is_be)
+{
+    return -EINVAL;
+}
+

 void tap_fd_set_offload(int fd, int csum, int tso4,
                         int tso6, int ecn, int ufo)
 {
 }
 void tap_fd_set_offload(int fd, int csum, int tso4,
                         int tso6, int ecn, int ufo)
 {
 }

+
+int tap_fd_enable(int fd)
+{
+    return -1;
+}
+
+int tap_fd_disable(int fd)
+{
+    return -1;
+}
+
+int tap_fd_get_ifname(int fd, char *ifname)
+{
+    return -1;
+}