The following changes since commit 3b71ec8516bb50e9a743645bf139571de0b39f61:
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2016-09-23 16:15:33 +0100) are available in the git repository at: https://github.com/jasowang/qemu.git tags/net-pull-request for you to fetch changes up to 172213e93226cf1fa0a230de5137020cd24ae715: imx_fec: fix error in qemu_send_packet argument (2016-09-26 16:28:14 +0800) ---------------------------------------------------------------- - allow to specify the rx queue size for virtio-net - colo packet comparing thread - filter-writer to rewrite tcp seq for comparing and secondary VM - align some e1000e behaviour to spec - allow to specify bridge for a tap ifup script ---------------------------------------------------------------- Alexey Kardashevskiy (1): tap: Allow specifying a bridge Dmitry Fleytman (7): e1000e: Flush all receive queues on receive enable e1000e: Flush receive queues on link up e1000e: Fix CTRL_EXT.EIAME behavior e1000e: Fix PBACLR implementation e1000e: Fix OTHER interrupts processing for MSI-X e1000e: Fix spurious RX TCP ACK interrupts e1000e: Fix EIAC register implementation Gonglei (1): e1000: fix buliding complaint Michael S. Tsirkin (1): virtio-net: allow increasing rx queue size Paolo Bonzini (2): mcf_fec: fix error in qemu_send_packet argument imx_fec: fix error in qemu_send_packet argument Peter Lieven (1): net: limit allocation in nc_sendv_compat Prasad J Pandit (1): net: mcf: limit buffer descriptor count Shmulik Ladkani (1): net: hmp_host_net_remove: Del the -net option of the removed host_net Zhang Chen (12): qemu-char: Add qemu_chr_add_handlers_full() for GMaincontext colo-compare: introduce colo compare initialization net/colo.c: add colo.c to define and handle packet Jhash: add linux kernel jhashtable in qemu colo-compare: track connection and enqueue packet colo-compare: introduce packet comparison thread colo-compare: add TCP,UDP,ICMP packet comparison filter-rewriter: introduce filter-rewriter initialization filter-rewriter: track connection and parse packet filter-rewriter: rewrite tcp packet to keep secondary connection MAINTAINERS: add maintainer for COLO-proxy docs: Add documentation for COLO-proxy MAINTAINERS | 9 + docs/colo-proxy.txt | 188 ++++++++++ hw/net/e1000e.c | 2 +- hw/net/e1000e_core.c | 32 +- hw/net/e1000e_core.h | 3 + hw/net/imx_fec.c | 2 +- hw/net/mcf_fec.c | 7 +- hw/net/trace-events | 2 +- hw/net/virtio-net.c | 26 +- include/hw/virtio/virtio-net.h | 1 + include/qemu/jhash.h | 59 ++++ include/sysemu/char.h | 11 +- net/Makefile.objs | 3 + net/colo-compare.c | 781 +++++++++++++++++++++++++++++++++++++++++ net/colo.c | 212 +++++++++++ net/colo.h | 88 +++++ net/filter-rewriter.c | 263 ++++++++++++++ net/net.c | 9 +- net/tap.c | 4 +- qapi-schema.json | 3 + qemu-char.c | 77 ++-- qemu-options.hx | 64 +++- trace-events | 16 + vl.c | 4 +- 24 files changed, 1813 insertions(+), 53 deletions(-) create mode 100644 docs/colo-proxy.txt create mode 100644 include/qemu/jhash.h create mode 100644 net/colo-compare.c create mode 100644 net/colo.c create mode 100644 net/colo.h create mode 100644 net/filter-rewriter.c
