[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v5 12/16] block: Remove flags parameter from bdrv_re
From: |
Alberto Garcia |
Subject: |
[Qemu-block] [PATCH v5 12/16] block: Remove flags parameter from bdrv_reopen_queue() |
Date: |
Mon, 12 Nov 2018 16:00:44 +0200 |
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 <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
block.c | 5 +++--
block/replication.c | 6 ++----
include/block/block.h | 3 +--
qemu-io-cmds.c | 2 +-
4 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/block.c b/block.c
index 31de7b2299..8b401e1cf4 100644
--- a/block.c
+++ b/block.c
@@ -3041,8 +3041,9 @@ static BlockReopenQueue
*bdrv_reopen_queue_child(BlockReopenQueue *bs_queue,
BlockReopenQueue *bdrv_reopen_queue(BlockReopenQueue *bs_queue,
BlockDriverState *bs,
- QDict *options, int flags)
+ QDict *options)
{
+ int flags = bdrv_get_flags(bs);
return bdrv_reopen_queue_child(bs_queue, bs, options, flags,
NULL, NULL, 0);
}
@@ -3116,7 +3117,7 @@ int bdrv_reopen_set_read_only(BlockDriverState *bs, bool
read_only,
qdict_put_bool(opts, BDRV_OPT_READ_ONLY, read_only);
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);
bdrv_subtree_drained_end(bs);
diff --git a/block/replication.c b/block/replication.c
index 481a225924..fdbfe47fa4 100644
--- a/block/replication.c
+++ b/block/replication.c
@@ -393,19 +393,17 @@ static void reopen_backing_file(BlockDriverState *bs,
bool writable,
bdrv_subtree_drained_begin(s->secondary_disk->bs);
if (s->orig_hidden_read_only) {
- int flags = bdrv_get_flags(s->hidden_disk->bs);
QDict *opts = qdict_new();
qdict_put_bool(opts, BDRV_OPT_READ_ONLY, !writable);
reopen_queue = bdrv_reopen_queue(reopen_queue, s->hidden_disk->bs,
- opts, flags);
+ opts);
}
if (s->orig_secondary_read_only) {
- int flags = bdrv_get_flags(s->secondary_disk->bs);
QDict *opts = qdict_new();
qdict_put_bool(opts, BDRV_OPT_READ_ONLY, !writable);
reopen_queue = bdrv_reopen_queue(reopen_queue, s->secondary_disk->bs,
- opts, flags);
+ opts);
}
if (reopen_queue) {
diff --git a/include/block/block.h b/include/block/block.h
index de72c7a093..f70a843b72 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -299,8 +299,7 @@ BlockDriverState *bdrv_open(const char *filename, const
char *reference,
BlockDriverState *bdrv_new_open_driver(BlockDriver *drv, const char *node_name,
int flags, Error **errp);
BlockReopenQueue *bdrv_reopen_queue(BlockReopenQueue *bs_queue,
- BlockDriverState *bs,
- QDict *options, int flags);
+ BlockDriverState *bs, QDict *options);
int bdrv_reopen_multiple(AioContext *ctx, BlockReopenQueue *bs_queue, Error
**errp);
int bdrv_reopen_set_read_only(BlockDriverState *bs, bool read_only,
Error **errp);
diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c
index c9ae09d574..2c39124036 100644
--- a/qemu-io-cmds.c
+++ b/qemu-io-cmds.c
@@ -2075,7 +2075,7 @@ static int reopen_f(BlockBackend *blk, int argc, char
**argv)
}
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_subtree_drained_end(bs);
--
2.11.0
- Re: [Qemu-block] [PATCH v5 05/16] block: Use bdrv_reopen_set_read_only() in stream_start/complete(), (continued)
- [Qemu-block] [PATCH v5 08/16] block: Use bdrv_reopen_set_read_only() in the mirror driver, Alberto Garcia, 2018/11/12
- [Qemu-block] [PATCH v5 15/16] block: Assert that flags are up-to-date in bdrv_reopen_prepare(), Alberto Garcia, 2018/11/12
- [Qemu-block] [PATCH v5 06/16] block: Use bdrv_reopen_set_read_only() in qmp_change_backing_file(), Alberto Garcia, 2018/11/12
- [Qemu-block] [PATCH v5 11/16] block: Clean up reopen_backing_file() in block/replication.c, Alberto Garcia, 2018/11/12
- [Qemu-block] [PATCH v5 16/16] block: Fix update of BDRV_O_AUTO_RDONLY in update_flags_from_options(), Alberto Garcia, 2018/11/12
- [Qemu-block] [PATCH v5 02/16] block: Use bdrv_reopen_set_read_only() in bdrv_backing_update_filename(), Alberto Garcia, 2018/11/12
- [Qemu-block] [PATCH v5 03/16] block: Use bdrv_reopen_set_read_only() in commit_start/complete(), Alberto Garcia, 2018/11/12
- [Qemu-block] [PATCH v5 13/16] block: Stop passing flags to bdrv_reopen_queue_child(), Alberto Garcia, 2018/11/12
- [Qemu-block] [PATCH v5 12/16] block: Remove flags parameter from bdrv_reopen_queue(),
Alberto Garcia <=
- [Qemu-block] [PATCH v5 09/16] block: Drop bdrv_reopen(), Alberto Garcia, 2018/11/12
- [Qemu-block] [PATCH v5 14/16] block: Remove assertions from update_flags_from_options(), Alberto Garcia, 2018/11/12
- [Qemu-block] [PATCH v5 10/16] qemu-io: Put flag changes in the options QDict in reopen_f(), Alberto Garcia, 2018/11/12
- [Qemu-block] [PATCH v5 07/16] block: Use bdrv_reopen_set_read_only() in external_snapshot_commit(), Alberto Garcia, 2018/11/12
- [Qemu-block] [PATCH v5 04/16] block: Use bdrv_reopen_set_read_only() in bdrv_commit(), Alberto Garcia, 2018/11/12
- [Qemu-block] [PATCH v5 01/16] block: Add bdrv_reopen_set_read_only(), Alberto Garcia, 2018/11/12
- Re: [Qemu-block] [PATCH v5 00/16] Don't pass flags to bdrv_reopen_queue(), Kevin Wolf, 2018/11/20
- Re: [Qemu-block] [PATCH v5 00/16] Don't pass flags to bdrv_reopen_queue(), Kevin Wolf, 2018/11/21