diff options
| -rw-r--r-- | block.c | 4 | ||||
| -rw-r--r-- | block/replication.c | 3 | ||||
| -rw-r--r-- | include/block/block.h | 2 | ||||
| -rw-r--r-- | qemu-io-cmds.c | 2 |
4 files changed, 5 insertions, 6 deletions
@@ -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; diff --git a/block/replication.c b/block/replication.c index a2f3590310..b95bd28802 100644 --- a/block/replication.c +++ b/block/replication.c @@ -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); } diff --git a/include/block/block.h b/include/block/block.h index 68a3efbb43..e452988b66 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -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, diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c index ff9a5cd80f..35dcdcf413 100644 --- a/qemu-io-cmds.c +++ b/qemu-io-cmds.c @@ -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) { |