On Tue, May 23, 2017 at 10:43:50AM +0800, Jason Wang wrote:
> The following changes since commit 56821559f0ba682fe6b367815572e6f974d329ab:
>
> Merge remote-tracking branch 'dgilbert/tags/pull-hmp-20170517' into staging (2017-05-18 13:36:15 +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 82342e91b60a4a078811df4e1a545e57abffa11d:
>
> e1000e: Fix ICR "Other" causes clear logic (2017-05-23 10:10:38 +0800)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
> Sameeh Jubran (1):
> e1000e: Fix ICR "Other" causes clear logic
>
> Thomas Huth (3):
> net/tap: Replace tap-haiku.c and tap-aix.c by a generic tap-stub.c
> net/dump: Issue a warning for the deprecated "-net dump"
> hmp / net: Mark host_net_add/remove as deprecated
>
> Yunjian Wang (1):
> virtio-net: fix wild pointer when remove virtio-net queues
>
> Zhang Chen (4):
> COLO-compare: Improve tcp compare trace event readability
> net/filter-mirror.c: Remove duplicate check code.
> net/filter-mirror.c: Rename filter_mirror_send() and fix codestyle
> net/filter-rewriter: Remove unused option in filter-rewriter
>
> hmp-commands.hx | 8 ++--
> hw/net/e1000e_core.c | 10 ++++-
> hw/net/virtio-net.c | 3 ++
> net/Makefile.objs | 15 ++++----
> net/colo-compare.c | 33 ++++++++++------
> net/dump.c | 3 ++
> net/filter-mirror.c | 35 ++++++++---------
> net/net.c | 13 +++++++
> net/tap-haiku.c | 87 -------------------------------------------
> net/{tap-aix.c => tap-stub.c} | 3 +-
> net/trace-events | 3 +-
> qemu-options.hx | 2 +-
> 12 files changed, 80 insertions(+), 135 deletions(-)
> delete mode 100644 net/tap-haiku.c
> rename net/{tap-aix.c => tap-stub.c} (97%)
>
>
Thanks, applied to my staging tree:
https://github.com/stefanha/qemu/commits/staging
Stefan