Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

Block layer patches

# gpg: Signature made Tue 23 Jan 2018 12:38:36 GMT
# gpg:                using RSA key 0x7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream: (29 commits)
  iotests: Disable some tests for compat=0.10
  iotests: Split 177 into two parts for compat=0.10
  iotests: Make 059 pass on machines with little RAM
  iotests: Filter compat-dependent info in 198
  iotests: Make 191 work with qcow2 options
  iotests: Make 184 image-less
  iotests: Make 089 compatible with compat=0.10
  iotests: Fix 067 for compat=0.10
  iotests: Fix 059's reference output
  iotests: Fix 051 for compat=0.10
  iotests: Fix 020 for vmdk
  iotests: Skip 103 for refcount_bits=1
  iotests: Forbid 020 for non-file protocols
  iotests: Drop format-specific in _filter_img_info
  iotests: Fix _img_info for backslashes
  block/vmdk: Add blkdebug events
  block/qcow: Add blkdebug events
  qcow2: No persistent dirty bitmaps for compat=0.10
  block/vmdk: Fix , instead of ; at end of line
  qemu-iotests: Fix locking issue in 102
  ...

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

diff --combined qapi/block-core.json
index 4e84cf29dbd0fd941938bb64064d2c1d6782d580,89ed2bc6a416c5abcc5d95d1d8f948d48179640f..8225308904a5a2aa0e1eac5e30cf96d3693b9420
--- 1/qapi/block-core.json
--- 2/qapi/block-core.json
+++ b/qapi/block-core.json
@@@ -1799,24 -1799,6 +1799,24 @@@
  # Example:
  #
  # -> { "execute": "block_set_io_throttle",
 +#      "arguments": { "id": "virtio-blk-pci0/virtio-backend",
 +#                     "bps": 0,
 +#                     "bps_rd": 0,
 +#                     "bps_wr": 0,
 +#                     "iops": 512,
 +#                     "iops_rd": 0,
 +#                     "iops_wr": 0,
 +#                     "bps_max": 0,
 +#                     "bps_rd_max": 0,
 +#                     "bps_wr_max": 0,
 +#                     "iops_max": 0,
 +#                     "iops_rd_max": 0,
 +#                     "iops_wr_max": 0,
 +#                     "bps_max_length": 0,
 +#                     "iops_size": 0 } }
 +# <- { "return": {} }
 +#
 +# -> { "execute": "block_set_io_throttle",
  #      "arguments": { "id": "ide0-1-0",
  #                     "bps": 1000000,
  #                     "bps_rd": 0,
@@@ -3421,7 -3403,7 +3421,7 @@@
              '*id': 'str' } }
  
  ##
- # @x-blockdev-remove-medium:
+ # @blockdev-remove-medium:
  #
  # Removes a medium (a block driver state tree) from a block device. That block
  # device's tray must currently be open (unless there is no attached guest
@@@ -3429,18 -3411,13 +3429,13 @@@
  #
  # If the tray is open and there is no medium inserted, this will be a no-op.
  #
- # @device: Block device name (deprecated, use @id instead)
- #
- # @id:     The name or QOM path of the guest device (since: 2.8)
+ # @id:     The name or QOM path of the guest device
  #
- # Note: This command is still a work in progress and is considered experimental.
- # Stay away from it unless you want to help with its development.
- #
- # Since: 2.5
+ # Since: 2.12
  #
  # Example:
  #
- # -> { "execute": "x-blockdev-remove-medium",
+ # -> { "execute": "blockdev-remove-medium",
  #      "arguments": { "id": "ide0-1-0" } }
  #
  # <- { "error": { "class": "GenericError",
@@@ -3458,33 -3435,27 +3453,27 @@@
  #
  # <- { "return": {} }
  #
- # -> { "execute": "x-blockdev-remove-medium",
+ # -> { "execute": "blockdev-remove-medium",
  #      "arguments": { "id": "ide0-1-0" } }
  #
  # <- { "return": {} }
  #
  ##
- { 'command': 'x-blockdev-remove-medium',
-   'data': { '*device': 'str',
-             '*id': 'str' } }
+ { 'command': 'blockdev-remove-medium',
+   'data': { 'id': 'str' } }
  
  ##
- # @x-blockdev-insert-medium:
+ # @blockdev-insert-medium:
  #
  # Inserts a medium (a block driver state tree) into a block device. That block
  # device's tray must currently be open (unless there is no attached guest
  # device) and there must be no medium inserted already.
  #
- # @device:    Block device name (deprecated, use @id instead)
- #
- # @id:        The name or QOM path of the guest device (since: 2.8)
+ # @id:        The name or QOM path of the guest device
  #
  # @node-name: name of a node in the block driver state graph
  #
- # Note: This command is still a work in progress and is considered experimental.
- # Stay away from it unless you want to help with its development.
- #
- # Since: 2.5
+ # Since: 2.12
  #
  # Example:
  #
@@@ -3496,16 -3467,15 +3485,15 @@@
  #                    "filename": "fedora.iso" } } }
  # <- { "return": {} }
  #
- # -> { "execute": "x-blockdev-insert-medium",
+ # -> { "execute": "blockdev-insert-medium",
  #      "arguments": { "id": "ide0-1-0",
  #                     "node-name": "node0" } }
  #
  # <- { "return": {} }
  #
  ##
- { 'command': 'x-blockdev-insert-medium',
-   'data': { '*device': 'str',
-             '*id': 'str',
+ { 'command': 'blockdev-insert-medium',
+   'data': { 'id': 'str',
              'node-name': 'str'} }
  
  
@@@ -3533,8 -3503,8 +3521,8 @@@
  #
  # Changes the medium inserted into a block device by ejecting the current medium
  # and loading a new image file which is inserted as the new medium (this command
- # combines blockdev-open-tray, x-blockdev-remove-medium,
- # x-blockdev-insert-medium and blockdev-close-tray).
+ # combines blockdev-open-tray, blockdev-remove-medium, blockdev-insert-medium
+ # and blockdev-close-tray).
  #
  # @device:          Block device name (deprecated, use @id instead)
  #