diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2011-07-20 12:20:14 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-07-23 10:19:49 -0500 |
| commit | c54ed5bcdd8ed29f9cdfcfc0e456b6ec1f25d2c3 (patch) | |
| tree | 8aef013391d00fc25269423ebe4d6bc379554564 /qemu-options.hx | |
| parent | 12b513d837c9da5277390ddaf98ca0058339977a (diff) | |
| download | qemu-c54ed5bcdd8ed29f9cdfcfc0e456b6ec1f25d2c3.tar.gz qemu-c54ed5bcdd8ed29f9cdfcfc0e456b6ec1f25d2c3.tar.bz2 qemu-c54ed5bcdd8ed29f9cdfcfc0e456b6ec1f25d2c3.zip | |
slirp: Canonicalize restrict syntax
All other boolean arguments accept on|off - except for slirp's restrict.
Fix that while still accepting the formerly allowed yes|y|no|n, but
reject everything else. This avoids accidentally allowing external
connections because syntax errors were so far interpreted as
'restrict=no'.
CC: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'qemu-options.hx')
| -rw-r--r-- | qemu-options.hx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qemu-options.hx b/qemu-options.hx index 1233f834df..1d57f64888 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1115,7 +1115,7 @@ DEF("net", HAS_ARG, QEMU_OPTION_net, "-net nic[,vlan=n][,macaddr=mac][,model=type][,name=str][,addr=str][,vectors=v]\n" " create a new Network Interface Card and connect it to VLAN 'n'\n" #ifdef CONFIG_SLIRP - "-net user[,vlan=n][,name=str][,net=addr[/mask]][,host=addr][,restrict=y|n]\n" + "-net user[,vlan=n][,name=str][,net=addr[/mask]][,host=addr][,restrict=on|off]\n" " [,hostname=host][,dhcpstart=addr][,dns=addr][,tftp=dir][,bootfile=f]\n" " [,hostfwd=rule][,guestfwd=rule]" #ifndef _WIN32 @@ -1208,7 +1208,7 @@ either in the form a.b.c.d or as number of valid top-most bits. Default is Specify the guest-visible address of the host. Default is the 2nd IP in the guest network, i.e. x.x.x.2. -@item restrict=y|yes|n|no +@item restrict=on|off If this option is enabled, the guest will be isolated, i.e. it will not be able to contact the host and no guest IP packets will be routed over the host to the outside. This option does not affect any explicitly set forwarding rules. |