From patchwork Fri Oct 23 15:53:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ed Maste X-Patchwork-Id: 535063 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 38984141310 for ; Sat, 24 Oct 2015 02:54:22 +1100 (AEDT) Received: from localhost ([::1]:39505 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zpefc-0007ps-Bq for incoming@patchwork.ozlabs.org; Fri, 23 Oct 2015 11:54:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35215) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZpefK-0007PM-32 for qemu-devel@nongnu.org; Fri, 23 Oct 2015 11:54:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZpefF-0000kT-NX for qemu-devel@nongnu.org; Fri, 23 Oct 2015 11:54:01 -0400 Received: from [98.143.106.101] (port=43173 helo=freebsd.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZpefF-0000kK-IC for qemu-devel@nongnu.org; Fri, 23 Oct 2015 11:53:57 -0400 Received: from emaste (uid 1001) (envelope-from emaste@freebsd.org) id 9ee9a by freebsd.org (DragonFly Mail Agent 1); Fri, 23 Oct 2015 11:53:56 -0400 From: Ed Maste To: qemu-devel@nongnu.org Date: Fri, 23 Oct 2015 11:53:55 -0400 Message-Id: <1445615635-90549-1-git-send-email-emaste@freebsd.org> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1445611173-57034-1-git-send-email-emaste@freebsd.org> References: <1445611173-57034-1-git-send-email-emaste@freebsd.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x X-Received-From: 98.143.106.101 Cc: qemu-trivial@nongnu.org, Ed Maste Subject: [Qemu-devel] [PATCH] tap-bsd: use user-specified tap device if it already exists 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 Acked-by: Roger Pau Monné Signed-off-by: Ed Maste --- As an aside this was reviewed on FreeBSD's Phabricator here: https://reviews.freebsd.org/D3969 Resend with Signed-off-by. net/tap-bsd.c | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/net/tap-bsd.c b/net/tap-bsd.c index 7028d9b..0103a97 100644 --- a/net/tap-bsd.c +++ b/net/tap-bsd.c @@ -109,8 +109,7 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, #define PATH_NET_TAP "/dev/tap" -int tap_open(char *ifname, int ifname_size, int *vnet_hdr, - int vnet_hdr_required, int mq_required, Error **errp) +static int tap_open_clone(char *ifname, int ifname_size, Error **errp) { int fd, s, ret; struct ifreq ifr; @@ -126,7 +125,8 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, ret = ioctl(fd, TAPGIFNAME, (void *)&ifr); if (ret < 0) { error_setg_errno(errp, errno, "could not get tap interface name"); - goto error; + close(fd); + return -1; } if (ifname[0] != '\0') { @@ -135,19 +135,47 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, if (s < 0) { error_setg_errno(errp, errno, "could not open socket to set interface name"); - goto error; + close(fd); + return -1; } ifr.ifr_data = ifname; ret = ioctl(s, SIOCSIFNAME, (void *)&ifr); close(s); if (ret < 0) { error_setg(errp, "could not set tap interface name"); - goto error; + close(fd); + return -1; } } else { pstrcpy(ifname, ifname_size, ifr.ifr_name); } + return fd; +} + +int tap_open(char *ifname, int ifname_size, int *vnet_hdr, + int vnet_hdr_required, int mq_required, Error **errp) +{ + int fd = -1; + + /* If the specified tap device already exists just use it. */ + if (ifname[0] != '\0') { + char dname[100]; + snprintf(dname, sizeof dname, "/dev/%s", ifname); + TFR(fd = open(dname, O_RDWR)); + if (fd < 0 && errno != ENOENT) { + error_setg_errno(errp, errno, "could not open %s", dname); + return -1; + } + } + + if (fd < 0) { + /* Tap device not specified or does not exist. */ + if ((fd = tap_open_clone(ifname, ifname_size, errp)) < 0) { + return -1; + } + } + if (*vnet_hdr) { /* BSD doesn't have IFF_VNET_HDR */ *vnet_hdr = 0;