Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
commit6b4e463ff35284a3c02c5ceab3351bb07137c77c
authorPeter Maydell <peter.maydell@linaro.org>
Sun, 26 Feb 2017 12:26:37 +0000 (26 12:26 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Sun, 26 Feb 2017 12:26:37 +0000 (26 12:26 +0000)
tree607bb2713ae1bb9e6c9c00185bf8949a3a3a0f4c
parent6528a4c1f20c1ba5a22ab84bec6788a574ac04c8
parentd185cf0ec64cd183218ca7e0810d9130c96ebebc
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

Block layer patches

# gpg: Signature made Fri 24 Feb 2017 18:08:26 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:
  tests: Use opened block node for block job tests
  vvfat: Use opened node as backing file
  block: Add bdrv_new_open_driver()
  block: Factor out bdrv_open_driver()
  block: Use BlockBackend for image probing
  block: Factor out bdrv_open_child_bs()
  block: Attach bs->file only during .bdrv_open()
  block: Pass BdrvChild to bdrv_truncate()
  mirror: Resize active commit base in mirror_run()
  qcow2: Use BB for resizing in qcow2_amend_options()
  blockdev: Use BlockBackend to resize in qmp_block_resize()
  iotests: Fix another race in 030
  qemu-img: Improve documentation for PREALLOC_MODE_FALLOC
  qemu-img: Truncate before full preallocation
  qemu-img: Add tests for raw image preallocation
  qemu-img: Do not truncate before preallocation
  qemu-iotests: redirect nbd server stdout to /dev/null
  qemu-iotests: add ability to exclude certain protocols from tests
  qemu-iotests: Test 137 only supports 'file' protocol

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