From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 25 Sep 2018 12:05:08 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
X-Git-Tag: qemu-xen-4.13.0-rc1~659
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=32556acb5a02b39f2bd03fbb57642c49599e86d0;p=qemu-xen.git

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

# gpg: Signature made Tue 25 Sep 2018 04:51:25 BST
# 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:
  curl: Make sslverify=off disable host as well as peer verification.
  block/rbd: add deprecation documentation for filename keyvalue pairs
  block/rbd: add iotest for rbd legacy keyvalue filename parsing
  block/rbd: Attempt to parse legacy filenames
  block/rbd: pull out qemu_rbd_convert_options

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

32556acb5a02b39f2bd03fbb57642c49599e86d0