aboutsummaryrefslogtreecommitdiff
path: root/net/tap.c
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2009-10-22 17:49:08 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2009-10-30 08:39:27 -0500
commite7e92325d92843aaa022000aacb9602d3a6ad986 (patch)
treec09fa5c69648dc1e7ed6f1dfe12871aeb3b08659 /net/tap.c
parent5281d757efa6e40d74ce124be048b08d43887555 (diff)
downloadqemu-e7e92325d92843aaa022000aacb9602d3a6ad986.zip
qemu-e7e92325d92843aaa022000aacb9602d3a6ad986.tar.gz
qemu-e7e92325d92843aaa022000aacb9602d3a6ad986.tar.bz2
net: split BSD tap_open() out into net/tap-bsd.c
Signed-off-by: Mark McLoughlin <markmc@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'net/tap.c')
-rw-r--r--net/tap.c50
1 files changed, 4 insertions, 46 deletions
diff --git a/net/tap.c b/net/tap.c
index 6b43d80..64553ab 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -42,24 +42,6 @@
#include "net/tap-linux.h"
#endif
-#ifdef __NetBSD__
-#include <net/if_tap.h>
-#endif
-
-#ifdef CONFIG_BSD
-#if defined(__FreeBSD__) || defined(__DragonFly__)
-#include <libutil.h>
-#else
-#include <util.h>
-#endif
-#elif defined (__GLIBC__) && defined (__FreeBSD_kernel__)
-#include <freebsd/stdlib.h>
-#endif
-
-#if defined(__OpenBSD__)
-#include <util.h>
-#endif
-
#ifdef __sun__
#include <sys/stat.h>
#include <sys/ethernet.h>
@@ -394,28 +376,7 @@ static TAPState *net_tap_fd_init(VLANState *vlan,
return s;
}
-#if defined (CONFIG_BSD) || defined (__FreeBSD_kernel__)
-static int tap_open(char *ifname, int ifname_size,
- int *vnet_hdr, int vnet_hdr_required)
-{
- int fd;
- char *dev;
- struct stat s;
-
- TFR(fd = open("/dev/tap", O_RDWR));
- if (fd < 0) {
- fprintf(stderr, "warning: could not open /dev/tap: no virtual network emulation\n");
- return -1;
- }
-
- fstat(fd, &s);
- dev = devname(s.st_rdev, S_IFCHR);
- pstrcpy(ifname, ifname_size, dev);
-
- fcntl(fd, F_SETFL, O_NONBLOCK);
- return fd;
-}
-#elif defined(__sun__)
+#ifdef __sun__
#define TUNNEWPPA (('T'<<16) | 0x0001)
/*
* Allocate TAP device, returns opened fd.
@@ -538,8 +499,7 @@ static int tap_alloc(char *dev, size_t dev_size)
return tap_fd;
}
-static int tap_open(char *ifname, int ifname_size,
- int *vnet_hdr, int vnet_hdr_required)
+int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required)
{
char dev[10]="";
int fd;
@@ -552,15 +512,13 @@ static int tap_open(char *ifname, int ifname_size,
return fd;
}
#elif defined (_AIX)
-static int tap_open(char *ifname, int ifname_size,
- int *vnet_hdr, int vnet_hdr_required)
+int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required)
{
fprintf (stderr, "no tap on AIX\n");
return -1;
}
#else
-static int tap_open(char *ifname, int ifname_size,
- int *vnet_hdr, int vnet_hdr_required)
+int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required)
{
struct ifreq ifr;
int fd, ret;