OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

net: import linux tap ioctl definitions

Browse Source 
Making features dependent on the availability of newer versions if_tun.h
is going to get seriously clumsy, so let's just import the definitions
we need. It's only a small handful.

If and when we're comfortable depending on 2.6.30 headers, we can remove
this again.

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Mark McLoughlin 2009-10-22 17:43:33 +01:00 committed by Anthony Liguori
parent 1abb817258
commit 76682299a8
3 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net.c
View File

@ -46,7 +46,7 @@
#include <net/if_tap.h>
#endif
#ifdef __linux__
#include <linux/if_tun.h>
#include "tap-linux.h"
#endif
#include <arpa/inet.h>
#include <dirent.h>
@ -1385,7 +1385,6 @@ static void tap_send(void *opaque)
} while (size > 0);
}
#ifdef TUNSETSNDBUF
/* sndbuf should be set to a value lower than the tx queue
* capacity of any destination network interface.
* Ethernet NICs generally have txqueuelen=1000, so 1Mb is
@ -1408,12 +1407,6 @@ static int tap_set_sndbuf(TAPState *s, QemuOpts *opts)
}
return 0;
}
#else
static int tap_set_sndbuf(TAPState *s, QemuOpts *opts)
{
return 0;
}
#endif /* TUNSETSNDBUF */
static void tap_cleanup(VLANClientState *vc)
{
@ -2987,12 +2980,10 @@ static struct {
.name = "downscript",
.type = QEMU_OPT_STRING,
.help = "script to shut down the interface",
#ifdef TUNSETSNDBUF
}, {
.name = "sndbuf",
.type = QEMU_OPT_SIZE,
.help = "send buffer limit"
#endif
},
{ /* end of list */ }
},

8
qemu-options.hx
View File

@ -810,20 +810,14 @@ DEF("net", HAS_ARG, QEMU_OPTION_net,
"-net tap[,vlan=n][,name=str],ifname=name\n"
" connect the host TAP network interface to VLAN 'n'\n"
#else
"-net tap[,vlan=n][,name=str][,fd=h][,ifname=name][,script=file][,downscript=dfile]"
#ifdef TUNSETSNDBUF
"[,sndbuf=nbytes]"
#endif
"\n"
"-net tap[,vlan=n][,name=str][,fd=h][,ifname=name][,script=file][,downscript=dfile][,sndbuf=nbytes]\n"
" connect the host TAP network interface to VLAN 'n' and use the\n"
" network scripts 'file' (default=%s)\n"
" and 'dfile' (default=%s);\n"
" use '[down]script=no' to disable script execution;\n"
" use 'fd=h' to connect to an already opened TAP interface\n"
#ifdef TUNSETSNDBUF
" use 'sndbuf=nbytes' to limit the size of the send buffer; the\n"
" default of 'sndbuf=1048576' can be disabled using 'sndbuf=0'\n"
#endif
#endif
"-net socket[,vlan=n][,name=str][,fd=h][,listen=[host]:port][,connect=host:port]\n"
" connect the vlan 'n' to another VLAN using a socket connection\n"

29
tap-linux.h Normal file
View File

@ -0,0 +1,29 @@
/*
* Universal TUN/TAP device driver.
* Copyright (C) 1999-2000 Maxim Krasnyansky <max_mk@yahoo.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
#ifndef QEMU_TAP_H
#define QEMU_TAP_H
#include <linux/ioctl.h>
/* Ioctl defines */
#define TUNSETIFF _IOW('T', 202, int)
#define TUNSETSNDBUF _IOW('T', 212, int)
/* TUNSETIFF ifr flags */
#define IFF_TAP 0x0002
#define IFF_NO_PI 0x1000
#endif /* QEMU_TAP_H */