aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorManuel Bouyer <bouyer@netbsd.org>2011-08-07 09:48:59 +0000
committerBlue Swirl <blauwirbel@gmail.com>2011-08-07 09:48:59 +0000
commit45c245bf808a48cb7c6c99aaa43d8fb9054fc84e (patch)
treec27adf9b6ccaef0198452efa4ca2fc5c13dc1ea6 /net
parentc7c37b5d702b7f93b03133420460970a8fa8724f (diff)
Fix network interface tap backend
Fix network interface tap backend work on NetBSD. It uses an ioctl to get the tap name. Signed-off-by: Christoph Egger<Christoph.Egger@amd.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'net')
-rw-r--r--net/tap-bsd.c26
1 files changed, 24 insertions, 2 deletions
diff --git a/net/tap-bsd.c b/net/tap-bsd.c
index 2f3efdee03..4b6b3a41a0 100644
--- a/net/tap-bsd.c
+++ b/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,30 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required
#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 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 */