summaryrefslogtreecommitdiff
path: root/emulators/qemu0/patches/patch-aa
diff options
context:
space:
mode:
Diffstat (limited to 'emulators/qemu0/patches/patch-aa')
-rw-r--r--emulators/qemu0/patches/patch-aa57
1 files changed, 0 insertions, 57 deletions
diff --git a/emulators/qemu0/patches/patch-aa b/emulators/qemu0/patches/patch-aa
deleted file mode 100644
index 24e38d21c75..00000000000
--- a/emulators/qemu0/patches/patch-aa
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2012/06/07 21:35:37 ryoon Exp $
-
-* fixes a bug with tap device detection
-
---- net/tap-bsd.c.orig 2011-08-08 18:28:42.000000000 +0000
-+++ net/tap-bsd.c
-@@ -28,6 +28,8 @@
- #include "qemu-error.h"
-
- #ifdef __NetBSD__
-+#include <sys/ioctl.h>
-+#include <net/if.h>
- #include <net/if_tap.h>
- #endif
-
-@@ -40,8 +42,12 @@
- int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required)
- {
- int fd;
-+#ifdef TAPGIFNAME
-+ struct ifreq ifr;
-+#else
- char *dev;
- struct stat s;
-+#endif
-
- #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
- /* if no ifname is given, always start the search from tap0/tun0. */
-@@ -77,14 +83,26 @@ int tap_open(char *ifname, int ifname_si
- #else
- TFR(fd = open("/dev/tap", O_RDWR));
- if (fd < 0) {
-- fprintf(stderr, "warning: could not open /dev/tap: no virtual network emulation\n");
-+ fprintf(stderr, "warning: could not open /dev/tap: no virtual network emulation: %s\n", strerror(errno));
- return -1;
- }
- #endif
-
-- fstat(fd, &s);
-+#ifdef TAPGIFNAME
-+ if (ioctl (fd, TAPGIFNAME, (void*)&ifr) < 0) {
-+ fprintf(stderr, "warning: could not open get tap name: %s\n",
-+ strerror(errno));
-+ 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));
-+ return -1;
-+ }
- dev = devname(s.st_rdev, S_IFCHR);
- pstrcpy(ifname, ifname_size, dev);
-+#endif
-
- if (*vnet_hdr) {
- /* BSD doesn't have IFF_VNET_HDR */