OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

block/copy-before-write: bdrv_cbw_append(): drop unused compress arg 

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Message-Id: <20210824083856.17408-18-vsementsov@virtuozzo.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2021-08-24 11:38:39 +03:00 committed by Hanna Reitz
parent 5a50742674
commit 4c1e992bf2
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
block/backup.c
View File

@ -452,7 +452,7 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
goto error; goto error;
} }
cbw = bdrv_cbw_append(bs, target, filter_node_name, false, &bcs, errp); cbw = bdrv_cbw_append(bs, target, filter_node_name, &bcs, errp);
if (!cbw) { if (!cbw) {
goto error; goto error;
} }

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

@ -145,7 +145,7 @@ static void cbw_child_perm(BlockDriverState *bs, BdrvChild *c,
} }
static int cbw_init(BlockDriverState *bs, BlockDriverState *source, static int cbw_init(BlockDriverState *bs, BlockDriverState *source,
BlockDriverState *target, bool compress, Error **errp) BlockDriverState *target, Error **errp)
{ {
BDRVCopyBeforeWriteState *s = bs->opaque; BDRVCopyBeforeWriteState *s = bs->opaque;
@ -173,7 +173,7 @@ static int cbw_init(BlockDriverState *bs, BlockDriverState *source,
((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK) & ((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK) &
bs->file->bs->supported_zero_flags); bs->file->bs->supported_zero_flags);
s->bcs = block_copy_state_new(bs->file, s->target, false, compress, errp); s->bcs = block_copy_state_new(bs->file, s->target, false, false, errp);
if (!s->bcs) { if (!s->bcs) {
error_prepend(errp, "Cannot create block-copy-state: "); error_prepend(errp, "Cannot create block-copy-state: ");
return -EINVAL; return -EINVAL;
@ -202,7 +202,6 @@ BlockDriver bdrv_cbw_filter = {
BlockDriverState *bdrv_cbw_append(BlockDriverState *source, BlockDriverState *bdrv_cbw_append(BlockDriverState *source,
BlockDriverState *target, BlockDriverState *target,
const char *filter_node_name, const char *filter_node_name,
bool compress,
BlockCopyState **bcs, BlockCopyState **bcs,
Error **errp) Error **errp)
{ {
@ -221,7 +220,7 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source,
} }
state = top->opaque; state = top->opaque;
ret = cbw_init(top, source, target, compress, errp); ret = cbw_init(top, source, target, errp);
if (ret < 0) { if (ret < 0) {
goto fail; goto fail;
} }

1
block/copy-before-write.h
View File

@ -32,7 +32,6 @@
BlockDriverState *bdrv_cbw_append(BlockDriverState *source, BlockDriverState *bdrv_cbw_append(BlockDriverState *source,
BlockDriverState *target, BlockDriverState *target,
const char *filter_node_name, const char *filter_node_name,
bool compress,
BlockCopyState **bcs, BlockCopyState **bcs,
Error **errp); Error **errp);
void bdrv_cbw_drop(BlockDriverState *bs); void bdrv_cbw_drop(BlockDriverState *bs);