[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/15] net: move tap_set_sndbuf() to tap-linux.c
From: |
Mark McLoughlin |
Subject: |
[Qemu-devel] [PATCH 12/15] net: move tap_set_sndbuf() to tap-linux.c |
Date: |
Thu, 22 Oct 2009 17:49:13 +0100 |
TUNSETSNDBUF is only available on linux
Signed-off-by: Mark McLoughlin <address@hidden>
---
net/tap-aix.c | 6 ++++++
net/tap-bsd.c | 5 +++++
net/tap-linux.c | 23 +++++++++++++++++++++++
net/tap-solaris.c | 5 +++++
net/tap.c | 25 +------------------------
net/tap.h | 2 ++
6 files changed, 42 insertions(+), 24 deletions(-)
diff --git a/net/tap-aix.c b/net/tap-aix.c
index 5ec3b2c..3f9ccdd 100644
--- a/net/tap-aix.c
+++ b/net/tap-aix.c
@@ -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;
+}
+
diff --git a/net/tap-bsd.c b/net/tap-bsd.c
index 6940434..e28615f 100644
--- a/net/tap-bsd.c
+++ b/net/tap-bsd.c
@@ -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;
+}
diff --git a/net/tap-linux.c b/net/tap-linux.c
index c6f751e..6c3b6e3 100644
--- a/net/tap-linux.c
+++ b/net/tap-linux.c
@@ -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;
+}
diff --git a/net/tap-solaris.c b/net/tap-solaris.c
index 0dd5b68..de5855a 100644
--- a/net/tap-solaris.c
+++ b/net/tap-solaris.c
@@ -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;
+}
diff --git a/net/tap.c b/net/tap.c
index 5392937..df2cfbe 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -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;
}
diff --git a/net/tap.h b/net/tap.h
index 5648ddd..0d67c24 100644
--- a/net/tap.h
+++ b/net/tap.h
@@ -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 */
--
1.6.2.5
- [Qemu-devel] [PATCH 13/15] net: move tap_probe_vnet_hdr() to tap-linux.c, (continued)
- [Qemu-devel] [PATCH 13/15] net: move tap_probe_vnet_hdr() to tap-linux.c, Mark McLoughlin, 2009/10/22
- [Qemu-devel] [PATCH 06/15] net: split all the tap code out into net/tap.c, Mark McLoughlin, 2009/10/22
- [Qemu-devel] [PATCH 01/15] net: move net-queue.[ch] under net/, Mark McLoughlin, 2009/10/22
- [Qemu-devel] [PATCH 02/15] net: move net-checksum.c under net/, Mark McLoughlin, 2009/10/22
- [Qemu-devel] [PATCH 07/15] net: split BSD tap_open() out into net/tap-bsd.c, Mark McLoughlin, 2009/10/22
- [Qemu-devel] [PATCH 04/15] net: move more stuff into net/tap-win32.c, add net/tap.h, Mark McLoughlin, 2009/10/22
- [Qemu-devel] [PATCH 14/15] net: move tap_set_offload() code into tap-linux.c, Mark McLoughlin, 2009/10/22
- [Qemu-devel] [PATCH 05/15] net: move tap-linux.h under net/, Mark McLoughlin, 2009/10/22
- [Qemu-devel] [PATCH 08/15] net: move solaris code to net/tap-solaris.c, Mark McLoughlin, 2009/10/22
- [Qemu-devel] [PATCH 12/15] net: move tap_set_sndbuf() to tap-linux.c,
Mark McLoughlin <=
- [Qemu-devel] [PATCH 10/15] build: add CONFIG_LINUX, Mark McLoughlin, 2009/10/22
- [Qemu-devel] [PATCH 09/15] net: move AIX code into net/tap-aix.c, Mark McLoughlin, 2009/10/22
- [Qemu-devel] [PATCH 11/15] net: move linux code into net/tap-linux.c, Mark McLoughlin, 2009/10/22
- [Qemu-devel] [PATCH 15/15] net: move UFO support detection to tap-linux.c, Mark McLoughlin, 2009/10/22
- Re: [Qemu-devel] [PATCH 00/15] Some networking code re-organization, Anthony Liguori, 2009/10/22
- Message not available