mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: move more stuff into net/tap-win32.c, add net/tap.h

Browse Source 
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:49:05 +01:00 committed by Anthony Liguori
parent 33ad161a04
commit a8ed73f73d
6 changed files with 100 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/virtio-net.c
View File

@ -14,6 +14,7 @@
#include "virtio.h"
#include "net.h"
#include "net/checksum.h"
#include "net/tap.h"
#include "qemu-timer.h"
#include "virtio-net.h"

75
net.c
View File

@ -103,6 +103,7 @@
#include "qemu-common.h"
#include "net.h"
#include "net/tap.h"
#include "monitor.h"
#include "sysemu.h"
#include "qemu-timer.h"
@ -1294,23 +1295,7 @@ void do_info_usernet(Monitor *mon)
#endif /* CONFIG_SLIRP */
#if defined(_WIN32)
int tap_has_ufo(VLANClientState *vc)
{
return 0;
}
int tap_has_vnet_hdr(VLANClientState *vc)
{
return 0;
}
void tap_using_vnet_hdr(VLANClientState *vc, int using_vnet_hdr)
{
}
void tap_set_offload(VLANClientState *vc, int csum, int tso4,
int tso6, int ecn, int ufo)
{
}
#else /* !defined(_WIN32) */
#if !defined(_WIN32) && !defined(_AIX)
/* Maximum GSO packet size (64k) plus plenty of room for
* the ethernet and virtio_net headers
@ -1920,7 +1905,7 @@ static int net_tap_init(QemuOpts *opts, int *vnet_hdr)
return fd;
}
#endif /* !_WIN32 */
#endif /* !defined(_WIN32) && !defined(_AIX) */
#if defined(CONFIG_VDE)
typedef struct VDEState {
@ -2817,36 +2802,8 @@ static int net_init_slirp(QemuOpts *opts,
}
#endif /* CONFIG_SLIRP */
#ifdef _WIN32
static int net_init_tap_win32(QemuOpts *opts,
Monitor *mon,
const char *name,
VLANState *vlan)
{
const char *ifname;
ifname = qemu_opt_get(opts, "ifname");
if (!ifname) {
qemu_error("tap: no interface name\n");
return -1;
}
if (tap_win32_init(vlan, "tap", name, ifname) == -1) {
return -1;
}
if (vlan) {
vlan->nb_host_devs++;
}
return 0;
}
#elif !defined(_AIX)
static int net_init_tap(QemuOpts *opts,
Monitor *mon,
const char *name,
VLANState *vlan)
#if !defined(_WIN32) && !defined(_AIX)
int net_init_tap(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan)
{
TAPState *s;
int fd, vnet_hdr;
@ -2915,7 +2872,7 @@ static int net_init_tap(QemuOpts *opts,
return 0;
}
#endif
#endif /* !defined(_WIN32) && !defined(_AIX) */
static int net_init_socket(QemuOpts *opts,
Monitor *mon,
@ -3173,10 +3130,10 @@ static struct {
{ /* end of list */ }
},
#endif
#ifdef _WIN32
#ifndef _AIX
}, {
.type = "tap",
.init = net_init_tap_win32,
.init = net_init_tap,
.desc = {
NET_COMMON_PARAMS_DESC,
{
@ -3184,22 +3141,11 @@ static struct {
.type = QEMU_OPT_STRING,
.help = "interface name",
},
{ /* end of list */ }
},
#elif !defined(_AIX)
}, {
.type = "tap",
.init = net_init_tap,
.desc = {
NET_COMMON_PARAMS_DESC,
#ifndef _WIN32
{
.name = "fd",
.type = QEMU_OPT_STRING,
.help = "file descriptor of an already opened tap",
}, {
.name = "ifname",
.type = QEMU_OPT_STRING,
.help = "interface name",
}, {
.name = "script",
.type = QEMU_OPT_STRING,
@ -3217,9 +3163,10 @@ static struct {
.type = QEMU_OPT_BOOL,
.help = "enable the IFF_VNET_HDR flag on the tap interface"
},
#endif /* _WIN32 */
{ /* end of list */ }
},
#endif
#endif /* _AIX */
}, {
.type = "socket",
.init = net_init_socket,

5
net.h
View File

@ -174,9 +174,4 @@ void net_host_device_remove(Monitor *mon, const QDict *qdict);
void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd);
int tap_has_ufo(VLANClientState *vc);
int tap_has_vnet_hdr(VLANClientState *vc);
void tap_using_vnet_hdr(VLANClientState *vc, int using_vnet_hdr);
void tap_set_offload(VLANClientState *vc, int csum, int tso4, int tso6, int ecn, int ufo);
#endif

48
net/tap-win32.c
View File

@ -25,6 +25,9 @@
* along with this program (see the file COPYING included with this
* distribution); if not, see <http://www.gnu.org/licenses/>.
*/
#include "net/tap.h"
#include "qemu-common.h"
#include "net.h"
#include "sysemu.h"
@ -664,8 +667,8 @@ static void tap_win32_send(void *opaque)
}
}
int tap_win32_init(VLANState *vlan, const char *model,
const char *name, const char *ifname)
static int tap_win32_init(VLANState *vlan, const char *model,
const char *name, const char *ifname)
{
TAPState *s;
@ -688,3 +691,44 @@ int tap_win32_init(VLANState *vlan, const char *model,
qemu_add_wait_object(s->handle->tap_semaphore, tap_win32_send, s);
return 0;
}
int net_init_tap(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan)
{
const char *ifname;
ifname = qemu_opt_get(opts, "ifname");
if (!ifname) {
qemu_error("tap: no interface name\n");
return -1;
}
if (tap_win32_init(vlan, "tap", name, ifname) == -1) {
return -1;
}
if (vlan) {
vlan->nb_host_devs++;
}
return 0;
}
int tap_has_ufo(VLANClientState *vc)
{
return 0;
}
int tap_has_vnet_hdr(VLANClientState *vc)
{
return 0;
}
void tap_using_vnet_hdr(VLANClientState *vc, int using_vnet_hdr)
{
}
void tap_set_offload(VLANClientState *vc, int csum, int tso4,
int tso6, int ecn, int ufo)
{
}

42
net/tap.h Normal file
View File

@ -0,0 +1,42 @@
/*
* QEMU System Emulator
*
* Copyright (c) 2003-2008 Fabrice Bellard
* Copyright (c) 2009 Red Hat, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#ifndef QEMU_NET_TAP_H
#define QEMU_NET_TAP_H
#include "qemu-common.h"
#include "qemu-option.h"
#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown"
int net_init_tap(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan);
int tap_has_ufo(VLANClientState *vc);
int tap_has_vnet_hdr(VLANClientState *vc);
void tap_using_vnet_hdr(VLANClientState *vc, int using_vnet_hdr);
void tap_set_offload(VLANClientState *vc, int csum, int tso4, int tso6, int ecn, int ufo);
#endif /* QEMU_NET_TAP_H */

4
sysemu.h
View File

@ -88,10 +88,6 @@ int qemu_add_wait_object(HANDLE handle, WaitObjectFunc *func, void *opaque);
void qemu_del_wait_object(HANDLE handle, WaitObjectFunc *func, void *opaque);
#endif
/* TAP win32 */
int tap_win32_init(VLANState *vlan, const char *model,
const char *name, const char *ifname);
/* SLIRP */
void do_info_slirp(Monitor *mon);