Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
commite0d3795654b7eb5b91b478bc7e6b717b192a8bce
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 12 Dec 2014 17:10:44 +0000 (12 17:10 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 12 Dec 2014 17:10:44 +0000 (12 17:10 +0000)
tree7be4908dfc8a445a28a622ecd514f81ea31619bb
parent99c9c3cb24e566258a0a141178934f9cb5198842
parent82595da8dedde128d8004ec47441aeb720c08704
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging

# gpg: Signature made Fri 12 Dec 2014 17:09:56 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* remotes/stefanha/tags/block-pull-request:
  linux-aio: simplify removal of completed iocbs from the list
  linux-aio: drop return code from laio_io_unplug and ioq_submit
  linux-aio: rename LaioQueue idx field to "n"
  linux-aio: track whether the queue is blocked
  linux-aio: queue requests that cannot be submitted
  block: drop unused bdrv_clear_incoming_migration_all() prototype
  block: Don't add trailing space in "Formating..." message
  qemu-iotests: Remove traling whitespaces in *.out
  block: vhdx - set .bdrv_has_zero_init to bdrv_has_zero_init_1
  iotests: Fix test 039
  iotests: Filter for "Killed" in qemu-io output
  qemu-io: Add sigraise command
  block: vhdx - change .vhdx_create default block state to ZERO
  block: vhdx - update PAYLOAD_BLOCK_UNMAPPED value to match 1.00 spec
  block: vhdx - remove redundant comments
  block/rbd: fix memory leak
  iotests: Add test for vmdk JSON file names
  vmdk: Fix error for JSON descriptor file names
  block migration: fix return value

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