On Wed, Jun 20, 2012 at 10:42 AM, <zwu.ker...@gmail.com> wrote: > From: Zhi Yong Wu <wu...@linux.vnet.ibm.com> > > All comments have been addressed and stefan has completed one more reviewing. > > For this patchset, my git repo: > > g...@github.com:wuzhy/qemu.git for-anthony > > Changelog from v5: > 1.) cleanup VLANState in other targets files [anthony] > > v5: > 1.) roll back qdev_prop_vlan [stefanha] > > v4: > 1.) refactor hub own flow control [paolo] > 2.) refactor the output for monitor command "info network" [jan kiszka] > > v3: > 1.) add the support for hub own flow control [paolo] > 2.) make the monitor output more reasonable hub info [jan kiszka] > > v2: > 1.) cleanup some obsolete vlan info > 2.) cleanup deliver/deliver_iov func pointers [paolo] > 3.) support more flexible flow control [paolo] > > 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 (5): > 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 > net: roll back qdev_prop_vlan > > hw/cadence_gem.c | 8 +- > hw/dp8393x.c | 7 +- > hw/e1000.c | 10 +- > hw/eepro100.c | 8 +- > hw/etraxfs_eth.c | 8 +- > hw/exynos4_boards.c | 2 +- > hw/highbank.c | 2 +- > hw/integratorcp.c | 2 +- > hw/lan9118.c | 8 +- > hw/lance.c | 2 +- > hw/mcf5208.c | 2 +- > hw/mcf_fec.c | 7 +- > hw/milkymist-minimac2.c | 6 +- > hw/mips_mipssim.c | 2 +- > hw/mips_r4k.c | 2 +- > 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 | 53 +++-- > hw/qdev.c | 2 - > hw/qdev.h | 7 +- > 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/vexpress.c | 2 +- > 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 +- > hw/xtensa_lx60.c | 2 +- > net.c | 593 > ++++++++++++++--------------------------------- > net.h | 87 ++++---- > net/Makefile.objs | 2 +- > net/dump.c | 27 ++- > net/dump.h | 2 +- > net/hub.c | 335 ++++++++++++++++++++++++++ > net/hub.h | 29 +++ > 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 | 26 +- > net/tap.c | 44 ++-- > net/tap.h | 20 +- > net/vde.c | 16 +- > net/vde.h | 2 +- > qemu-common.h | 3 +- > slirp/if.c | 5 - > slirp/libslirp.h | 1 - > 62 files changed, 868 insertions(+), 777 deletions(-) > create mode 100644 net/hub.c > create mode 100644 net/hub.h
It successfully builds all targets now. Other than that the code hasn't changed since the time I last reviewed. Stefan