mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-11-24 19:33:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

net: move tap_set_sndbuf() to tap-linux.c

Browse Source 
TUNSETSNDBUF is only available on linux

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:13 +01:00 committed by Anthony Liguori
parent c28b1c1007
commit 15ac913bfe
6 changed files with 42 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/tap-aix.c
View File

@ -30,3 +30,9 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required
fprintf(stderr, "no tap on AIX\n");
return -1;
}
int tap_set_sndbuf(int fd, QemuOpts *opts)
{
return 0;
}

5
net/tap-bsd.c
View File

@ -60,3 +60,8 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required
fcntl(fd, F_SETFL, O_NONBLOCK);
return fd;
}
int tap_set_sndbuf(int fd, QemuOpts *opts)
{
return 0;
}

23
net/tap-linux.c
View File

@ -76,3 +76,26 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required
fcntl(fd, F_SETFL, O_NONBLOCK);
return fd;
}
/* 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
* a good default, given a 1500 byte MTU.
*/
#define TAP_DEFAULT_SNDBUF 1024*1024
int tap_set_sndbuf(int fd, QemuOpts *opts)
{
int sndbuf;
sndbuf = qemu_opt_get_size(opts, "sndbuf", TAP_DEFAULT_SNDBUF);
if (!sndbuf) {
sndbuf = INT_MAX;
}
if (ioctl(fd, TUNSETSNDBUF, &sndbuf) == -1 && qemu_opt_get(opts, "sndbuf")) {
qemu_error("TUNSETSNDBUF ioctl failed: %s\n", strerror(errno));
return -1;
}
return 0;
}

5
net/tap-solaris.c
View File

@ -183,3 +183,8 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required
fcntl(fd, F_SETFL, O_NONBLOCK);
return fd;
}
int tap_set_sndbuf(int fd, QemuOpts *opts)
{
return 0;
}

25
net/tap.c
View File

@ -209,29 +209,6 @@ static void tap_send(void *opaque)
} while (size > 0);
}
/* 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
* a good default, given a 1500 byte MTU.
*/
#define TAP_DEFAULT_SNDBUF 1024*1024
static int tap_set_sndbuf(TAPState *s, QemuOpts *opts)
{
int sndbuf;
sndbuf = qemu_opt_get_size(opts, "sndbuf", TAP_DEFAULT_SNDBUF);
if (!sndbuf) {
sndbuf = INT_MAX;
}
if (ioctl(s->fd, TUNSETSNDBUF, &sndbuf) == -1 && qemu_opt_get(opts, "sndbuf")) {
qemu_error("TUNSETSNDBUF ioctl failed: %s\n", strerror(errno));
return -1;
}
return 0;
}
int tap_has_ufo(VLANClientState *vc)
{
TAPState *s = vc->opaque;
@ -465,7 +442,7 @@ int net_init_tap(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan
return -1;
}
if (tap_set_sndbuf(s, opts) < 0) {
if (tap_set_sndbuf(s->fd, opts) < 0) {
return -1;
}

2
net/tap.h
View File

@ -43,4 +43,6 @@ 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);
int tap_set_sndbuf(int fd, QemuOpts *opts);
#endif /* QEMU_NET_TAP_H */