From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 13 Mar 2018 18:29:28 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
X-Git-Tag: v2.12.0-rc0~23
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3a2e46ae1de4f45b88211306a2b6c0c5efd368ab;p=qemu-xen-unstable.git

Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging

# gpg: Signature made Tue 13 Mar 2018 12:28:21 GMT
# gpg:                using RSA key BDBE7B27C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg:                 aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg:                 aka "Jeffrey Cody <codyprime@gmail.com>"
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98  D624 BDBE 7B27 C0DE 3057

* remotes/cody/tags/block-pull-request:
  block: include original filename when reporting invalid URIs

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

3a2e46ae1de4f45b88211306a2b6c0c5efd368ab