summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2016-10-27 12:49:02 +0200
committerFam Zheng <famz@redhat.com>2016-10-28 21:50:18 +0800
commit720150f3189648712fc50efd1cca0a39076722a9 (patch)
tree98fff0d27105e27cf4bdf63e33cc54a6218c05b9 /block
parent8dd9006e9b2869b1b4ae3a6f6e9acf249ce5f2f9 (diff)
downloadqemu-720150f3189648712fc50efd1cca0a39076722a9.tar.gz
qemu-720150f3189648712fc50efd1cca0a39076722a9.tar.bz2
qemu-720150f3189648712fc50efd1cca0a39076722a9.zip
block: prepare bdrv_reopen_multiple to release AioContext
After the next patch bdrv_drain_all will have to be called without holding any AioContext. Prepare to do this by adding an AioContext argument to bdrv_reopen_multiple. Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Fam Zheng <famz@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Message-Id: <1477565348-5458-15-git-send-email-pbonzini@redhat.com> Signed-off-by: Fam Zheng <famz@redhat.com>
Diffstat (limited to 'block')
-rw-r--r--block/commit.c2
-rw-r--r--block/replication.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/block/commit.c b/block/commit.c
index 9f67a8b121..499eccaeee 100644
--- a/block/commit.c
+++ b/block/commit.c
@@ -251,7 +251,7 @@ void commit_start(const char *job_id, BlockDriverState *bs,
orig_overlay_flags | BDRV_O_RDWR);
}
if (reopen_queue) {
- bdrv_reopen_multiple(reopen_queue, &local_err);
+ bdrv_reopen_multiple(bdrv_get_aio_context(bs), reopen_queue, &local_err);
if (local_err != NULL) {
error_propagate(errp, local_err);
block_job_unref(&s->common);
diff --git a/block/replication.c b/block/replication.c
index 3bd83565b2..02aeaaf7d0 100644
--- a/block/replication.c
+++ b/block/replication.c
@@ -360,7 +360,8 @@ static void reopen_backing_file(BlockDriverState *bs, bool writable,
}
if (reopen_queue) {
- bdrv_reopen_multiple(reopen_queue, &local_err);
+ bdrv_reopen_multiple(bdrv_get_aio_context(bs),
+ reopen_queue, &local_err);
error_propagate(errp, local_err);
}
}