From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.34)
	id 1BNo86-0007rg-4j
	for qemu-devel@nongnu.org; Wed, 12 May 2004 03:26:14 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.34)
	id 1BNo7Z-0007fJ-8P
	for qemu-devel@nongnu.org; Wed, 12 May 2004 03:26:12 -0400
Received: from [130.136.10.114] (helo=pob.cs.unibo.it)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1BNnxa-0005NA-FK
	for qemu-devel@nongnu.org; Wed, 12 May 2004 03:15:22 -0400
Date: Wed, 12 May 2004 09:15:07 +0200
Message-ID: <20040512071507.GA7093@cs.unibo.it>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
From: renzo@cs.unibo.it (Renzo Davoli)
Subject: [Qemu-devel] [patch] -tun-fd should force NET_IF_TUN
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://mail.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://mail.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

when the -tun-fd option is set, it is clear that the user want a TUN
network (without any configuration script as the net is already open).

It is useless to test whether there is the script or not and to decide for 
USER_NET (slirp) when the script has not found.

I propose the following single line patch.

ciao
	renzo

P.S. otherwise vde users has to create a fake /etc/qemu-ifup file.

------
--- vl.c.orig   2004-05-12 08:57:21.000000000 +0200
+++ vl.c        2004-05-12 08:51:17.000000000 +0200
@@ -1968,6 +1968,7 @@
                 {
                     const char *p;
                     int fd;
+                   net_if_type = NET_IF_TUN;
                     if (nb_tun_fds < MAX_NICS) {
                         fd = strtol(optarg, (char **)&p, 0);
                         if (*p != '\0') {