The following changes since commit c74e62ee3e2dc2955e07d004c71badecb68a84eb:
Merge remote-tracking branch 'remotes/rth/tags/cota-target-pull-request' into staging (2018-05-11 15:41:29 +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 0e0266c2e475b82b39a757c875fa03e64272fbe7: net: Get rid of 'vlan' terminology and use 'hub' instead in the doc files (2018-05-14 15:47:14 +0800) ---------------------------------------------------------------- ---------------------------------------------------------------- Thomas Huth (4): net: Fix memory leak in net_param_nic() net: Remove the deprecated "vlan" parameter net: Get rid of 'vlan' terminology and use 'hub' instead in the source files net: Get rid of 'vlan' terminology and use 'hub' instead in the doc files docs/qdev-device-use.txt | 3 -- hw/core/qdev-properties-system.c | 80 ---------------------------------------- include/hw/qdev-properties.h | 3 -- include/net/net.h | 1 - net/hub.c | 7 ++-- net/net.c | 18 ++++----- net/slirp.c | 8 ++-- net/tap.c | 4 +- qapi/net.json | 15 ++++---- qemu-doc.texi | 51 ++++++++++++------------- qemu-options.hx | 29 ++++++--------- 11 files changed, 58 insertions(+), 161 deletions(-)
