mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 18:05:37 +00:00
tap: Drop tap_can_send
This callback is called by main loop before polling s->fd, if it returns false, the fd will not be polled in this iteration. This is redundant with checks inside read callback. After this patch, the data will be sent to peer when it arrives. If the device can't receive, it will be queued to incoming_queue, and when the device status changes, this queue will be flushed. Signed-off-by: Fam Zheng <famz@redhat.com> Message-id: 1433400324-7358-7-git-send-email-famz@redhat.com Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
parent
6e99c631f1
commit
a90a7425cf
13
net/tap.c
13
net/tap.c
|
@ -62,14 +62,12 @@ typedef struct TAPState {
|
|||
static void launch_script(const char *setup_script, const char *ifname,
|
||||
int fd, Error **errp);
|
||||
|
||||
static int tap_can_send(void *opaque);
|
||||
static void tap_send(void *opaque);
|
||||
static void tap_writable(void *opaque);
|
||||
|
||||
static void tap_update_fd_handler(TAPState *s)
|
||||
{
|
||||
qemu_set_fd_handler2(s->fd,
|
||||
s->read_poll && s->enabled ? tap_can_send : NULL,
|
||||
qemu_set_fd_handler2(s->fd, NULL,
|
||||
s->read_poll && s->enabled ? tap_send : NULL,
|
||||
s->write_poll && s->enabled ? tap_writable : NULL,
|
||||
s);
|
||||
|
@ -166,13 +164,6 @@ static ssize_t tap_receive(NetClientState *nc, const uint8_t *buf, size_t size)
|
|||
return tap_write_packet(s, iov, 1);
|
||||
}
|
||||
|
||||
static int tap_can_send(void *opaque)
|
||||
{
|
||||
TAPState *s = opaque;
|
||||
|
||||
return qemu_can_send_packet(&s->nc);
|
||||
}
|
||||
|
||||
#ifndef __sun__
|
||||
ssize_t tap_read_packet(int tapfd, uint8_t *buf, int maxlen)
|
||||
{
|
||||
|
@ -192,7 +183,7 @@ static void tap_send(void *opaque)
|
|||
int size;
|
||||
int packets = 0;
|
||||
|
||||
while (qemu_can_send_packet(&s->nc)) {
|
||||
while (true) {
|
||||
uint8_t *buf = s->buf;
|
||||
|
||||
size = tap_read_packet(s->fd, s->buf, sizeof(s->buf));
|
||||
|
|
Loading…
Reference in a new issue