mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block/copy-before-write: cbw_init(): rename variables

Browse Source 
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>
Message-Id: <20210824083856.17408-16-vsementsov@virtuozzo.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2021-08-24 11:38:37 +03:00 committed by Hanna Reitz
parent 1f0cacb967
commit fe7ea40c0e
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
block/copy-before-write.c
View File

@ -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;
}