summaryrefslogtreecommitdiff
path: root/net.c
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2009-05-18 12:05:44 +0100
committerMark McLoughlin <markmc@redhat.com>2009-06-09 11:38:49 +0100
commit5b01e886d9eb4d5e94384a79634dcb43848e7bbf (patch)
tree33ebabea9cfe1feed3d1c9b0b6ac6dc6d38bcaa7 /net.c
parent5a6d88157420d7f10b46270edabbeed11ee4ebe5 (diff)
net: move the tap buffer into TAPState
KVM uses a 64k buffer for reading from tapfd (for GSO support) and allocates the buffer with TAPState rather than on the stack. Not allocating it on the stack probably makes sense for qemu anyway, so merge it in advance of GSO support. Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Diffstat (limited to 'net.c')
-rw-r--r--net.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net.c b/net.c
index da18f0f64..443f769a0 100644
--- a/net.c
+++ b/net.c
@@ -921,6 +921,7 @@ typedef struct TAPState {
int fd;
char down_script[1024];
char down_script_arg[128];
+ uint8_t buf[4096];
} TAPState;
static int launch_script(const char *setup_script, const char *ifname, int fd);
@@ -972,12 +973,11 @@ static ssize_t tap_read_packet(int tapfd, uint8_t *buf, int maxlen)
static void tap_send(void *opaque)
{
TAPState *s = opaque;
- uint8_t buf[4096];
int size;
- size = tap_read_packet(s->fd, buf, sizeof(buf));
+ size = tap_read_packet(s->fd, s->buf, sizeof(s->buf));
if (size > 0) {
- qemu_send_packet(s->vc, buf, size);
+ qemu_send_packet(s->vc, s->buf, size);
}
}