Commit 7e89463d4a1495bf943aa20013331950916a0f31

Authored by bellard
1 parent 41d03949

update


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1624 c046a42c-6fe2-441c-8c8c-71466251a162
Showing 1 changed file with 3 additions and 3 deletions
qemu-doc.texi
@@ -254,7 +254,7 @@ target. Optionally, the MAC address can be changed. If no @@ -254,7 +254,7 @@ target. Optionally, the MAC address can be changed. If no
254 @option{-net} option is specified, a single NIC is created. 254 @option{-net} option is specified, a single NIC is created.
255 255
256 @item -net user[,vlan=n] 256 @item -net user[,vlan=n]
257 -Use the user mode network stack which requires not administrator 257 +Use the user mode network stack which requires no administrator
258 priviledge to run. This is the default if no @option{-net} option is 258 priviledge to run. This is the default if no @option{-net} option is
259 specified. 259 specified.
260 260
@@ -288,9 +288,9 @@ specifies an already opened socket. @@ -288,9 +288,9 @@ specifies an already opened socket.
288 Example: 288 Example:
289 @example 289 @example
290 # launch a first QEMU instance 290 # launch a first QEMU instance
291 -qemu linux.img -net nic -net socket,listen=:1234 291 +qemu linux.img -net nic,macaddr=52:54:00:12:34:56 -net socket,listen=:1234
292 # connect the VLAN 0 of this instance to the VLAN 0 of the first instance 292 # connect the VLAN 0 of this instance to the VLAN 0 of the first instance
293 -qemu linux.img -net nic -net socket,connect=127.0.0.1:1234 293 +qemu linux.img -net nic,macaddr=52:54:00:12:34:57 -net socket,connect=127.0.0.1:1234
294 @end example 294 @end example
295 295
296 @item -net none 296 @item -net none