[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 15/33] block/copy-before-write: cbw_init(): rename variables
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v6 15/33] block/copy-before-write: cbw_init(): rename variables |
Date: |
Wed, 21 Jul 2021 13:05:37 +0300 |
One more step closer to real .bdrv_open() handler: use more usual names
for bs being initialized and its state.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
---
block/copy-before-write.c | 29 ++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/block/copy-before-write.c b/block/copy-before-write.c
index a4fee645fd..d7f1833efa 100644
--- a/block/copy-before-write.c
+++ b/block/copy-before-write.c
@@ -144,38 +144,37 @@ static void cbw_child_perm(BlockDriverState *bs,
BdrvChild *c,
}
}
-static int cbw_init(BlockDriverState *top, BlockDriverState *source,
+static int cbw_init(BlockDriverState *bs, BlockDriverState *source,
BlockDriverState *target, bool compress, Error **errp)
{
- BDRVCopyBeforeWriteState *state = top->opaque;
+ BDRVCopyBeforeWriteState *s = bs->opaque;
- top->total_sectors = source->total_sectors;
- top->supported_write_flags = BDRV_REQ_WRITE_UNCHANGED |
+ bs->total_sectors = source->total_sectors;
+ bs->supported_write_flags = BDRV_REQ_WRITE_UNCHANGED |
(BDRV_REQ_FUA & source->supported_write_flags);
- top->supported_zero_flags = BDRV_REQ_WRITE_UNCHANGED |
+ bs->supported_zero_flags = BDRV_REQ_WRITE_UNCHANGED |
((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK) &
source->supported_zero_flags);
bdrv_ref(target);
- state->target = bdrv_attach_child(top, target, "target", &child_of_bds,
- BDRV_CHILD_DATA, errp);
- if (!state->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: ");
return -EINVAL;
}
bdrv_ref(source);
- top->file = bdrv_attach_child(top, source, "file", &child_of_bds,
- BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY,
- errp);
- if (!top->file) {
+ 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: ");
return -EINVAL;
}
- state->bcs = block_copy_state_new(top->file, state->target, false,
compress,
- errp);
- if (!state->bcs) {
+ s->bcs = block_copy_state_new(bs->file, s->target, false, compress, errp);
+ if (!s->bcs) {
error_prepend(errp, "Cannot create block-copy-state: ");
return -EINVAL;
}
--
2.29.2
- [PATCH v6 10/33] block/copy-before-write: relax permission requirements when no parents, (continued)
- [PATCH v6 10/33] block/copy-before-write: relax permission requirements when no parents, Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 07/33] block/block-copy: introduce block_copy_set_copy_opts(), Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 05/33] block: rename backup-top to copy-before-write, Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 13/33] block/copy-before-write: bdrv_cbw_append(): replace child at last, Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 11/33] block/copy-before-write: drop extra bdrv_unref on failure path, Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 16/33] block/copy-before-write: cbw_init(): use file child after attaching, Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 12/33] block/copy-before-write: use file child instead of backing, Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 14/33] block/copy-before-write: introduce cbw_init(), Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 17/33] block/copy-before-write: bdrv_cbw_append(): drop unused compress arg, Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 18/33] block/copy-before-write: cbw_init(): use options, Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 15/33] block/copy-before-write: cbw_init(): rename variables,
Vladimir Sementsov-Ogievskiy <=
- [PATCH v6 19/33] block/copy-before-write: initialize block-copy bitmap, Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 20/33] block/block-copy: make setting progress optional, Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 23/33] python/qemu/machine.py: refactor _qemu_args(), Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 21/33] block/copy-before-write: make public block driver, Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 26/33] iotests/222: fix pylint and mypy complains, Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 22/33] qapi: publish copy-before-write filter, Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 27/33] iotests/222: constantly use single quotes for strings, Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 24/33] python/qemu/machine: QEMUMachine: improve qmp() method, Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 25/33] iotests.py: VM: add own __enter__ method, Vladimir Sementsov-Ogievskiy, 2021/07/21
- [PATCH v6 32/33] iotests/image-fleecing: prepare for adding new test-case, Vladimir Sementsov-Ogievskiy, 2021/07/21