From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 8 May 2018 16:05:58 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
X-Git-Tag: v3.0.0-rc0~169
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e5cd695266c5709308aa95b1baae499e4b5d4544;p=thirdparty%2Fqemu.git

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

# gpg: Signature made Tue 08 May 2018 16:18:22 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:
  sheepdog: Fix sd_co_create_opts() memory leaks
  iotests: Add test for cancelling a mirror job
  block/mirror: Make cancel always cancel pre-READY
  block/mirror: honor ratelimit again

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

e5cd695266c5709308aa95b1baae499e4b5d4544