[Qemu-stable] [PATCH 11/60] net: add -netdev options to man page

[Michael Tokarev]

From: Stefan Hajnoczi <address@hidden>

Document the -netdev syntax which supercedes the older -net syntax.
This patch is a first step to making -netdev prominent in the QEMU
manual.

Reported-by: Anatoly Techtonik <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
(cherry picked from commit 08d12022c7f1aba6acccc75150659c6e4c9dff23)

Signed-off-by: Michael Tokarev <address@hidden>
---
 qemu-options.hx |    7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/qemu-options.hx b/qemu-options.hx
index 8b66264..25633bb 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -1318,6 +1318,7 @@ Valid values for @var{type} are
 Not all devices are supported on all targets.  Use -net nic,model=?
 for a list of available devices for your target.
 
address@hidden -netdev user,address@hidden,@var{option}][,@var{option}][,...]
 @item -net user[,@var{option}][,@var{option}][,...]
 Use the user mode network stack which requires no administrator
 privilege to run. Valid options are:
@@ -1326,6 +1327,7 @@ privilege to run. Valid options are:
 @item address@hidden
 Connect user mode stack to VLAN @var{n} (@var{n} = 0 is the default).
 
address@hidden address@hidden
 @item address@hidden
 Assign symbolic name for use in monitor commands.
 
@@ -1431,6 +1433,7 @@ processed and applied to -net user. Mixing them with the 
new configuration
 syntax gives undefined results. Their use for new applications is discouraged
 as they will be removed from future versions.
 
address@hidden -netdev 
tap,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden
 @item -net 
tap[,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden
 Connect the host TAP network interface @var{name} to VLAN @var{n}.
 
@@ -1470,6 +1473,7 @@ qemu-system-i386 linux.img \
                  -net nic -net 
tap,"helper=/usr/local/libexec/qemu-bridge-helper"
 @end example
 
address@hidden -netdev bridge,address@hidden,address@hidden,address@hidden
 @item -net bridge[,address@hidden,address@hidden,address@hidden,address@hidden
 Connect a host TAP network interface to a host bridge device.
 
@@ -1492,6 +1496,7 @@ qemu-system-i386 linux.img -net bridge -net 
nic,model=virtio
 qemu-system-i386 linux.img -net bridge,br=qemubr0 -net nic,model=virtio
 @end example
 
address@hidden -netdev 
socket,address@hidden,address@hidden,address@hidden:@var{port}][,address@hidden:@var{port}]
 @item -net socket[,address@hidden,address@hidden,address@hidden 
[,address@hidden:@var{port}][,address@hidden:@var{port}]
 
 Connect the VLAN @var{n} to a remote VLAN in another QEMU virtual
@@ -1514,6 +1519,7 @@ qemu-system-i386 linux.img \
                  -net socket,connect=127.0.0.1:1234
 @end example
 
address@hidden -netdev 
socket,address@hidden,address@hidden,address@hidden:@var{port}[,address@hidden
 @item -net 
socket[,address@hidden,address@hidden,address@hidden,address@hidden:@var{port}[,address@hidden
 
 Create a VLAN @var{n} shared with another QEMU virtual
@@ -1565,6 +1571,7 @@ qemu-system-i386 linux.img \
                  -net socket,mcast=239.192.168.1:1102,localaddr=1.2.3.4
 @end example
 
address@hidden -netdev 
vde,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden
 @item -net vde[,address@hidden,address@hidden,address@hidden 
[,address@hidden,address@hidden,address@hidden
 Connect VLAN @var{n} to PORT @var{n} of a vde switch running on host and
 listening for incoming connections on @var{socketpath}. Use GROUP 
@var{groupname}
-- 
1.7.10.4