aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Butsykin <pbutsykin@virtuozzo.com>2016-07-22 11:17:41 +0300
committerKevin Wolf <kwolf@redhat.com>2016-09-05 19:06:47 +0200
commit751e2f0698c284b4924d83ec63fa4e834bf4c80d (patch)
tree932c356b0bf2308e2eb550e21f4187342f5ebb25
parentfe5c1355e73940dbde9b38dec6e8fab4117ec637 (diff)
downloadqemu-751e2f0698c284b4924d83ec63fa4e834bf4c80d.zip
qemu-751e2f0698c284b4924d83ec63fa4e834bf4c80d.tar.gz
qemu-751e2f0698c284b4924d83ec63fa4e834bf4c80d.tar.bz2
block: Convert bdrv_pwrite_compressed() to BdrvChild
Signed-off-by: Pavel Butsykin <pbutsykin@virtuozzo.com> Signed-off-by: Denis V. Lunev <den@openvz.org> Reviewed-by: Eric Blake <eblake@redhat.com> CC: Jeff Cody <jcody@redhat.com> CC: Markus Armbruster <armbru@redhat.com> CC: Eric Blake <eblake@redhat.com> CC: John Snow <jsnow@redhat.com> CC: Stefan Hajnoczi <stefanha@redhat.com> CC: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--block/block-backend.c2
-rw-r--r--block/io.c3
-rw-r--r--include/block/block.h2
3 files changed, 4 insertions, 3 deletions
diff --git a/block/block-backend.c b/block/block-backend.c
index 4c704a1..76ea459 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -1493,7 +1493,7 @@ int blk_pwrite_compressed(BlockBackend *blk, int64_t offset, const void *buf,
return ret;
}
- return bdrv_pwrite_compressed(blk_bs(blk), offset, buf, count);
+ return bdrv_pwrite_compressed(blk->root, offset, buf, count);
}
int blk_truncate(BlockBackend *blk, int64_t offset)
diff --git a/block/io.c b/block/io.c
index da874d0..c528fea 100644
--- a/block/io.c
+++ b/block/io.c
@@ -1868,9 +1868,10 @@ int bdrv_is_allocated_above(BlockDriverState *top,
return 0;
}
-int bdrv_pwrite_compressed(BlockDriverState *bs, int64_t offset,
+int bdrv_pwrite_compressed(BdrvChild *child, int64_t offset,
const void *buf, int bytes)
{
+ BlockDriverState *bs = child->bs;
BlockDriver *drv = bs->drv;
int ret;
diff --git a/include/block/block.h b/include/block/block.h
index b4a97f2..7bb5ddb 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -399,7 +399,7 @@ const char *bdrv_get_node_name(const BlockDriverState *bs);
const char *bdrv_get_device_name(const BlockDriverState *bs);
const char *bdrv_get_device_or_node_name(const BlockDriverState *bs);
int bdrv_get_flags(BlockDriverState *bs);
-int bdrv_pwrite_compressed(BlockDriverState *bs, int64_t offset,
+int bdrv_pwrite_compressed(BdrvChild *child, int64_t offset,
const void *buf, int bytes);
int bdrv_get_info(BlockDriverState *bs, BlockDriverInfo *bdi);
ImageInfoSpecific *bdrv_get_specific_info(BlockDriverState *bs);