Commit 5019aece authored by Alberto Garcia's avatar Alberto Garcia Committed by Kevin Wolf
Browse files

block: Remove the AioContext parameter from bdrv_reopen_multiple() 



This parameter has been unused since 1a63a907

Signed-off-by: default avatarAlberto Garcia <berto@igalia.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent faf116b4

block.c

+2 −2
Original line number Diff line number Diff line
@@ -3254,7 +3254,7 @@ BlockReopenQueue *bdrv_reopen_queue(BlockReopenQueue *bs_queue, 
 * All affected nodes must be drained between bdrv_reopen_queue() and

 * bdrv_reopen_multiple().

 */

int bdrv_reopen_multiple(AioContext *ctx, BlockReopenQueue *bs_queue, Error **errp)

int bdrv_reopen_multiple(BlockReopenQueue *bs_queue, Error **errp)

{

    int ret = -1;

    BlockReopenQueueEntry *bs_entry, *next;
@@ -3347,7 +3347,7 @@ int bdrv_reopen_set_read_only(BlockDriverState *bs, bool read_only, 


    bdrv_subtree_drained_begin(bs);

    queue = bdrv_reopen_queue(NULL, bs, opts, true);

    ret = bdrv_reopen_multiple(bdrv_get_aio_context(bs), queue, errp);

    ret = bdrv_reopen_multiple(queue, errp);

    bdrv_subtree_drained_end(bs);



    return ret;

block/replication.c

+1 −2
Original line number Diff line number Diff line
@@ -385,8 +385,7 @@ static void reopen_backing_file(BlockDriverState *bs, bool writable, 
    }



    if (reopen_queue) {

        bdrv_reopen_multiple(bdrv_get_aio_context(bs),

                             reopen_queue, &local_err);

        bdrv_reopen_multiple(reopen_queue, &local_err);

        error_propagate(errp, local_err);

    }

include/block/block.h

+1 −1
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ BlockDriverState *bdrv_new_open_driver(BlockDriver *drv, const char *node_name, 
BlockReopenQueue *bdrv_reopen_queue(BlockReopenQueue *bs_queue,

                                    BlockDriverState *bs, QDict *options,

                                    bool keep_old_opts);

int bdrv_reopen_multiple(AioContext *ctx, BlockReopenQueue *bs_queue, Error **errp);

int bdrv_reopen_multiple(BlockReopenQueue *bs_queue, Error **errp);

int bdrv_reopen_set_read_only(BlockDriverState *bs, bool read_only,

                              Error **errp);

int bdrv_reopen_prepare(BDRVReopenState *reopen_state,

qemu-io-cmds.c

+1 −1
Original line number Diff line number Diff line
@@ -2081,7 +2081,7 @@ static int reopen_f(BlockBackend *blk, int argc, char **argv) 


    bdrv_subtree_drained_begin(bs);

    brq = bdrv_reopen_queue(NULL, bs, opts, true);

    bdrv_reopen_multiple(bdrv_get_aio_context(bs), brq, &local_err);

    bdrv_reopen_multiple(brq, &local_err);

    bdrv_subtree_drained_end(bs);



    if (local_err) {