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>
This commit is contained in:
parent
8dd9006e9b
commit
720150f318
4
block.c
4
block.c
|
@ -2082,7 +2082,7 @@ BlockReopenQueue *bdrv_reopen_queue(BlockReopenQueue *bs_queue,
|
||||||
* to all devices.
|
* to all devices.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
int bdrv_reopen_multiple(BlockReopenQueue *bs_queue, Error **errp)
|
int bdrv_reopen_multiple(AioContext *ctx, BlockReopenQueue *bs_queue, Error **errp)
|
||||||
{
|
{
|
||||||
int ret = -1;
|
int ret = -1;
|
||||||
BlockReopenQueueEntry *bs_entry, *next;
|
BlockReopenQueueEntry *bs_entry, *next;
|
||||||
|
@ -2131,7 +2131,7 @@ int bdrv_reopen(BlockDriverState *bs, int bdrv_flags, Error **errp)
|
||||||
Error *local_err = NULL;
|
Error *local_err = NULL;
|
||||||
BlockReopenQueue *queue = bdrv_reopen_queue(NULL, bs, NULL, bdrv_flags);
|
BlockReopenQueue *queue = bdrv_reopen_queue(NULL, bs, NULL, bdrv_flags);
|
||||||
|
|
||||||
ret = bdrv_reopen_multiple(queue, &local_err);
|
ret = bdrv_reopen_multiple(bdrv_get_aio_context(bs), queue, &local_err);
|
||||||
if (local_err != NULL) {
|
if (local_err != NULL) {
|
||||||
error_propagate(errp, local_err);
|
error_propagate(errp, local_err);
|
||||||
}
|
}
|
||||||
|
|
|
@ -251,7 +251,7 @@ void commit_start(const char *job_id, BlockDriverState *bs,
|
||||||
orig_overlay_flags | BDRV_O_RDWR);
|
orig_overlay_flags | BDRV_O_RDWR);
|
||||||
}
|
}
|
||||||
if (reopen_queue) {
|
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) {
|
if (local_err != NULL) {
|
||||||
error_propagate(errp, local_err);
|
error_propagate(errp, local_err);
|
||||||
block_job_unref(&s->common);
|
block_job_unref(&s->common);
|
||||||
|
|
|
@ -360,7 +360,8 @@ static void reopen_backing_file(BlockDriverState *bs, bool writable,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (reopen_queue) {
|
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);
|
error_propagate(errp, local_err);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -218,7 +218,7 @@ BlockDriverState *bdrv_open(const char *filename, const char *reference,
|
||||||
BlockReopenQueue *bdrv_reopen_queue(BlockReopenQueue *bs_queue,
|
BlockReopenQueue *bdrv_reopen_queue(BlockReopenQueue *bs_queue,
|
||||||
BlockDriverState *bs,
|
BlockDriverState *bs,
|
||||||
QDict *options, int flags);
|
QDict *options, int flags);
|
||||||
int bdrv_reopen_multiple(BlockReopenQueue *bs_queue, Error **errp);
|
int bdrv_reopen_multiple(AioContext *ctx, BlockReopenQueue *bs_queue, Error **errp);
|
||||||
int bdrv_reopen(BlockDriverState *bs, int bdrv_flags, Error **errp);
|
int bdrv_reopen(BlockDriverState *bs, int bdrv_flags, Error **errp);
|
||||||
int bdrv_reopen_prepare(BDRVReopenState *reopen_state,
|
int bdrv_reopen_prepare(BDRVReopenState *reopen_state,
|
||||||
BlockReopenQueue *queue, Error **errp);
|
BlockReopenQueue *queue, Error **errp);
|
||||||
|
|
|
@ -1956,7 +1956,7 @@ static int reopen_f(BlockBackend *blk, int argc, char **argv)
|
||||||
qemu_opts_reset(&reopen_opts);
|
qemu_opts_reset(&reopen_opts);
|
||||||
|
|
||||||
brq = bdrv_reopen_queue(NULL, bs, opts, flags);
|
brq = bdrv_reopen_queue(NULL, bs, opts, flags);
|
||||||
bdrv_reopen_multiple(brq, &local_err);
|
bdrv_reopen_multiple(bdrv_get_aio_context(bs), brq, &local_err);
|
||||||
if (local_err) {
|
if (local_err) {
|
||||||
error_report_err(local_err);
|
error_report_err(local_err);
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue