Merge remote-tracking branch 'kiszka/queues/slirp' into staging

* kiszka/queues/slirp:
  slirp: Add domain-search option to slirp's DHCP server
  slirp: Don't crash on packets from 0.0.0.0/8.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --combined qemu-options.hx
index 8d506fef0c9a9284c192434c37feefb5f76dce6d,a165cff07194ccbda860eb953f28687d4a2b7b86..9bb29d3907f64e0e26de94bbb390c0acb37c5c25
--- 1/qemu-options.hx
--- 2/qemu-options.hx
+++ b/qemu-options.hx
@@@ -1318,8 -1318,8 +1318,8 @@@ 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][,tftp=dir][,bootfile=f]\n"
-     "         [,hostfwd=rule][,guestfwd=rule]"
+     "         [,hostname=host][,dhcpstart=addr][,dns=addr][,dnssearch=domain][,tftp=dir]\n"
+     "         [,bootfile=f][,hostfwd=rule][,guestfwd=rule]"
  #ifndef _WIN32
                                               "[,smb=dir[,smbserver=addr]]\n"
  #endif
@@@ -1428,7 -1428,7 +1428,7 @@@ able to contact the host and no guest I
  to the outside. This option does not affect any explicitly set forwarding rules.
  
  @item hostname=@var{name}
- Specifies the client hostname reported by the builtin DHCP server.
+ Specifies the client hostname reported by the built-in DHCP server.
  
  @item dhcpstart=@var{addr}
  Specify the first of the 16 IPs the built-in DHCP server can assign. Default
@@@ -1439,6 -1439,18 +1439,18 @@@ Specify the guest-visible address of th
  be different from the host address. Default is the 3rd IP in the guest network,
  i.e. x.x.x.3.
  
+ @item dnssearch=@var{domain}
+ Provides an entry for the domain-search list sent by the built-in
+ DHCP server. More than one domain suffix can be transmitted by specifying
+ this option multiple times. If supported, this will cause the guest to
+ automatically try to append the given domain suffix(es) in case a domain name
+ can not be resolved.
+ 
+ Example:
+ @example
+ qemu -net user,dnssearch=mgmt.example.org,dnssearch=example.org [...]
+ @end example
+ 
  @item tftp=@var{dir}
  When using the user mode network stack, activate a built-in TFTP
  server. The files in @var{dir} will be exposed as the root of a TFTP server.
@@@ -2054,23 -2066,6 +2066,23 @@@ qemu-system-i386 --drive file=sheepdog:
  
  See also @url{http://http://www.osrg.net/sheepdog/}.
  
 +@item GlusterFS
 +GlusterFS is an user space distributed file system.
 +QEMU supports the use of GlusterFS volumes for hosting VM disk images using
 +TCP, Unix Domain Sockets and RDMA transport protocols.
 +
 +Syntax for specifying a VM disk image on GlusterFS volume is
 +@example
 +gluster[+transport]://[server[:port]]/volname/image[?socket=...]
 +@end example
 +
 +
 +Example
 +@example
 +qemu-system-x86_84 --drive file=gluster://192.0.2.1/testvol/a.img
 +@end example
 +
 +See also @url{http://www.gluster.org}.
  @end table
  ETEXI
  
@@@ -2921,14 -2916,6 +2933,14 @@@ DEF("no-kvm-irqchip", HAS_ARG, QEMU_OPT
  HXCOMM Deprecated (ignored)
  DEF("tdf", 0, QEMU_OPTION_tdf,"", QEMU_ARCH_ALL)
  
 +DEF("object", HAS_ARG, QEMU_OPTION_object,
 +    "-object TYPENAME[,PROP1=VALUE1,...]\n"
 +    "                create an new object of type TYPENAME setting properties\n"
 +    "                in the order they are specified.  Note that the 'id'\n"
 +    "                property must be set.  These objects are placed in the\n"
 +    "                '/objects' path.\n",
 +    QEMU_ARCH_ALL)
 +
  HXCOMM This is the last statement. Insert new options before this line!
  STEXI
  @end table