[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 16/19] net: determine if packets can be sent before
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 16/19] net: determine if packets can be sent before net queue deliver packets |
Date: |
Wed, 1 Aug 2012 13:54:48 +0100 |
From: Zhi Yong Wu <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Zhi Yong Wu <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
---
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
- [Qemu-devel] [PULL 00/19] Net patches for QEMU 1.2, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 03/19] net: Use hubs for the vlan feature, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 06/19] net: Drop vlan argument to qemu_new_net_client(), Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 17/19] hub: add the support for hub own flow control, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 05/19] hub: Check that hubs are configured correctly, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 07/19] net: Convert qdev_prop_vlan to peer with hub, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 10/19] net: Rename non_vlan_clients to net_clients, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 01/19] net: Add interface to bridge when SIOCBRADDIF isn't available, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 14/19] net: Make "info network" output more readable info, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 16/19] net: determine if packets can be sent before net queue deliver packets,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH 19/19] net: add the support for -netdev socket, listen, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 18/19] net: fix the coding style, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 08/19] net: Remove vlan code from net.c, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 12/19] net: Rename vc local variables to nc, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 13/19] net: Rename qemu_del_vlan_client() to qemu_del_net_client(), Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 11/19] net: Rename VLANClientState to NetClientState, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 09/19] net: Remove VLANState, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 04/19] net: Look up 'vlan' net clients using hubs, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 02/19] net: Add a hub net client, Stefan Hajnoczi, 2012/08/01
- [Qemu-devel] [PATCH 15/19] net: cleanup deliver/deliver_iov func pointers, Stefan Hajnoczi, 2012/08/01