Merge remote-tracking branch 'kwolf/for-anthony' into staging

* kwolf/for-anthony: (26 commits)
  qemu-io: Use bdrv_drain_all instead of qemu_aio_flush
  megasas: Use bdrv_drain_all instead of qemu_aio_flush
  vmdk: Fix data corruption bug in WRITE and READ handling
  fdc: remove last usage of FD_STATE_SEEK
  fdc: fix typo in zero constant
  fdc: remove double affectation of FD_MSR_CMDBUSY flag
  fdc-tests: add tests for VERIFY command
  fdc: implement VERIFY command
  fdc-test: Check READ ID
  fdc: fix false FD_SR0_SEEK
  fdc: fix FD_SR0_SEEK for initial seek on DMA transfers
  fdc: fix FD_SR0_SEEK for non-DMA transfers and multi sectors transfers
  fdc: use status0 field instead of a local variable
  fdc-test: add tests for non-DMA READ command
  fdc-test: insert media before fuzzing registers
  fdc-test: split test_media_change() test, so insert part can be reused
  fdc: Remove status0 parameter from fdctrl_set_fifo()
  aio: rename AIOPool to AIOCBInfo
  aio: use g_slice_alloc() for AIOCB pooling
  aio: switch aiocb_size type int -> size_t
  ...

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

diff --combined qemu-options.hx
index dd86bfe,06aa1ae..8d506fe
--- 1/qemu-options.hx
--- 2/qemu-options.hx
+++ b/qemu-options.hx
@@@ -2054,6 -2054,23 +2054,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
  
@@@ -2904,14 -2921,6 +2921,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