From: Peter Maydell <peter.maydell@linaro.org>
Date: Wed, 4 Apr 2018 16:48:18 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
X-Git-Tag: v2.12.0-rc2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f1a639aaf2748ad3f804c4d862f570ec6473da79;p=thirdparty%2Fqemu.git

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

# gpg: Signature made Wed 04 Apr 2018 17:07:57 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:
  block/rbd: remove processed options from qdict

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

f1a639aaf2748ad3f804c4d862f570ec6473da79