From e7e92325d92843aaa022000aacb9602d3a6ad986 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Thu, 22 Oct 2009 17:49:08 +0100 Subject: [PATCH] net: split BSD tap_open() out into net/tap-bsd.c Signed-off-by: Mark McLoughlin Signed-off-by: Anthony Liguori --- Makefile | 1 + net/tap-bsd.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++ net/tap.c | 50 ++++------------------------------------- net/tap.h | 2 ++ 4 files changed, 69 insertions(+), 46 deletions(-) create mode 100644 net/tap-bsd.c diff --git a/Makefile b/Makefile index 0680855504..9105340909 100644 --- a/Makefile +++ b/Makefile @@ -90,6 +90,7 @@ net-obj-y = net.o net-nested-y = queue.o checksum.o net-nested-$(CONFIG_POSIX) += tap.o net-nested-$(CONFIG_WIN32) += tap-win32.o +net-nested-$(CONFIG_BSD) += tap-bsd.o net-obj-y += $(addprefix net/, $(net-nested-y)) ###################################################################### diff --git a/net/tap-bsd.c b/net/tap-bsd.c new file mode 100644 index 0000000000..6940434ef5 --- /dev/null +++ b/net/tap-bsd.c @@ -0,0 +1,62 @@ +/* + * QEMU System Emulator + * + * Copyright (c) 2003-2008 Fabrice Bellard + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "net/tap.h" +#incude "qemu-common.h" + +#ifdef __NetBSD__ +#include +#endif + +#if defined(__FreeBSD__) || defined(__DragonFly__) +#include +#else +#include +#endif +#elif defined (__GLIBC__) && defined (__FreeBSD_kernel__) +#include + +#if defined(__OpenBSD__) +#include +#endif + +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; +} diff --git a/net/tap.c b/net/tap.c index 6b43d808d2..64553ab8e1 100644 --- a/net/tap.c +++ b/net/tap.c @@ -42,24 +42,6 @@ #include "net/tap-linux.h" #endif -#ifdef __NetBSD__ -#include -#endif - -#ifdef CONFIG_BSD -#if defined(__FreeBSD__) || defined(__DragonFly__) -#include -#else -#include -#endif -#elif defined (__GLIBC__) && defined (__FreeBSD_kernel__) -#include -#endif - -#if defined(__OpenBSD__) -#include -#endif - #ifdef __sun__ #include #include @@ -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; diff --git a/net/tap.h b/net/tap.h index 53952a1e75..5d32de59b4 100644 --- a/net/tap.h +++ b/net/tap.h @@ -34,6 +34,8 @@ int net_init_tap(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan); +int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required); + int tap_has_ufo(VLANClientState *vc); int tap_has_vnet_hdr(VLANClientState *vc); void tap_using_vnet_hdr(VLANClientState *vc, int using_vnet_hdr);