[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/16] netmap: Drop netmap_can_send
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 03/16] netmap: Drop netmap_can_send |
Date: |
Fri, 12 Jun 2015 13:57:28 +0100 |
From: Fam Zheng <address@hidden>
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 copied from s->fd to s->iov 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.
Also remove the qemu_can_send_packet() check in netmap_send. If it's
true, we are good; if it's false, the qemu_sendv_packet_async would
return 0 and read poll will be disabled until netmap_send_completed is
called.
Signed-off-by: Fam Zheng <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
net/netmap.c | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/net/netmap.c b/net/netmap.c
index 69300eb..19d0542 100644
--- a/net/netmap.c
+++ b/net/netmap.c
@@ -132,23 +132,13 @@ error:
return -1;
}
-/* Tell the event-loop if the netmap backend can send packets
- to the frontend. */
-static int netmap_can_send(void *opaque)
-{
- NetmapState *s = opaque;
-
- return qemu_can_send_packet(&s->nc);
-}
-
static void netmap_send(void *opaque);
static void netmap_writable(void *opaque);
/* Set the event-loop handlers for the netmap backend. */
static void netmap_update_fd_handler(NetmapState *s)
{
- qemu_set_fd_handler2(s->me.fd,
- s->read_poll ? netmap_can_send : NULL,
+ qemu_set_fd_handler2(s->me.fd, NULL,
s->read_poll ? netmap_send : NULL,
s->write_poll ? netmap_writable : NULL,
s);
@@ -317,7 +307,7 @@ static void netmap_send(void *opaque)
/* Keep sending while there are available packets into the netmap
RX ring and the forwarding path towards the peer is open. */
- while (!nm_ring_empty(ring) && qemu_can_send_packet(&s->nc)) {
+ while (!nm_ring_empty(ring)) {
uint32_t i;
uint32_t idx;
bool morefrag;
--
2.4.2
- [Qemu-devel] [PULL 00/16] Net patches, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 02/16] l2tpv3: Drop l2tpv3_can_send, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 01/16] stubs: Add qemu_set_fd_handler, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 03/16] netmap: Drop netmap_can_send,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 04/16] net/socket: Drop net_socket_can_send, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 05/16] tap: Drop tap_can_send, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 06/16] Change qemu_set_fd_handler2(..., NULL, ...) to qemu_set_fd_handler, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 07/16] main-loop: Drop qemu_set_fd_handler2, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 08/16] alsaaudio: Remove unused error handling of qemu_set_fd_handler, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 09/16] oss: Remove unused error handling of qemu_set_fd_handler, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 10/16] xen_backend: Remove unused error handling of qemu_set_fd_handler, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 11/16] event-notifier: Always return 0 for posix implementation, Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 12/16] iohandler: Change return type of qemu_set_fd_handler to "void", Stefan Hajnoczi, 2015/06/12
- [Qemu-devel] [PULL 13/16] rocker: Add support for phys name, Stefan Hajnoczi, 2015/06/12