Commit 720150f3 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Fam Zheng
Browse files

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: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarFam Zheng <famz@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-Id: <1477565348-5458-15-git-send-email-pbonzini@redhat.com>
Signed-off-by: default avatarFam Zheng <famz@redhat.com>
parent 8dd9006e

block.c

+2 −2
Original line number Diff line number Diff line
@@ -2082,7 +2082,7 @@ BlockReopenQueue *bdrv_reopen_queue(BlockReopenQueue *bs_queue, 
 * 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;

    BlockReopenQueueEntry *bs_entry, *next;
@@ -2131,7 +2131,7 @@ int bdrv_reopen(BlockDriverState *bs, int bdrv_flags, Error **errp) 
    Error *local_err = NULL;

    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) {

        error_propagate(errp, local_err);

    }

block/commit.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

block/replication.c

+2 −1
Original line number Diff line number Diff line
@@ -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);

    }

}

include/block/block.h

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ BlockDriverState *bdrv_open(const char *filename, const char *reference, 
BlockReopenQueue *bdrv_reopen_queue(BlockReopenQueue *bs_queue,

                                    BlockDriverState *bs,

                                    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_prepare(BDRVReopenState *reopen_state,

                        BlockReopenQueue *queue, Error **errp);

qemu-io-cmds.c

+1 −1
Original line number Diff line number Diff line
@@ -1956,7 +1956,7 @@ static int reopen_f(BlockBackend *blk, int argc, char **argv) 
    qemu_opts_reset(&reopen_opts);



    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) {

        error_report_err(local_err);

    } else {