mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-07-21 10:24:33 +00:00
block: Remove flags parameter from bdrv_reopen_queue()
Now that all callers are passing all flag changes as QDict options, the flags parameter is no longer necessary, so we can get rid of it. Signed-off-by: Alberto Garcia <berto@igalia.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
3c4e964762
commit
2e891722c5
5
block.c
5
block.c
|
@ -3060,8 +3060,9 @@ static BlockReopenQueue *bdrv_reopen_queue_child(BlockReopenQueue *bs_queue,
|
||||||
|
|
||||||
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 = bdrv_get_flags(bs);
|
||||||
return bdrv_reopen_queue_child(bs_queue, bs, options, flags,
|
return bdrv_reopen_queue_child(bs_queue, bs, options, flags,
|
||||||
NULL, NULL, 0);
|
NULL, NULL, 0);
|
||||||
}
|
}
|
||||||
|
@ -3135,7 +3136,7 @@ int bdrv_reopen_set_read_only(BlockDriverState *bs, bool read_only,
|
||||||
qdict_put_bool(opts, BDRV_OPT_READ_ONLY, read_only);
|
qdict_put_bool(opts, BDRV_OPT_READ_ONLY, read_only);
|
||||||
|
|
||||||
bdrv_subtree_drained_begin(bs);
|
bdrv_subtree_drained_begin(bs);
|
||||||
queue = bdrv_reopen_queue(NULL, bs, opts, bdrv_get_flags(bs));
|
queue = bdrv_reopen_queue(NULL, bs, opts);
|
||||||
ret = bdrv_reopen_multiple(bdrv_get_aio_context(bs), queue, errp);
|
ret = bdrv_reopen_multiple(bdrv_get_aio_context(bs), queue, errp);
|
||||||
bdrv_subtree_drained_end(bs);
|
bdrv_subtree_drained_end(bs);
|
||||||
|
|
||||||
|
|
|
@ -371,19 +371,17 @@ static void reopen_backing_file(BlockDriverState *bs, bool writable,
|
||||||
bdrv_subtree_drained_begin(s->secondary_disk->bs);
|
bdrv_subtree_drained_begin(s->secondary_disk->bs);
|
||||||
|
|
||||||
if (s->orig_hidden_read_only) {
|
if (s->orig_hidden_read_only) {
|
||||||
int flags = bdrv_get_flags(s->hidden_disk->bs);
|
|
||||||
QDict *opts = qdict_new();
|
QDict *opts = qdict_new();
|
||||||
qdict_put_bool(opts, BDRV_OPT_READ_ONLY, !writable);
|
qdict_put_bool(opts, BDRV_OPT_READ_ONLY, !writable);
|
||||||
reopen_queue = bdrv_reopen_queue(reopen_queue, s->hidden_disk->bs,
|
reopen_queue = bdrv_reopen_queue(reopen_queue, s->hidden_disk->bs,
|
||||||
opts, flags);
|
opts);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (s->orig_secondary_read_only) {
|
if (s->orig_secondary_read_only) {
|
||||||
int flags = bdrv_get_flags(s->secondary_disk->bs);
|
|
||||||
QDict *opts = qdict_new();
|
QDict *opts = qdict_new();
|
||||||
qdict_put_bool(opts, BDRV_OPT_READ_ONLY, !writable);
|
qdict_put_bool(opts, BDRV_OPT_READ_ONLY, !writable);
|
||||||
reopen_queue = bdrv_reopen_queue(reopen_queue, s->secondary_disk->bs,
|
reopen_queue = bdrv_reopen_queue(reopen_queue, s->secondary_disk->bs,
|
||||||
opts, flags);
|
opts);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (reopen_queue) {
|
if (reopen_queue) {
|
||||||
|
|
|
@ -299,8 +299,7 @@ BlockDriverState *bdrv_open(const char *filename, const char *reference,
|
||||||
BlockDriverState *bdrv_new_open_driver(BlockDriver *drv, const char *node_name,
|
BlockDriverState *bdrv_new_open_driver(BlockDriver *drv, const char *node_name,
|
||||||
int flags, Error **errp);
|
int flags, Error **errp);
|
||||||
BlockReopenQueue *bdrv_reopen_queue(BlockReopenQueue *bs_queue,
|
BlockReopenQueue *bdrv_reopen_queue(BlockReopenQueue *bs_queue,
|
||||||
BlockDriverState *bs,
|
BlockDriverState *bs, QDict *options);
|
||||||
QDict *options, int flags);
|
|
||||||
int bdrv_reopen_multiple(AioContext *ctx, BlockReopenQueue *bs_queue, Error **errp);
|
int bdrv_reopen_multiple(AioContext *ctx, BlockReopenQueue *bs_queue, Error **errp);
|
||||||
int bdrv_reopen_set_read_only(BlockDriverState *bs, bool read_only,
|
int bdrv_reopen_set_read_only(BlockDriverState *bs, bool read_only,
|
||||||
Error **errp);
|
Error **errp);
|
||||||
|
|
|
@ -2075,7 +2075,7 @@ static int reopen_f(BlockBackend *blk, int argc, char **argv)
|
||||||
}
|
}
|
||||||
|
|
||||||
bdrv_subtree_drained_begin(bs);
|
bdrv_subtree_drained_begin(bs);
|
||||||
brq = bdrv_reopen_queue(NULL, bs, opts, flags);
|
brq = bdrv_reopen_queue(NULL, bs, opts);
|
||||||
bdrv_reopen_multiple(bdrv_get_aio_context(bs), brq, &local_err);
|
bdrv_reopen_multiple(bdrv_get_aio_context(bs), brq, &local_err);
|
||||||
bdrv_subtree_drained_end(bs);
|
bdrv_subtree_drained_end(bs);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue