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)

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(-)

From: Thomas Huth <thuth@redhat.com>

It's been marked as deprecated since QEMU v2.9.0, so that should have

been enough time for everybody to either just drop unnecessary "vlan=0"

parameters, to switch to the modern -device + -netdev syntax for connecting

guest NICs with host network backends, or to switch to the "hubport" netdev

in case hubs are really wanted instead.

Buglink: https://bugs.launchpad.net/qemu/+bug/658904

Signed-off-by: Thomas Huth <thuth@redhat.com>

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

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/net.c | 12 ++----

qapi/net.json | 15 ++++----

qemu-doc.texi | 9 -----

qemu-options.hx | 29 ++++++---------

8 files changed, 22 insertions(+), 130 deletions(-)

@@ -XXX,XX +XXX,XX @@ typedef struct NICConf {

#define DEFINE_NIC_PROPERTIES(_state, _conf) \

DEFINE_PROP_MACADDR("mac", _state, _conf.macaddr), \

- DEFINE_PROP_VLAN("vlan", _state, _conf.peers), \

DEFINE_PROP_NETDEV("netdev", _state, _conf.peers)

@@ -XXX,XX +XXX,XX @@ static int net_client_init1(const void *object, bool is_netdev, Error **errp)

const Netdev *netdev;

const char *name;

NetClientState *peer = NULL;

- static bool vlan_warned;

if (is_netdev) {

netdev = object;

@@ -XXX,XX +XXX,XX @@ static int net_client_init1(const void *object, bool is_netdev, Error **errp)

return -1;

- /* Do not add to a vlan if it's a nic with a netdev= parameter. */

+ /* Do not add to a hub if it's a nic with a netdev= parameter. */

if (netdev->type != NET_CLIENT_DRIVER_NIC ||

!opts->u.nic.has_netdev) {

- peer = net_hub_add_port(net->has_vlan ? net->vlan : 0, NULL, NULL);

- }

-

- if (net->has_vlan && !vlan_warned) {

- error_report("'vlan' is deprecated. Please use 'netdev' instead.");

- vlan_warned = true;

+ peer = net_hub_add_port(0, NULL, NULL);

}

@@ -XXX,XX +XXX,XX @@ void qmp_set_link(const char *name, bool up, Error **errp)

* If the peer is a HUBPORT or a backend, we do not change the

* link status.

*

- * This behavior is compatible with qemu vlans where there could be

+ * This behavior is compatible with qemu hubs where there could be

* multiple clients that can still communicate with each other in

* disconnected mode. For now maintain this compatibility.

*/

diff --git a/qapi/net.json b/qapi/net.json

index XXXXXXX..XXXXXXX 100644

--- a/qapi/net.json

+++ b/qapi/net.json

@@ -XXX,XX +XXX,XX @@

##

# @NetdevTapOptions:

#

-# Connect the host TAP network interface name to the VLAN.

+# Used to configure a host TAP network interface backend.

#

# @ifname: interface name

#

@@ -XXX,XX +XXX,XX @@

##

# @NetdevSocketOptions:

#

-# Connect the VLAN to a remote VLAN in another QEMU virtual machine using a TCP

-# socket connection.

+# Socket netdevs are used to establish a network connection to another

+# QEMU virtual machine via a TCP socket.

#

# @fd: file descriptor of an already opened socket

#

@@ -XXX,XX +XXX,XX @@

##

# @NetdevL2TPv3Options:

#

-# Connect the VLAN to Ethernet over L2TPv3 Static tunnel

+# Configure an Ethernet over L2TPv3 tunnel.

#

# @src: source address

#

@@ -XXX,XX +XXX,XX @@

##

# @NetdevVdeOptions:

#

-# Connect the VLAN to a vde switch running on the host.

+# Connect to a vde switch running on the host.

#

# @sock: socket path

#

@@ -XXX,XX +XXX,XX @@

#

# Captures the configuration of a network device; legacy.

#

-# @vlan: vlan number

-#

# @id: identifier for monitor commands

#

# @name: identifier for monitor commands, ignored if @id is present

@@ -XXX,XX +XXX,XX @@

# @opts: device type specific properties (legacy)

#

# Since: 1.2

+#

+# 'vlan' - removed with 2.12

##

{ 'struct': 'NetLegacy',

'data': {

- '*vlan': 'int32',

'*id': 'str',

'*name': 'str',

'opts': 'NetLegacyOptions' } }

diff --git a/qemu-doc.texi b/qemu-doc.texi

index XXXXXXX..XXXXXXX 100644

--- a/qemu-doc.texi

+++ b/qemu-doc.texi

@@ -XXX,XX +XXX,XX @@ with ``-device ...,netdev=x''), or ``-nic user,smb=/some/dir''

(for embedded NICs). The new syntax allows different settings to be

provided per NIC.

-@subsection -net vlan (since 2.9.0)

-

-The ``-net vlan=NN'' argument was mostly used to attach separate

-network backends to different virtual NICs. This is the default

-behavior for ``-netdev'' and ``-nic''. You can connect multiple

-``-netdev'' and ``-nic'' devices to the same network using the

-"hubport" network backend, created with ``-netdev hubport,hubid=NN,...''

-and ``-nic hubport,hubid=NN''.

-

@subsection -drive cyls=...,heads=...,secs=...,trans=... (since 2.10.0)

The drive geometry arguments are replaced by the the geometry arguments

diff --git a/qemu-options.hx b/qemu-options.hx

index XXXXXXX..XXXXXXX 100644

--- a/qemu-options.hx

+++ b/qemu-options.hx

@@ -XXX,XX +XXX,XX @@ DEF("netdev", HAS_ARG, QEMU_OPTION_netdev,

" configure a vhost-user network, backed by a chardev 'dev'\n"

#endif

"-netdev hubport,id=str,hubid=n[,netdev=nd]\n"

- " configure a hub port on QEMU VLAN 'n'\n", QEMU_ARCH_ALL)

+ " configure a hub port on the hub with ID 'n'\n", QEMU_ARCH_ALL)

DEF("nic", HAS_ARG, QEMU_OPTION_nic,

"--nic [tap|bridge|"

#ifdef CONFIG_SLIRP

@@ -XXX,XX +XXX,XX @@ DEF("nic", HAS_ARG, QEMU_OPTION_nic,

" provided a 'user' network connection)\n",

QEMU_ARCH_ALL)

DEF("net", HAS_ARG, QEMU_OPTION_net,

- "-net nic[,vlan=n][,netdev=nd][,macaddr=mac][,model=type][,name=str][,addr=str][,vectors=v]\n"

+ "-net nic[,macaddr=mac][,model=type][,name=str][,addr=str][,vectors=v]\n"

" configure or create an on-board (or machine default) NIC and\n"

- " connect it either to VLAN 'n' or the netdev 'nd' (for pluggable\n"

- " NICs please use '-device devtype,netdev=nd' instead)\n"

+ " connect it to hub 0 (please use -nic unless you need a hub)\n"

"-net ["

#ifdef CONFIG_SLIRP

"user|"

@@ -XXX,XX +XXX,XX @@ DEF("net", HAS_ARG, QEMU_OPTION_net,

#ifdef CONFIG_NETMAP

"netmap|"

#endif

- "socket][,vlan=n][,option][,option][,...]\n"

+ "socket][,option][,option][,...]\n"

" old way to initialize a host network interface\n"

" (use the -netdev option if possible instead)\n", QEMU_ARCH_ALL)

STEXI

@@ -XXX,XX +XXX,XX @@ qemu -m 512 -object memory-backend-file,id=mem,size=512M,mem-path=/hugetlbfs,sha

Create a hub port on the emulated hub with ID @var{hubid}.

The hubport netdev lets you connect a NIC to a QEMU emulated hub instead of a

-single netdev. @code{-net} and @code{-device} with the parameter @option{vlan}

-(deprecated), or @code{-nic hubport} can also be used to connect a

-network device or a NIC to a hub. Alternatively, you can also connect the

-hubport to another netdev with ID @var{nd} by using the @option{netdev=@var{nd}}

-option.

+single netdev. Alternatively, you can also connect the hubport to another

+netdev with ID @var{nd} by using the @option{netdev=@var{nd}} option.

-@item -net nic[,vlan=@var{n}][,netdev=@var{nd}][,macaddr=@var{mac}][,model=@var{type}] [,name=@var{name}][,addr=@var{addr}][,vectors=@var{v}]

+@item -net nic[,netdev=@var{nd}][,macaddr=@var{mac}][,model=@var{type}] [,name=@var{name}][,addr=@var{addr}][,vectors=@var{v}]

@findex -net

Legacy option to configure or create an on-board (or machine default) Network

-Interface Card(NIC) and connect it either to the emulated hub port ("vlan")

-with number @var{n} (@var{n} = 0 is the default), or to the netdev @var{nd}.

+Interface Card(NIC) and connect it either to the emulated hub with ID 0 (i.e.

+the default hub), or to the netdev @var{nd}.

The NIC is an e1000 by default on the PC target. Optionally, the MAC address

can be changed to @var{mac}, the device address set to @var{addr} (PCI cards

only), and a @var{name} can be assigned for use in monitor commands.

@@ -XXX,XX +XXX,XX @@ that the card should have; this option currently only affects virtio cards; set

NIC is created. QEMU can emulate several different models of network card.

Use @code{-net nic,model=help} for a list of available devices for your target.

-@item -net user|tap|bridge|socket|l2tpv3|vde[,...][,vlan=@var{n}][,name=@var{name}]

+@item -net user|tap|bridge|socket|l2tpv3|vde[,...][,name=@var{name}]

Configure a host network backend (with the options corresponding to the same

-@option{-netdev} option) and connect it to the emulated hub ("vlan") with the

-number @var{n} (default is number 0). Use @var{name} to specify the name of the

-hub port.

+@option{-netdev} option) and connect it to the emulated hub 0 (the default

+hub). Use @var{name} to specify the name of the hub port.

ETEXI

STEXI

From: Thomas Huth <thuth@redhat.com>

The early exits in case of errors leak the memory allocated for nd_id.

Fix it by using a "goto out" to the cleanup at the end of the function

instead.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Signed-off-by: Thomas Huth <thuth@redhat.com>

net/net.c | 6 ++++--

1 file changed, 4 insertions(+), 2 deletions(-)

@@ -XXX,XX +XXX,XX @@ static int net_param_nic(void *dummy, QemuOpts *opts, Error **errp)

g_free(mac);

if (ret) {

error_setg(errp, "invalid syntax for ethernet address");

- return -1;

+ goto out;

}

if (is_multicast_ether_addr(ni->macaddr.a)) {

error_setg(errp, "NIC cannot have multicast MAC address");

- return -1;

+ ret = -1;

+ goto out;

qemu_macaddr_default_if_unset(&ni->macaddr);

@@ -XXX,XX +XXX,XX @@ static int net_param_nic(void *dummy, QemuOpts *opts, Error **errp)

nb_nics++;

}

+out:

g_free(nd_id);

return ret;

}

From: Thomas Huth <thuth@redhat.com>

'vlan' is very confusing since it does not mean something like IEEE

802.1Q, but rather emulated hubs, so let's switch to that terminology

instead.

Buglink: https://bugs.launchpad.net/qemu/+bug/658904

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

Signed-off-by: Thomas Huth <thuth@redhat.com>

net/hub.c | 7 +++----

net/slirp.c | 8 ++++----

net/tap.c | 4 ++--

3 files changed, 9 insertions(+), 10 deletions(-)

queues = tap->has_queues ? tap->queues : 1;

vhostfdname = tap->has_vhostfd ? tap->vhostfd : NULL;

- /* QEMU vlans does not support multiqueue tap, in this case peer is set.

+ /* QEMU hubs do not support multiqueue tap, in this case peer is set.

* For -netdev, peer is always NULL. */

if (peer && (tap->has_queues || tap->has_fds || tap->has_vhostfds)) {

- error_setg(errp, "Multiqueue tap cannot be used with QEMU vlans");

+ error_setg(errp, "Multiqueue tap cannot be used with hubs");

return -1;

}

From: Thomas Huth <thuth@redhat.com>

'vlan' is very confusing since it does not mean something like IEEE

802.1Q, but rather emulated hubs, so let's switch to that terminology

instead. While we're at it, move the subsection about hub a little bit

downward in the documentation (it's not as important anymore as it was

before the invention of the -netdev parameter), and extend it a little

bit.

Buglink: https://bugs.launchpad.net/qemu/+bug/658904

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

Signed-off-by: Thomas Huth <thuth@redhat.com>

qemu-doc.texi | 42 +++++++++++++++++++++++-------------------

1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/qemu-doc.texi b/qemu-doc.texi

--- a/qemu-doc.texi

+++ b/qemu-doc.texi

@@ -XXX,XX +XXX,XX @@ state is not saved or restored properly (in particular USB).

@node pcsys_network

@section Network emulation

-QEMU can simulate several network cards (PCI or ISA cards on the PC

-target) and can connect them to an arbitrary number of Virtual Local

-Area Networks (VLANs). Host TAP devices can be connected to any QEMU

-VLAN. VLAN can be connected between separate instances of QEMU to

-simulate large networks. For simpler usage, a non privileged user mode

-network stack can replace the TAP device to have a basic network

-connection.

-

-@subsection VLANs

-

-QEMU simulates several VLANs. A VLAN can be symbolised as a virtual

-connection between several network devices. These devices can be for

-example QEMU virtual Ethernet cards or virtual Host ethernet devices

-(TAP devices).

+QEMU can simulate several network cards (e.g. PCI or ISA cards on the PC

+target) and can connect them to a network backend on the host or an emulated

+hub. The various host network backends can either be used to connect the NIC of

+the guest to a real network (e.g. by using a TAP devices or the non-privileged

+user mode network stack), or to other guest instances running in another QEMU

+process (e.g. by using the socket host network backend).

@subsection Using TAP network interfaces

@@ -XXX,XX +XXX,XX @@ network). The virtual network configuration is the following:

@example

- QEMU VLAN <------> Firewall/DHCP server <-----> Internet

+ guest (10.0.2.15) <------> Firewall/DHCP server <-----> Internet

| (10.0.2.2)

|

----> DNS server (10.0.2.3)

@@ -XXX,XX +XXX,XX @@ When using the @option{'-netdev user,hostfwd=...'} option, TCP or UDP

connections can be redirected from the host to the guest. It allows for

example to redirect X11, telnet or SSH connections.

-@subsection Connecting VLANs between QEMU instances

+@subsection Hubs

+

+QEMU can simulate several hubs. A hub can be thought of as a virtual connection

+between several network devices. These devices can be for example QEMU virtual

+ethernet cards or virtual Host ethernet devices (TAP devices). You can connect

+guest NICs or host network backends to such a hub using the @option{-netdev

+hubport} or @option{-nic hubport} options. The legacy @option{-net} option

+also connects the given device to the emulated hub with ID 0 (i.e. the default

+hub) unless you specify a netdev with @option{-net nic,netdev=xxx} here.

+

+@subsection Connecting emulated networks between QEMU instances

-Using the @option{-net socket} option, it is possible to make VLANs

-that span several QEMU instances. See @ref{sec_invocation} to have a

-basic example.

+Using the @option{-netdev socket} (or @option{-nic socket} or

+@option{-net socket}) option, it is possible to create emulated

+networks that span several QEMU instances.

+See the description of the @option{-netdev socket} option in the

+@ref{sec_invocation,,Invocation chapter} to have a basic example.

@node pcsys_other_devs

@section Other Devices