From patchwork Thu Feb 4 12:47:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 44475 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 A0828B7D52 for ; Fri, 5 Feb 2010 00:06:11 +1100 (EST) Received: from localhost ([127.0.0.1]:59243 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nd1PM-0000oK-Qe for incoming@patchwork.ozlabs.org; Thu, 04 Feb 2010 08:06:08 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nd1A2-0004D4-Uf for qemu-devel@nongnu.org; Thu, 04 Feb 2010 07:50:18 -0500 Received: from [199.232.76.173] (port=55479 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nd1A2-0004Cn-Hk for qemu-devel@nongnu.org; Thu, 04 Feb 2010 07:50:18 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Nd1A1-00084m-6E for qemu-devel@nongnu.org; Thu, 04 Feb 2010 07:50:18 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50440) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Nd1A0-00084d-Pv for qemu-devel@nongnu.org; Thu, 04 Feb 2010 07:50:17 -0500 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o14CoE71032735 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 4 Feb 2010 07:50:14 -0500 Received: from redhat.com (vpn2-9-138.ams2.redhat.com [10.36.9.138]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id o14CoCHB012451; Thu, 4 Feb 2010 07:50:13 -0500 Date: Thu, 4 Feb 2010 14:47:03 +0200 From: "Michael S. Tsirkin" To: Anthony Liguori , qemu-devel@nongnu.org Message-ID: <20100204124703.GL22559@redhat.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.19 (2009-01-05) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Subject: [Qemu-devel] [PATCH 11/15] tap: add interface to get device fd 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 Will be used by vhost to attach/detach to backend. Signed-off-by: Michael S. Tsirkin --- net/tap.c | 7 +++++++ net/tap.h | 2 ++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/net/tap.c b/net/tap.c index d3492de..7e9ca79 100644 --- a/net/tap.c +++ b/net/tap.c @@ -269,6 +269,13 @@ static void tap_poll(VLANClientState *nc, bool enable) tap_write_poll(s, enable); } +int tap_get_fd(VLANClientState *nc) +{ + TAPState *s = DO_UPCAST(TAPState, nc, nc); + assert(nc->info->type == NET_CLIENT_TYPE_TAP); + return s->fd; +} + /* fd support */ static NetClientInfo net_tap_info = { diff --git a/net/tap.h b/net/tap.h index 538a562..a244b28 100644 --- a/net/tap.h +++ b/net/tap.h @@ -48,4 +48,6 @@ int tap_probe_vnet_hdr(int fd); int tap_probe_has_ufo(int fd); void tap_fd_set_offload(int fd, int csum, int tso4, int tso6, int ecn, int ufo); +int tap_get_fd(VLANClientState *vc); + #endif /* QEMU_NET_TAP_H */