From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 18 Apr 2017 15:18:15 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/famz/tags/block-pull-request' into staging
X-Git-Tag: v2.9.0-rc5~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d1263f8f1805ffe6a9da8520a6aa96062bc794f4;p=thirdparty%2Fqemu.git

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

# gpg: Signature made Tue 18 Apr 2017 15:58:32 BST
# gpg:                using RSA key 0xCA35624C6A9171C6
# gpg: Good signature from "Fam Zheng <famz@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 5003 7CB7 9706 0F76 F021  AD56 CA35 624C 6A91 71C6

* remotes/famz/tags/block-pull-request:
  block: Drain BH in bdrv_drained_begin
  block: Walk bs->children carefully in bdrv_drain_recurse

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

d1263f8f1805ffe6a9da8520a6aa96062bc794f4