From: Zhi Yong Wu <wu...@linux.vnet.ibm.com> All comments from other guys were addressed.
The following changes since commit a854972f8cdec0148087789d62777d8f7176933d: Update version to open the 1.2 development branch (Fri Jun 1 16:56:16 2012 +0800) are available in the git repository at: g...@github.com:wuzhy/qemu.git for-anthony Stefan Hajnoczi (12): net: Add a hub net client net: Use hubs for the vlan feature net: Look up 'vlan' net clients using hubs hub: Check that hubs are configured correctly net: Drop vlan argument to qemu_new_net_client() net: Remove vlan qdev property net: Remove vlan code from net.c net: Remove VLANState net: Rename non_vlan_clients to net_clients net: Rename VLANClientState to NetClientState net: Rename vc local variables to nc net: Rename qemu_del_vlan_client() to qemu_del_net_client() Zhi Yong Wu (4): net: Make "info network" output more readable info net: cleanup deliver/deliver_iov func pointers net: determine if packets can be sent before net queue deliver packets hub: add the support for hub own flow control Makefile.objs | 2 +- hw/cadence_gem.c | 8 +- hw/dp8393x.c | 6 +- hw/e1000.c | 10 +- hw/eepro100.c | 8 +- hw/etraxfs_eth.c | 8 +- hw/lan9118.c | 8 +- hw/lance.c | 2 +- hw/mcf_fec.c | 6 +- hw/milkymist-minimac2.c | 6 +- hw/mipsnet.c | 6 +- hw/musicpal.c | 6 +- hw/ne2000-isa.c | 2 +- hw/ne2000.c | 8 +- hw/ne2000.h | 4 +- hw/opencores_eth.c | 8 +- hw/pcnet-pci.c | 4 +- hw/pcnet.c | 6 +- hw/pcnet.h | 6 +- hw/qdev-properties.c | 78 +------ hw/qdev.c | 2 - hw/qdev.h | 8 +- hw/rtl8139.c | 10 +- hw/smc91c111.c | 6 +- hw/spapr_llan.c | 4 +- hw/stellaris_enet.c | 6 +- hw/usb/dev-network.c | 8 +- hw/vhost_net.c | 24 +- hw/vhost_net.h | 2 +- hw/virtio-net.c | 12 +- hw/xen_nic.c | 7 +- hw/xgmac.c | 6 +- hw/xilinx_axienet.c | 6 +- hw/xilinx_ethlite.c | 6 +- net.c | 605 ++++++++++++++--------------------------------- net.h | 86 ++++---- net/dump.c | 28 ++- net/dump.h | 2 +- net/hub.c | 310 ++++++++++++++++++++++++ net/hub.h | 28 +++ net/queue.c | 37 ++-- net/queue.h | 25 +-- net/slirp.c | 32 +-- net/slirp.h | 2 +- net/socket.c | 66 +++--- net/socket.h | 2 +- net/tap-win32.c | 27 +- net/tap.c | 45 ++-- net/tap.h | 21 +- net/vde.c | 17 +- net/vde.h | 3 +- qemu-common.h | 3 +- slirp/if.c | 5 - slirp/libslirp.h | 1 - 54 files changed, 818 insertions(+), 826 deletions(-) create mode 100644 net/hub.c create mode 100644 net/hub.h -- 1.7.6