From patchwork Thu Oct 22 16:49:08 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark McLoughlin X-Patchwork-Id: 36721 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 70EA3B7B90 for ; Fri, 23 Oct 2009 04:40:58 +1100 (EST) Received: from localhost ([127.0.0.1]:52701 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N11eh-00079q-3a for incoming@patchwork.ozlabs.org; Thu, 22 Oct 2009 13:40:55 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N10sn-0006I8-Pn for qemu-devel@nongnu.org; Thu, 22 Oct 2009 12:51:26 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N10sb-00068J-G0 for qemu-devel@nongnu.org; Thu, 22 Oct 2009 12:51:19 -0400 Received: from [199.232.76.173] (port=54110 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N10sa-00066v-PW for qemu-devel@nongnu.org; Thu, 22 Oct 2009 12:51:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60980) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N10sZ-00042c-Vl for qemu-devel@nongnu.org; Thu, 22 Oct 2009 12:51:12 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n9MGpAFK009475 for ; Thu, 22 Oct 2009 12:51:11 -0400 Received: from blaa.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n9MGp9Ij009524; Thu, 22 Oct 2009 12:51:10 -0400 Received: by blaa.localdomain (Postfix, from userid 500) id 2DFAA45B91; Thu, 22 Oct 2009 17:49:17 +0100 (IST) From: Mark McLoughlin To: qemu-devel@nongnu.org Date: Thu, 22 Oct 2009 17:49:08 +0100 Message-Id: <1256230156-29652-8-git-send-email-markmc@redhat.com> In-Reply-To: <1256230156-29652-1-git-send-email-markmc@redhat.com> References: <1256230156-29652-1-git-send-email-markmc@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Mark McLoughlin Subject: [Qemu-devel] [PATCH 07/15] net: split BSD tap_open() out into net/tap-bsd.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Mark McLoughlin --- 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 69ead10..a29c486 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 0000000..6940434 --- /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 6b43d80..64553ab 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 53952a1..5d32de5 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);