Commit 039af320d9b116a325ee55ebab2edf60f3bdc252
1 parent
fd1dff4b
clearer -net doc (Paul Brook)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1732 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
3 additions
and
4 deletions
qemu-doc.texi
| @@ -260,8 +260,7 @@ target. Optionally, the MAC address can be changed. If no | @@ -260,8 +260,7 @@ target. Optionally, the MAC address can be changed. If no | ||
| 260 | 260 | ||
| 261 | @item -net user[,vlan=n] | 261 | @item -net user[,vlan=n] |
| 262 | Use the user mode network stack which requires no administrator | 262 | Use the user mode network stack which requires no administrator |
| 263 | -priviledge to run. This is the default if no @option{-net} option is | ||
| 264 | -specified. | 263 | +priviledge to run. |
| 265 | 264 | ||
| 266 | @item -net tap[,vlan=n][,fd=h][,ifname=name][,script=file] | 265 | @item -net tap[,vlan=n][,fd=h][,ifname=name][,script=file] |
| 267 | Connect the host TAP network interface @var{name} to VLAN @var{n} and | 266 | Connect the host TAP network interface @var{name} to VLAN @var{n} and |
| @@ -334,8 +333,8 @@ qemu linux.img -net nic,macaddr=52:54:00:12:34:56 -net socket,mcast=239.192.168. | @@ -334,8 +333,8 @@ qemu linux.img -net nic,macaddr=52:54:00:12:34:56 -net socket,mcast=239.192.168. | ||
| 334 | 333 | ||
| 335 | @item -net none | 334 | @item -net none |
| 336 | Indicate that no network devices should be configured. It is used to | 335 | Indicate that no network devices should be configured. It is used to |
| 337 | -override the default configuration which is activated if no | ||
| 338 | -@option{-net} options are provided. | 336 | +override the default configuration (@option{-net nic -net user}) which |
| 337 | +is activated if no @option{-net} options are provided. | ||
| 339 | 338 | ||
| 340 | @item -tftp prefix | 339 | @item -tftp prefix |
| 341 | When using the user mode network stack, activate a built-in TFTP | 340 | When using the user mode network stack, activate a built-in TFTP |