[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 16/21] block/copy-before-write: cbw_init(): use options
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH 16/21] block/copy-before-write: cbw_init(): use options |
Date: |
Mon, 17 May 2021 09:44:23 +0300 |
One more step closer to .bdrv_open(): use options instead of plain
arguments. Move to bdrv_open_child() calls, native for drive open
handlers.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
block/copy-before-write.c | 37 ++++++++++++++++++++-----------------
1 file changed, 20 insertions(+), 17 deletions(-)
diff --git a/block/copy-before-write.c b/block/copy-before-write.c
index ddd79b3686..9ff1bf676c 100644
--- a/block/copy-before-write.c
+++ b/block/copy-before-write.c
@@ -144,27 +144,20 @@ static void cbw_child_perm(BlockDriverState *bs,
BdrvChild *c,
}
}
-static int cbw_init(BlockDriverState *bs, BlockDriverState *source,
- BlockDriverState *target, bool compress, Error **errp)
+static int cbw_init(BlockDriverState *bs, QDict *options, Error **errp)
{
BDRVCopyBeforeWriteState *s = bs->opaque;
- bdrv_ref(target);
- s->target = bdrv_attach_child(bs, target, "target", &child_of_bds,
- BDRV_CHILD_DATA, errp);
- if (!s->target) {
- error_prepend(errp, "Cannot attach target child: ");
- bdrv_unref(target);
+ bs->file = bdrv_open_child(NULL, options, "file", bs, &child_of_bds,
+ BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY,
+ false, errp);
+ if (!bs->file) {
return -EINVAL;
}
- bdrv_ref(source);
- bs->file = bdrv_attach_child(bs, source, "file", &child_of_bds,
- BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY,
- errp);
- if (!bs->file) {
- error_prepend(errp, "Cannot attach file child: ");
- bdrv_unref(source);
+ s->target = bdrv_open_child(NULL, options, "target", bs, &child_of_bds,
+ BDRV_CHILD_DATA, false, errp);
+ if (!s->target) {
return -EINVAL;
}
@@ -175,7 +168,10 @@ static int cbw_init(BlockDriverState *bs, BlockDriverState
*source,
((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK) &
bs->file->bs->supported_zero_flags);
- s->bcs = block_copy_state_new(bs->file, s->target, false, compress, errp);
+ qdict_del(options, "cluster-size");
+ s->bcs = block_copy_state_new(bs->file, s->target, false,
+ qdict_get_try_bool(options, "x-deprecated-compress", false), errp);
+ qdict_del(options, "x-deprecated-compress");
if (!s->bcs) {
error_prepend(errp, "Cannot create block-copy-state: ");
return -EINVAL;
@@ -212,6 +208,7 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source,
int ret;
BDRVCopyBeforeWriteState *state;
BlockDriverState *top;
+ QDict *opts;
assert(source->total_sectors == target->total_sectors);
@@ -223,7 +220,13 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source,
}
state = top->opaque;
- ret = cbw_init(top, source, target, compress, errp);
+ opts = qdict_new();
+ qdict_put_str(opts, "file", bdrv_get_node_name(source));
+ qdict_put_str(opts, "target", bdrv_get_node_name(target));
+ qdict_put_bool(opts, "x-deprecated-compress", compress);
+
+ ret = cbw_init(top, opts, errp);
+ qobject_unref(opts);
if (ret < 0) {
goto fail;
}
--
2.29.2
- [PATCH 08/21] block/backup: stricter backup_calculate_cluster_size(), (continued)
[PATCH 15/21] block/copy-before-write: cbw_init(): use file child after attaching, Vladimir Sementsov-Ogievskiy, 2021/05/17
[PATCH 19/21] block/copy-before-write: make public block driver, Vladimir Sementsov-Ogievskiy, 2021/05/17
[PATCH 20/21] qapi: publish copy-before-write filter, Vladimir Sementsov-Ogievskiy, 2021/05/17