From patchwork Fri Feb 1 07:39:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 217383 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1D0022C0079 for ; Fri, 1 Feb 2013 19:52:07 +1100 (EST) Received: from localhost ([::1]:45920 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U1BO7-0007HL-Eq for incoming@patchwork.ozlabs.org; Fri, 01 Feb 2013 02:50:19 -0500 Received: from eggs.gnu.org ([208.118.235.92]:54825) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U1BNk-0006Qn-TF for qemu-devel@nongnu.org; Fri, 01 Feb 2013 02:49:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U1BNj-0005k3-Gm for qemu-devel@nongnu.org; Fri, 01 Feb 2013 02:49:56 -0500 Received: from mx1.redhat.com ([209.132.183.28]:19963) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U1BNj-0005jy-9Y for qemu-devel@nongnu.org; Fri, 01 Feb 2013 02:49:55 -0500 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.14.4/8.14.4) with ESMTP id r117njGJ011747 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 1 Feb 2013 02:49:45 -0500 Received: from amd-6168-8-1.englab.nay.redhat.com (amd-6168-8-1.englab.nay.redhat.com [10.66.104.52]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r117ma5Y001786; Fri, 1 Feb 2013 02:49:41 -0500 From: Jason Wang To: aliguori@us.ibm.com, mst@redhat.com, qemu-devel@nongnu.org, blauwirbel@gmail.com, shajnocz@redhat.com Date: Fri, 1 Feb 2013 15:39:48 +0800 Message-Id: <1359704396-55327-15-git-send-email-jasowang@redhat.com> In-Reply-To: <1359704396-55327-1-git-send-email-jasowang@redhat.com> References: <1359704396-55327-1-git-send-email-jasowang@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: krkumar2@in.ibm.com, kvm@vger.kernel.org, mprivozn@redhat.com, Jason Wang , rusty@rustcorp.com.au, jwhan@filewood.snu.ac.kr, gaowanlong@cn.fujitsu.com Subject: [Qemu-devel] [PATCH V4 RESEND 14/22] tap: introduce a helper to get the name of an interface X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This patch introduces a helper tap_get_ifname() to get the device name of tap device. This is needed when ifname is unspecified in the command line and qemu were asked to create tap device by itself. In this situation, the name were allocated by kernel, so if multiqueue is asked, we need to fetch its name after creating the first queue. Only linux has this support since it's the only platform that supports multiqueue tap. Signed-off-by: Jason Wang Signed-off-by: Michael S. Tsirkin --- include/net/tap.h | 1 + net/tap-aix.c | 5 +++++ net/tap-bsd.c | 5 +++++ net/tap-haiku.c | 5 +++++ net/tap-linux.c | 14 ++++++++++++++ net/tap-solaris.c | 5 +++++ net/tap_int.h | 1 + 7 files changed, 36 insertions(+), 0 deletions(-) diff --git a/include/net/tap.h b/include/net/tap.h index a994f20..c3eb85a 100644 --- a/include/net/tap.h +++ b/include/net/tap.h @@ -37,6 +37,7 @@ void tap_set_offload(NetClientState *nc, int csum, int tso4, int tso6, int ecn, void tap_set_vnet_hdr_len(NetClientState *nc, int len); int tap_enable(NetClientState *nc); int tap_disable(NetClientState *nc); +int tap_get_ifname(NetClientState *nc, char *ifname); int tap_get_fd(NetClientState *nc); diff --git a/net/tap-aix.c b/net/tap-aix.c index 66e0574..0e1eac3 100644 --- a/net/tap-aix.c +++ b/net/tap-aix.c @@ -69,3 +69,8 @@ int tap_fd_disable(int fd) { return -1; } + +int tap_fd_get_ifname(int fd, char *ifname) +{ + return -1; +} diff --git a/net/tap-bsd.c b/net/tap-bsd.c index 5ed2d16..4f22109 100644 --- a/net/tap-bsd.c +++ b/net/tap-bsd.c @@ -155,3 +155,8 @@ int tap_fd_disable(int fd) { return -1; } + +int tap_fd_get_ifname(int fd, char *ifname) +{ + return -1; +} diff --git a/net/tap-haiku.c b/net/tap-haiku.c index 0f1b1fe..b3b5fbb 100644 --- a/net/tap-haiku.c +++ b/net/tap-haiku.c @@ -69,3 +69,8 @@ int tap_fd_disable(int fd) { return -1; } + +int tap_fd_get_ifname(int fd, char *ifname) +{ + return -1; +} diff --git a/net/tap-linux.c b/net/tap-linux.c index 42376cc..3b21662 100644 --- a/net/tap-linux.c +++ b/net/tap-linux.c @@ -260,3 +260,17 @@ int tap_fd_disable(int fd) return ret; } + +int tap_fd_get_ifname(int fd, char *ifname) +{ + struct ifreq ifr; + + if (ioctl(fd, TUNGETIFF, &ifr) != 0) { + error_report("TUNGETIFF ioctl() failed: %s", + strerror(errno)); + return -1; + } + + pstrcpy(ifname, sizeof(ifr.ifr_name), ifr.ifr_name); + return 0; +} diff --git a/net/tap-solaris.c b/net/tap-solaris.c index cc08e9e..214d95e 100644 --- a/net/tap-solaris.c +++ b/net/tap-solaris.c @@ -235,3 +235,8 @@ int tap_fd_disable(int fd) { return -1; } + +int tap_fd_get_ifname(int fd, char *ifname) +{ + return -1; +} diff --git a/net/tap_int.h b/net/tap_int.h index ca1c21b..125f83d 100644 --- a/net/tap_int.h +++ b/net/tap_int.h @@ -44,5 +44,6 @@ void tap_fd_set_offload(int fd, int csum, int tso4, int tso6, int ecn, int ufo); void tap_fd_set_vnet_hdr_len(int fd, int len); int tap_fd_enable(int fd); int tap_fd_disable(int fd); +int tap_fd_get_ifname(int fd, char *ifname); #endif /* QEMU_TAP_H */