qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PATCH 6/7] slirp: Add description of new "dhcpvendopt" sub


From: Fedor Lyakhov
Subject: [Qemu-devel] [PATCH 6/7] slirp: Add description of new "dhcpvendopt" suboption to the help and man page
Date: Sat, 26 Apr 2014 02:11:02 +0400

Signed-off-by: Fedor Lyakhov <address@hidden>
---
 qemu-options.hx | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/qemu-options.hx b/qemu-options.hx
index 6457034..8be86e1 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -1373,10 +1373,10 @@ DEF("net", HAS_ARG, QEMU_OPTION_net,
     "                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=on|off]\n"
-    "         
[,hostname=host][,dhcpstart=addr][,dns=addr][,dnssearch=domain][,tftp=dir]\n"
-    "         [,bootfile=f][,hostfwd=rule][,guestfwd=rule]"
+    "         
[,hostname=host][,dhcpstart=addr][,dns=addr][,dhcpvendopt=optstring]\n"
+    "         
[,dnssearch=domain][,tftp=dir][,bootfile=f][,hostfwd=rule][,guestfwd=rule]\n"
 #ifndef _WIN32
-                                             "[,smb=dir[,smbserver=addr]]\n"
+    "         [,smb=dir[,smbserver=addr]]\n"
 #endif
     "                connect the user mode network stack to VLAN 'n', 
configure its\n"
     "                DHCP server and enabled optional services\n"
@@ -1503,6 +1503,16 @@ Specifies the client hostname reported by the built-in 
DHCP server.
 Specify the first of the 16 IPs the built-in DHCP server can assign. Default
 is the 15th to 31st IP in the guest network, i.e. x.x.x.15 to x.x.x.31.
 
address@hidden address@hidden
+Specify list of vendor-specific DHCP options (option 43) reported by the
+built-in DHCP server (see RFC2132). The @var{optstring} should be specified in
+the following form: "tag1:value1;tag2:value2", i.e. each option is separated by
+';' semicolon (Note: on most terminals it must be escaped '\;'), option tag and
+value are separated by ':' colon. Accepted tag values are [1-254]. Single
+tag-less option "value" is also supported. Zero tag "0:" can be used to
+'escape' special single options beginning with tag-like value (e.g. single MAC
+address can be specified as "0:10:FE:20:AB:CD:78").
+
 @item address@hidden
 Specify the guest-visible address of the virtual nameserver. The address must
 be different from the host address. Default is the 3rd IP in the guest network,
-- 
1.8.4.5




reply via email to

[Prev in Thread] Current Thread [Next in Thread]