From: Peter Maydell <peter.maydell@linaro.org>
Date: Wed, 20 Apr 2016 13:42:09 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
X-Git-Tag: qemu-xen-4.8.0-rc1~305
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=fe98b18b6f8c1324b4940a6a1f1bf8d847c9d569;p=qemu-xen.git

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

# gpg: Signature made Tue 19 Apr 2016 17:28:01 BST using RSA key ID C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg:                 aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg:                 aka "Jeffrey Cody <codyprime@gmail.com>"

* remotes/cody/tags/block-pull-request:
  block/gluster: prevent data loss after i/o error
  block/gluster: code movement of qemu_gluster_close()
  block/gluster: return correct error value

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

fe98b18b6f8c1324b4940a6a1f1bf8d847c9d569