Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2015-12-18' into queue...
commit9d4a6cf0ea471fb5aeaba9360fec863ef8a0ab44
authorKevin Wolf <kwolf@redhat.com>
Fri, 18 Dec 2015 13:40:35 +0000 (18 14:40 +0100)
committerKevin Wolf <kwolf@redhat.com>
Fri, 18 Dec 2015 13:40:35 +0000 (18 14:40 +0100)
tree4d187ad9aab5ad2528baeecc7c28ee21d0a62274
parentba889444957aaeb073a3a95f5cb2794aa1b222f5
parenta5002d53029df4d7ebaf87c821b3dc07b65e5e52
Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2015-12-18' into queue-block

block-next patches from before the 2.5.0 release.

# gpg: Signature made Fri Dec 18 14:38:44 2015 CET using RSA key ID E838ACAD
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>"

* mreitz/tags/pull-block-for-kevin-2015-12-18:
  block/qapi: allow best-effort query
  qemu-img: abort when full_backing_filename not present
  block/qapi: explicitly warn if !has_full_backing_filename
  block/qapi: always report full_backing_filename
  block/qapi: do not redundantly print "actual path"
  qemu-iotests: s390x: fix test 068
  qemu-iotests: s390x: fix test 051
  qemu-iotests: refine common.config

Signed-off-by: Kevin Wolf <kwolf@redhat.com>