[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 16/16] hub: add the support for hub own flow cont
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH v2 16/16] hub: add the support for hub own flow control |
Date: |
Tue, 24 Jul 2012 16:35:19 +0100 |
From: Zhi Yong Wu <address@hidden>
Only when all other hub port's *peer* .can_receive() all return 1,
the source hub port .can_receive() return 1.
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Zhi Yong Wu <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
net/hub.c | 27 ++++++++++++++++++++++++---
1 file changed, 24 insertions(+), 3 deletions(-)
diff --git a/net/hub.c b/net/hub.c
index 522fe99..ac157e3 100644
--- a/net/hub.c
+++ b/net/hub.c
@@ -15,6 +15,7 @@
#include "monitor.h"
#include "net.h"
#include "hub.h"
+#include "iov.h"
/*
* A hub broadcasts incoming packets to all its ports except the source port.
@@ -59,16 +60,16 @@ static ssize_t net_hub_receive_iov(NetHub *hub, NetHubPort
*source_port,
const struct iovec *iov, int iovcnt)
{
NetHubPort *port;
- ssize_t ret = 0;
+ ssize_t len = iov_size(iov, iovcnt);
QLIST_FOREACH(port, &hub->ports, next) {
if (port == source_port) {
continue;
}
- ret = qemu_sendv_packet(&port->nc, iov, iovcnt);
+ qemu_sendv_packet(&port->nc, iov, iovcnt);
}
- return ret;
+ return len;
}
static NetHub *net_hub_new(int id)
@@ -85,6 +86,25 @@ static NetHub *net_hub_new(int id)
return hub;
}
+static int net_hub_port_can_receive(NetClientState *nc)
+{
+ NetHubPort *port;
+ NetHubPort *src_port = DO_UPCAST(NetHubPort, nc, nc);
+ NetHub *hub = src_port->hub;
+
+ QLIST_FOREACH(port, &hub->ports, next) {
+ if (port == src_port) {
+ continue;
+ }
+
+ if (!qemu_can_send_packet(&port->nc)) {
+ return 0;
+ }
+ }
+
+ return 1;
+}
+
static ssize_t net_hub_port_receive(NetClientState *nc,
const uint8_t *buf, size_t len)
{
@@ -111,6 +131,7 @@ static void net_hub_port_cleanup(NetClientState *nc)
static NetClientInfo net_hub_port_info = {
.type = NET_CLIENT_OPTIONS_KIND_HUBPORT,
.size = sizeof(NetHubPort),
+ .can_receive = net_hub_port_can_receive,
.receive = net_hub_port_receive,
.receive_iov = net_hub_port_receive_iov,
.cleanup = net_hub_port_cleanup,
--
1.7.10.4
- [Qemu-devel] [PATCH v2 00/16] net: Move legacy QEMU VLAN code into net/hub.c, Stefan Hajnoczi, 2012/07/24
- [Qemu-devel] [PATCH v2 02/16] net: Use hubs for the vlan feature, Stefan Hajnoczi, 2012/07/24
- [Qemu-devel] [PATCH v2 12/16] net: Rename qemu_del_vlan_client() to qemu_del_net_client(), Stefan Hajnoczi, 2012/07/24
- [Qemu-devel] [PATCH v2 13/16] net: Make "info network" output more readable info, Stefan Hajnoczi, 2012/07/24
- [Qemu-devel] [PATCH v2 05/16] net: Drop vlan argument to qemu_new_net_client(), Stefan Hajnoczi, 2012/07/24
- [Qemu-devel] [PATCH v2 01/16] net: Add a hub net client, Stefan Hajnoczi, 2012/07/24
- [Qemu-devel] [PATCH v2 03/16] net: Look up 'vlan' net clients using hubs, Stefan Hajnoczi, 2012/07/24
- [Qemu-devel] [PATCH v2 16/16] hub: add the support for hub own flow control,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH v2 06/16] net: Convert qdev_prop_vlan to peer with hub, Stefan Hajnoczi, 2012/07/24
- [Qemu-devel] [PATCH v2 07/16] net: Remove vlan code from net.c, Stefan Hajnoczi, 2012/07/24
- [Qemu-devel] [PATCH v2 14/16] net: cleanup deliver/deliver_iov func pointers, Stefan Hajnoczi, 2012/07/24
- [Qemu-devel] [PATCH v2 09/16] net: Rename non_vlan_clients to net_clients, Stefan Hajnoczi, 2012/07/24
- [Qemu-devel] [PATCH v2 11/16] net: Rename vc local variables to nc, Stefan Hajnoczi, 2012/07/24
- [Qemu-devel] [PATCH v2 10/16] net: Rename VLANClientState to NetClientState, Stefan Hajnoczi, 2012/07/24
- [Qemu-devel] [PATCH v2 15/16] net: determine if packets can be sent before net queue deliver packets, Stefan Hajnoczi, 2012/07/24
- [Qemu-devel] [PATCH v2 08/16] net: Remove VLANState, Stefan Hajnoczi, 2012/07/24
- [Qemu-devel] [PATCH v2 04/16] hub: Check that hubs are configured correctly, Stefan Hajnoczi, 2012/07/24
- Re: [Qemu-devel] [PATCH v2 00/16] net: Move legacy QEMU VLAN code into net/hub.c, Laszlo Ersek, 2012/07/24