Merge commit '5869c4d515128cd3a938a7346a8037abcc232220' into upstream-merge

* commit '5869c4d515128cd3a938a7346a8037abcc232220':
  net: add -net nic,netdev= option
  net: maintain a list of vlan-less clients
  net: handle -netdevice options
  net: add -netdev option
  net: add QemuOptsList arg to net_client_parse()
  net: allow clients not associated with a vlan

Signed-off-by: Mark McLoughlin <markmc@redhat.com>

1 files changed, 10 insertions, 0 deletions

diff --git a/qemu-options.hx b/qemu-options.hx
index bde3e3f3d..3df487242 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -840,6 +840,16 @@ DEF("net", HAS_ARG, QEMU_OPTION_net,
     "                dump traffic on vlan 'n' to file 'f' (max n bytes per packet)\n"
     "-net none       use it alone to have zero network devices; if no -net option\n"
     "                is provided, the default is '-net nic -net user'\n")
+DEF("netdev", HAS_ARG, QEMU_OPTION_netdev,
+    "-netdev ["
+#ifdef CONFIG_SLIRP
+    "user|"
+#endif
+    "tap|"
+#ifdef CONFIG_VDE
+    "vde|"
+#endif
+    "socket],id=str[,option][,option][,...]\n")
 STEXI
 @item -net nic[,vlan=@var{n}][,macaddr=@var{mac}][,model=@var{type}][,name=@var{name}][,addr=@var{addr}][,vectors=@var{v}]
 Create a new Network Interface Card and connect it to VLAN @var{n} (@var{n}