summaryrefslogtreecommitdiffstats
path: root/qemu-doc.texi
diff options
context:
space:
mode:
authorbellard2005-11-19 18:42:52 +0100
committerbellard2005-11-19 18:42:52 +0100
commit7e89463d4a1495bf943aa20013331950916a0f31 (patch)
tree0474b7c9f1aa467e7a3119b1bfe5f324e8d7fd06 /qemu-doc.texi
parentupdate (diff)
downloadqemu-7e89463d4a1495bf943aa20013331950916a0f31.tar.gz
qemu-7e89463d4a1495bf943aa20013331950916a0f31.tar.xz
qemu-7e89463d4a1495bf943aa20013331950916a0f31.zip
update
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1624 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'qemu-doc.texi')
-rw-r--r--qemu-doc.texi6
1 files changed, 3 insertions, 3 deletions
diff --git a/qemu-doc.texi b/qemu-doc.texi
index d0b0b34d1e..7ec41f5278 100644
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -254,7 +254,7 @@ target. Optionally, the MAC address can be changed. If no
@option{-net} option is specified, a single NIC is created.
@item -net user[,vlan=n]
-Use the user mode network stack which requires not administrator
+Use the user mode network stack which requires no administrator
priviledge to run. This is the default if no @option{-net} option is
specified.
@@ -288,9 +288,9 @@ specifies an already opened socket.
Example:
@example
# launch a first QEMU instance
-qemu linux.img -net nic -net socket,listen=:1234
+qemu linux.img -net nic,macaddr=52:54:00:12:34:56 -net socket,listen=:1234
# connect the VLAN 0 of this instance to the VLAN 0 of the first instance
-qemu linux.img -net nic -net socket,connect=127.0.0.1:1234
+qemu linux.img -net nic,macaddr=52:54:00:12:34:57 -net socket,connect=127.0.0.1:1234
@end example
@item -net none