On Mon, Apr 30, 2018 at 08:02:22PM +0200, Thomas Huth wrote: > The 'vlan' term caused a lot of confusion and misconfigurations in the > past. The parameter has been marked as deprecated since QEMU v2.9.0, so > it's now time to finally remove the parameter and use the better word "hub" > in the remaining spots that actually mean the QEMU emulated hub feature. > > v4: > - Some rewordings in qemu-doc.texi and qemu-options.hx according to > Stefan's and Paolo's suggestions > > v3: > - Some rewordings in qemu-doc and net.json according to Paolo's suggestions > > v2: > - Added first patch to actually remove the deprecated 'vlan' parameter > (instead of only updating the wording in the sources and docs) > > Thomas Huth (3): > 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 | 12 ++---- > net/slirp.c | 8 ++-- > net/tap.c | 4 +- > qapi/net.json | 15 ++++---- > qemu-doc.texi | 51 ++++++++++++------------- > qemu-options.hx | 29 ++++++--------- > 11 files changed, 54 insertions(+), 159 deletions(-) > > -- > 1.8.3.1 > Reviewed-by: Stefan Hajnoczi