1 |
commit: f538f43796c58415cc7f695ff1e96b2385a3ec74 |
2 |
Author: Stefan Hajnoczi <stefanha <AT> linux <DOT> vnet <DOT> ibm <DOT> com> |
3 |
AuthorDate: Tue Aug 14 13:14:27 2012 +0000 |
4 |
Commit: Doug Goldstein <cardoe <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Oct 24 07:07:36 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qemu-kvm.git;a=commit;h=f538f437 |
7 |
|
8 |
net: add -netdev options to man page |
9 |
|
10 |
Document the -netdev syntax which supercedes the older -net syntax. |
11 |
This patch is a first step to making -netdev prominent in the QEMU |
12 |
manual. |
13 |
|
14 |
Reported-by: Anatoly Techtonik <techtonik <AT> gmail.com> |
15 |
Signed-off-by: Stefan Hajnoczi <stefanha <AT> linux.vnet.ibm.com> |
16 |
(cherry picked from commit 08d12022c7f1aba6acccc75150659c6e4c9dff23) |
17 |
|
18 |
--- |
19 |
qemu-options.hx | 7 +++++++ |
20 |
1 files changed, 7 insertions(+), 0 deletions(-) |
21 |
|
22 |
diff --git a/qemu-options.hx b/qemu-options.hx |
23 |
index 125a4da..bb8ae1d 100644 |
24 |
--- a/qemu-options.hx |
25 |
+++ b/qemu-options.hx |
26 |
@@ -1318,6 +1318,7 @@ Valid values for @var{type} are |
27 |
Not all devices are supported on all targets. Use -net nic,model=? |
28 |
for a list of available devices for your target. |
29 |
|
30 |
+@item -netdev user,id=@var{id}[,@var{option}][,@var{option}][,...] |
31 |
@item -net user[,@var{option}][,@var{option}][,...] |
32 |
Use the user mode network stack which requires no administrator |
33 |
privilege to run. Valid options are: |
34 |
@@ -1326,6 +1327,7 @@ privilege to run. Valid options are: |
35 |
@item vlan=@var{n} |
36 |
Connect user mode stack to VLAN @var{n} (@var{n} = 0 is the default). |
37 |
|
38 |
+@item id=@var{id} |
39 |
@item name=@var{name} |
40 |
Assign symbolic name for use in monitor commands. |
41 |
|
42 |
@@ -1431,6 +1433,7 @@ processed and applied to -net user. Mixing them with the new configuration |
43 |
syntax gives undefined results. Their use for new applications is discouraged |
44 |
as they will be removed from future versions. |
45 |
|
46 |
+@item -netdev tap,id=@var{id}[,fd=@var{h}][,ifname=@var{name}][,script=@var{file}][,downscript=@var{dfile}][,helper=@var{helper}] |
47 |
@item -net tap[,vlan=@var{n}][,name=@var{name}][,fd=@var{h}][,ifname=@var{name}][,script=@var{file}][,downscript=@var{dfile}][,helper=@var{helper}] |
48 |
Connect the host TAP network interface @var{name} to VLAN @var{n}. |
49 |
|
50 |
@@ -1470,6 +1473,7 @@ qemu-system-i386 linux.img \ |
51 |
-net nic -net tap,"helper=/usr/local/libexec/qemu-bridge-helper" |
52 |
@end example |
53 |
|
54 |
+@item -netdev bridge,id=@var{id}[,br=@var{bridge}][,helper=@var{helper}] |
55 |
@item -net bridge[,vlan=@var{n}][,name=@var{name}][,br=@var{bridge}][,helper=@var{helper}] |
56 |
Connect a host TAP network interface to a host bridge device. |
57 |
|
58 |
@@ -1492,6 +1496,7 @@ qemu-system-i386 linux.img -net bridge -net nic,model=virtio |
59 |
qemu-system-i386 linux.img -net bridge,br=qemubr0 -net nic,model=virtio |
60 |
@end example |
61 |
|
62 |
+@item -netdev socket,id=@var{id}[,fd=@var{h}][,listen=[@var{host}]:@var{port}][,connect=@var{host}:@var{port}] |
63 |
@item -net socket[,vlan=@var{n}][,name=@var{name}][,fd=@var{h}] [,listen=[@var{host}]:@var{port}][,connect=@var{host}:@var{port}] |
64 |
|
65 |
Connect the VLAN @var{n} to a remote VLAN in another QEMU virtual |
66 |
@@ -1514,6 +1519,7 @@ qemu-system-i386 linux.img \ |
67 |
-net socket,connect=127.0.0.1:1234 |
68 |
@end example |
69 |
|
70 |
+@item -netdev socket,id=@var{id}[,fd=@var{h}][,mcast=@var{maddr}:@var{port}[,localaddr=@var{addr}]] |
71 |
@item -net socket[,vlan=@var{n}][,name=@var{name}][,fd=@var{h}][,mcast=@var{maddr}:@var{port}[,localaddr=@var{addr}]] |
72 |
|
73 |
Create a VLAN @var{n} shared with another QEMU virtual |
74 |
@@ -1565,6 +1571,7 @@ qemu-system-i386 linux.img \ |
75 |
-net socket,mcast=239.192.168.1:1102,localaddr=1.2.3.4 |
76 |
@end example |
77 |
|
78 |
+@item -netdev vde,id=@var{id}[,sock=@var{socketpath}][,port=@var{n}][,group=@var{groupname}][,mode=@var{octalmode}] |
79 |
@item -net vde[,vlan=@var{n}][,name=@var{name}][,sock=@var{socketpath}] [,port=@var{n}][,group=@var{groupname}][,mode=@var{octalmode}] |
80 |
Connect VLAN @var{n} to PORT @var{n} of a vde switch running on host and |
81 |
listening for incoming connections on @var{socketpath}. Use GROUP @var{groupname} |