OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

net: split BSD tap_open() out into net/tap-bsd.c

Browse Source 
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Mark McLoughlin 2009-10-22 17:49:08 +01:00 committed by Anthony Liguori
parent 5281d757ef
commit e7e92325d9
4 changed files with 69 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -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))
######################################################################

62
net/tap-bsd.c Normal file
View File

@ -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 <net/if_tap.h>
#endif
#if defined(__FreeBSD__) || defined(__DragonFly__)
#include <libutil.h>
#else
#include <util.h>
#endif
#elif defined (__GLIBC__) && defined (__FreeBSD_kernel__)
#include <freebsd/stdlib.h>
#if defined(__OpenBSD__)
#include <util.h>
#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;
}

50
net/tap.c
View File

@ -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;

2
net/tap.h
View File

@ -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);