From: Peter Maydell <peter.maydell@linaro.org>
Date: Wed, 4 Apr 2018 11:33:23 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e5efa1f5f2d32cbfbf18ba84300736503985b593;p=qemu.git

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

# gpg: Signature made Tue 03 Apr 2018 17:10: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:
  gluster: Fix blockdev-add with server.N.type=unix
  blockjob: use qapi enum helpers
  blockjob: leak fix, remove from txn when failing early

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

e5efa1f5f2d32cbfbf18ba84300736503985b593