From patchwork Thu Oct 22 16:49:10 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark McLoughlin X-Patchwork-Id: 36730 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 482B8B7BB9 for ; Fri, 23 Oct 2009 05:06:59 +1100 (EST) Received: from localhost ([127.0.0.1]:47652 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N123s-00021W-4a for incoming@patchwork.ozlabs.org; Thu, 22 Oct 2009 14:06:56 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N11hh-0000MP-SL for qemu-devel@nongnu.org; Thu, 22 Oct 2009 13:44:02 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N11hd-0000LQ-6F for qemu-devel@nongnu.org; Thu, 22 Oct 2009 13:44:01 -0400 Received: from [199.232.76.173] (port=53850 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N11hd-0000LN-3B for qemu-devel@nongnu.org; Thu, 22 Oct 2009 13:43:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10330) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N11hc-00041e-Kg for qemu-devel@nongnu.org; Thu, 22 Oct 2009 13:43:56 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n9MGpAgW012460 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-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n9MGp9FP019916; Thu, 22 Oct 2009 12:51:10 -0400 Received: by blaa.localdomain (Postfix, from userid 500) id 4553745C15; Thu, 22 Oct 2009 17:49:17 +0100 (IST) From: Mark McLoughlin To: qemu-devel@nongnu.org Date: Thu, 22 Oct 2009 17:49:10 +0100 Message-Id: <1256230156-29652-10-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.16 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Mark McLoughlin Subject: [Qemu-devel] [PATCH 09/15] net: move AIX code into net/tap-aix.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 Okay, this makes the tap options available on AIX even though there's no support, but if we want to do it right we should have not compile the tap code at all on AIX using e.g. CONFIG_TAP. Signed-off-by: Mark McLoughlin --- Makefile | 1 + net.c | 2 -- net/tap-aix.c | 32 ++++++++++++++++++++++++++++++++ net/tap.c | 12 ------------ 4 files changed, 33 insertions(+), 14 deletions(-) create mode 100644 net/tap-aix.c diff --git a/Makefile b/Makefile index 5918213..b9ff2eb 100644 --- a/Makefile +++ b/Makefile @@ -92,6 +92,7 @@ net-nested-$(CONFIG_POSIX) += tap.o net-nested-$(CONFIG_WIN32) += tap-win32.o net-nested-$(CONFIG_BSD) += tap-bsd.o net-nested-$(CONFIG_SOLARIS) += tap-solaris.o +net-nested-$(CONFIG_AIX) += tap-aix.o net-obj-y += $(addprefix net/, $(net-nested-y)) ###################################################################### diff --git a/net.c b/net.c index 365305a..661bbc1 100644 --- a/net.c +++ b/net.c @@ -2425,7 +2425,6 @@ static struct { { /* end of list */ } }, #endif -#ifndef _AIX }, { .type = "tap", .init = net_init_tap, @@ -2461,7 +2460,6 @@ static struct { #endif /* _WIN32 */ { /* end of list */ } }, -#endif /* _AIX */ }, { .type = "socket", .init = net_init_socket, diff --git a/net/tap-aix.c b/net/tap-aix.c new file mode 100644 index 0000000..5ec3b2c --- /dev/null +++ b/net/tap-aix.c @@ -0,0 +1,32 @@ +/* + * 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" +#include + +int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required) +{ + fprintf(stderr, "no tap on AIX\n"); + return -1; +} diff --git a/net/tap.c b/net/tap.c index 056fefe..560e0e4 100644 --- a/net/tap.c +++ b/net/tap.c @@ -42,8 +42,6 @@ #include "net/tap-linux.h" #endif -#if !defined(_AIX) - /* Maximum GSO packet size (64k) plus plenty of room for * the ethernet and virtio_net headers */ @@ -349,13 +347,6 @@ static TAPState *net_tap_fd_init(VLANState *vlan, return s; } -#ifdef _AIX -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 int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required) { struct ifreq ifr; @@ -400,7 +391,6 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required fcntl(fd, F_SETFL, O_NONBLOCK); return fd; } -#endif static int launch_script(const char *setup_script, const char *ifname, int fd) { @@ -551,5 +541,3 @@ int net_init_tap(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan return 0; } - -#endif /* !defined(_AIX) */