The following changes since commit 6bb9ead762bf749af11ea225fc2a74db1b93c105:
Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160108-1' into staging (2016-01-08 12:50:19 +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 9c7ffe266485c87e8e76d59af22e96866c202e42: ether/slirp: Avoid redefinition of the same constants (2016-01-11 11:01:35 +0800) ---------------------------------------------------------------- ---------------------------------------------------------------- Alexis Dambricourt (1): l2tpv3: fix cookie decoding Dr. David Alan Gilbert (1): ether/slirp: Avoid redefinition of the same constants Li Zhijian (2): net/dump: fix nfds->filename leak net/filter: fix nf->netdev_id leak Miao Yan (9): net/vmxnet3: fix a build error when enabling debug output net/vmxnet3: use %zu for size_t in printf net/vmxnet3: fix debug macro pattern for vmxnet3 net/vmxnet3: remove redundant VMW_SHPRN(...) definition net/vmxnet3: return 1 on device activation failure net/vmxnet3: return correct value for VMXNET3_CMD_GET_DID_* command net/vmxnet3: return correct value for VMXNET3_CMD_GET_DEV_EXTRA_INFO net/vmxnet3: return 0 on unknown command net/vmxnet3: rename VMXNET3_DEVICE_VERSION to VMXNET3_UPT_REVISION P J P (1): net: vmxnet3: avoid memory leakage in activate_device Prasad J Pandit (2): net: rocker: fix an incorrect array bounds check net: ne2000: fix bounds check in ioport operations Shmulik Ladkani (7): vmxnet3: Change offsets of msi/msix pci capabilities vmxnet3: Change the offset of the MSIX PBA table vmxnet3: Introduce 'x-old-msi-offsets' back-compat property vmxnet3: coding: Introduce VMXNET3Class vmxnet3: The vmxnet3 device is a PCIE endpoint vmxnet3: Report the Device Serial Number capability vmxnet3: Introduce 'x-disable-pcie' back-compat property Thomas Huth (1): MAINTAINERS: Add an entry for the net/slirp.c file MAINTAINERS | 1 + hw/net/ne2000.c | 10 +-- hw/net/rocker/rocker.c | 8 +-- hw/net/rtl8139.c | 1 - hw/net/vmware_utils.h | 5 +- hw/net/vmxnet3.c | 175 ++++++++++++++++++++++++++++++++++++++++++------- hw/net/vmxnet_debug.h | 139 ++++++++++++++++++++++++--------------- include/hw/compat.h | 10 ++- include/net/eth.h | 4 +- net/dump.c | 8 +++ net/filter.c | 1 + net/l2tpv3.c | 2 +- slirp/slirp.h | 7 +- 13 files changed, 274 insertions(+), 97 deletions(-)
