From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60555) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwYSI-0007Bk-2c for qemu-devel@nongnu.org; Wed, 01 Aug 2012 08:55:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SwYSF-0007ny-LW for qemu-devel@nongnu.org; Wed, 01 Aug 2012 08:55:14 -0400 Received: from e06smtp11.uk.ibm.com ([195.75.94.107]:56270) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwYSF-0007nl-DP for qemu-devel@nongnu.org; Wed, 01 Aug 2012 08:55:11 -0400 Received: from /spool/local by e06smtp11.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 1 Aug 2012 13:55:10 +0100 Received: from d06av08.portsmouth.uk.ibm.com (d06av08.portsmouth.uk.ibm.com [9.149.37.249]) by d06nrmr1407.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q71Ct7kY2629730 for ; Wed, 1 Aug 2012 13:55:08 +0100 Received: from d06av08.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av08.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q71Ct7gb008946 for ; Wed, 1 Aug 2012 06:55:07 -0600 From: Stefan Hajnoczi Date: Wed, 1 Aug 2012 13:54:48 +0100 Message-Id: <1343825691-343-17-git-send-email-stefanha@linux.vnet.ibm.com> In-Reply-To: <1343825691-343-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1343825691-343-1-git-send-email-stefanha@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 16/19] net: determine if packets can be sent before net queue deliver packets List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Zhi Yong Wu , qemu-devel@nongnu.org, Stefan Hajnoczi From: Zhi Yong Wu Reviewed-by: Paolo Bonzini Signed-off-by: Zhi Yong Wu Signed-off-by: Stefan Hajnoczi Reviewed-by: Laszlo Ersek --- net/queue.c | 9 +++++---- net/slirp.c | 7 ------- slirp/if.c | 5 ----- slirp/libslirp.h | 1 - 4 files changed, 5 insertions(+), 17 deletions(-) diff --git a/net/queue.c b/net/queue.c index 0afd783..e8030aa 100644 --- a/net/queue.c +++ b/net/queue.c @@ -176,8 +176,8 @@ ssize_t qemu_net_queue_send(NetQueue *queue, { ssize_t ret; - if (queue->delivering) { - return qemu_net_queue_append(queue, sender, flags, data, size, NULL); + if (queue->delivering || !qemu_can_send_packet(sender)) { + return qemu_net_queue_append(queue, sender, flags, data, size, sent_cb); } ret = qemu_net_queue_deliver(queue, sender, flags, data, size); @@ -200,8 +200,9 @@ ssize_t qemu_net_queue_send_iov(NetQueue *queue, { ssize_t ret; - if (queue->delivering) { - return qemu_net_queue_append_iov(queue, sender, flags, iov, iovcnt, NULL); + if (queue->delivering || !qemu_can_send_packet(sender)) { + return qemu_net_queue_append_iov(queue, sender, flags, + iov, iovcnt, sent_cb); } ret = qemu_net_queue_deliver_iov(queue, sender, flags, iov, iovcnt); diff --git a/net/slirp.c b/net/slirp.c index 9d5ca79..08adb97 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -97,13 +97,6 @@ static void slirp_smb_cleanup(SlirpState *s); static inline void slirp_smb_cleanup(SlirpState *s) { } #endif -int slirp_can_output(void *opaque) -{ - SlirpState *s = opaque; - - return qemu_can_send_packet(&s->nc); -} - void slirp_output(void *opaque, const uint8_t *pkt, int pkt_len) { SlirpState *s = opaque; diff --git a/slirp/if.c b/slirp/if.c index 096cf6f..533295d 100644 --- a/slirp/if.c +++ b/slirp/if.c @@ -177,11 +177,6 @@ void if_start(Slirp *slirp) } while (ifm_next) { - /* check if we can really output */ - if (!slirp_can_output(slirp->opaque)) { - break; - } - ifm = ifm_next; from_batchq = next_from_batchq; diff --git a/slirp/libslirp.h b/slirp/libslirp.h index 77527ad..9b471b5 100644 --- a/slirp/libslirp.h +++ b/slirp/libslirp.h @@ -25,7 +25,6 @@ void slirp_select_poll(fd_set *readfds, fd_set *writefds, fd_set *xfds, void slirp_input(Slirp *slirp, const uint8_t *pkt, int pkt_len); /* you must provide the following functions: */ -int slirp_can_output(void *opaque); void slirp_output(void *opaque, const uint8_t *pkt, int pkt_len); int slirp_add_hostfwd(Slirp *slirp, int is_udp, -- 1.7.10.4