diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-07-29 17:08:38 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-07-29 17:08:38 +0100 |
| commit | 46739a2d7ace71b43cacf73ea71c10429db0d5e8 (patch) | |
| tree | bdf284e97b877f7a9941ac6dd8537ba047677b70 /include | |
| parent | b83d017d88b2c4710c7a4614ecf9f845e4db80ba (diff) | |
| parent | ca96ac44dcd290566090b2435bc828fded356ad9 (diff) | |
| download | qemu-46739a2d7ace71b43cacf73ea71c10429db0d5e8.zip qemu-46739a2d7ace71b43cacf73ea71c10429db0d5e8.tar.gz qemu-46739a2d7ace71b43cacf73ea71c10429db0d5e8.tar.bz2 | |
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 <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
* 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 <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/block/aio.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/block/aio.h b/include/block/aio.h index 9dd32e0..400b1b0 100644 --- a/include/block/aio.h +++ b/include/block/aio.h @@ -114,6 +114,9 @@ struct AioContext { bool notified; EventNotifier notifier; + /* Scheduling this BH forces the event loop it iterate */ + QEMUBH *notify_dummy_bh; + /* Thread pool for performing work and receiving completion callbacks */ struct ThreadPool *thread_pool; |