diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-02-09 17:56:45 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-02-09 17:56:46 +0000 |
| commit | f075c89f0a9cb31daf38892371d2822177505706 (patch) | |
| tree | 72296f7ce1446b3809c749a2e15f4eb76f1aa61f /block | |
| parent | 84c0781103dcbe9b5e5433ba16fbeb55d69d6cb7 (diff) | |
| parent | 9dcf8ecd9e74804aa1687e5688386001a1f3f89f (diff) | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Tue 09 Feb 2016 15:11:25 GMT 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:
block: add missing call to bdrv_drain_recurse
blockjob: Fix hang in block_job_finish_sync
iov: avoid memcpy for "simple" iov_from_buf/iov_to_buf
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block')
| -rw-r--r-- | block/io.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/block/io.c b/block/io.c index 343ff1f233..a69bfc4197 100644 --- a/block/io.c +++ b/block/io.c @@ -301,6 +301,7 @@ void bdrv_drain_all(void) if (bs->job) { block_job_pause(bs->job); } + bdrv_drain_recurse(bs); aio_context_release(aio_context); if (!g_slist_find(aio_ctxs, aio_context)) { |