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

Block patches for 1.7.0-rc0 (v2)

# gpg: Signature made Thu 31 Oct 2013 04:44:39 PM CET using RSA key ID C88F2FD6
# gpg: Can't check signature: public key not found

* kwolf/tags/for-anthony: (30 commits)
  vmdk: Implment bdrv_get_specific_info
  qapi: Add optional field 'compressed' to ImageInfo
  qemu-iotests: prefill some data to test image
  sheepdog: check simultaneous create in resend_aioreq
  sheepdog: cancel aio requests if possible
  sheepdog: make add_aio_request and send_aioreq void functions
  sheepdog: try to reconnect to sheepdog after network error
  coroutine: add co_aio_sleep_ns() to allow sleep in block drivers
  sheepdog: reload inode outside of resend_aioreq
  sheepdog: handle vdi objects in resend_aio_req
  sheepdog: check return values of qemu_co_recv/send correctly
  qemu-iotests: Test case for backing file deletion
  qemu-iotests: drop duplicated "create_image"
  qemu-iotests: Fix 051 reference output
  block: Avoid unecessary drv->bdrv_getlength() calls
  block: Disable BDRV_O_COPY_ON_READ for the backing file
  ahci: fix win7 hang on boot
  sheepdog: pass copy_policy in the request
  sheepdog: explicitly set copies as type uint8_t
  block: Don't copy backing file name on error
  ...

Message-id: 1383064269-27720-1-git-send-email-kwolf@redhat.com
Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>

diff --combined qapi-schema.json
index a003aa176340c9100de85d458ce6442e979314ae,d607258122cc6e6b102b612b34a94ba8ba2b49be..81a375ba060633ea9e28563f72d0b6fd2749f3c6
--- 1/qapi-schema.json
--- 2/qapi-schema.json
+++ b/qapi-schema.json
@@@ -224,6 -224,27 +224,27 @@@
        '*lazy-refcounts': 'bool'
    } }
  
+ ##
+ # @ImageInfoSpecificVmdk:
+ #
+ # @create_type: The create type of VMDK image
+ #
+ # @cid: Content id of image
+ #
+ # @parent-cid: Parent VMDK image's cid
+ #
+ # @extents: List of extent files
+ #
+ # Since: 1.7
+ ##
+ { 'type': 'ImageInfoSpecificVmdk',
+   'data': {
+       'create-type': 'str',
+       'cid': 'int',
+       'parent-cid': 'int',
+       'extents': ['ImageInfo']
+   } }
+ 
  ##
  # @ImageInfoSpecific:
  #
@@@ -234,7 -255,8 +255,8 @@@
  
  { 'union': 'ImageInfoSpecific',
    'data': {
-       'qcow2': 'ImageInfoSpecificQCow2'
+       'qcow2': 'ImageInfoSpecificQCow2',
+       'vmdk': 'ImageInfoSpecificVmdk'
    } }
  
  ##
@@@ -256,6 -278,8 +278,8 @@@
  #
  # @encrypted: #optional true if the image is encrypted
  #
+ # @compressed: #optional true if the image is compressed (Since 1.7)
+ #
  # @backing-filename: #optional name of the backing file
  #
  # @full-backing-filename: #optional full path of the backing file
@@@ -276,7 -300,7 +300,7 @@@
  { 'type': 'ImageInfo',
    'data': {'filename': 'str', 'format': 'str', '*dirty-flag': 'bool',
             '*actual-size': 'int', 'virtual-size': 'int',
-            '*cluster-size': 'int', '*encrypted': 'bool',
+            '*cluster-size': 'int', '*encrypted': 'bool', '*compressed': 'bool',
             '*backing-filename': 'str', '*full-backing-filename': 'str',
             '*backing-filename-format': 'str', '*snapshots': ['SnapshotInfo'],
             '*backing-image': 'ImageInfo',
@@@ -1914,7 -1938,7 +1938,7 @@@
  #
  # Since: 0.14.0
  #
 -# Notes: This command only exists as a stop-gap.  It's use is highly
 +# Notes: This command only exists as a stop-gap.  Its use is highly
  #        discouraged.  The semantics of this command are not guaranteed.
  #
  #        Known limitations: