The following changes since commit b68a80139e37e806f004237e55311ebc42151434:
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160324' into staging (2016-03-24 16:24:02 +0000) are available in the git repository at: https://github.com/jasowang/qemu.git tags/net-pull-request for you to fetch changes up to e680f08328f6a05a43963c3e9db1b0cdc701ed9f: Revert "e1000: fix hang of win2k12 shutdown with flood ping" (2016-03-25 10:39:43 +0800) ---------------------------------------------------------------- - mirror/redirector which could mirror or redirct the traffic between netdev and chardev - fix e1000 interrupt strom and remove previous hack ---------------------------------------------------------------- Sameeh Jubran (2): e1000: Fixing interrupts pace. Revert "e1000: fix hang of win2k12 shutdown with flood ping" Zhang Chen (5): net/filter-mirror:Add filter-mirror tests/test-filter-mirror:add filter-mirror unit test net/filter-mirror: Change filter_mirror_send interface net/filter-mirror: implement filter-redirector tests/test-filter-redirector: Add unit test for filter-redirector hw/net/e1000.c | 13 +- net/Makefile.objs | 1 + net/filter-mirror.c | 426 +++++++++++++++++++++++++++++++++++++++++ qemu-options.hx | 14 ++ tests/.gitignore | 2 + tests/Makefile | 4 + tests/test-filter-mirror.c | 93 +++++++++ tests/test-filter-redirector.c | 221 +++++++++++++++++++++ vl.c | 4 +- 9 files changed, 772 insertions(+), 6 deletions(-) create mode 100644 net/filter-mirror.c create mode 100644 tests/test-filter-mirror.c create mode 100644 tests/test-filter-redirector.c
