From: Peter Maydell Date: Wed, 29 Jul 2015 16:08:38 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging X-Git-Tag: v2.4.0-rc3~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=46739a2d7ace71b43cacf73ea71c10429db0d5e8;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging Pull request These fixes make dataplane work again after the notify_me optimization was added. They also solve QEMUBH memory leaks and fix a bug in dataplane's cleanup code. # gpg: Signature made Wed Jul 29 14:50:26 2015 BST using RSA key ID 81AB73C8 # gpg: Good signature from "Stefan Hajnoczi " # gpg: aka "Stefan Hajnoczi " * remotes/stefanha/tags/block-pull-request: AioContext: force event loop iteration using BH AioContext: avoid leaking BHs on cleanup virtio-blk-dataplane: delete bottom half before the AioContext is freed Signed-off-by: Peter Maydell --- 46739a2d7ace71b43cacf73ea71c10429db0d5e8