[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 15/42] block: Convert bdrv_pwrite_compressed() to Bdr
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 15/42] block: Convert bdrv_pwrite_compressed() to BdrvChild |
Date: |
Mon, 5 Sep 2016 20:13:27 +0200 |
From: Pavel Butsykin <address@hidden>
Signed-off-by: Pavel Butsykin <address@hidden>
Signed-off-by: Denis V. Lunev <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
CC: Jeff Cody <address@hidden>
CC: Markus Armbruster <address@hidden>
CC: Eric Blake <address@hidden>
CC: John Snow <address@hidden>
CC: Stefan Hajnoczi <address@hidden>
CC: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block/block-backend.c | 2 +-
block/io.c | 3 ++-
include/block/block.h | 2 +-
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);
--
1.8.3.1
- [Qemu-devel] [PULL 04/42] block: Accept node-name for block-commit, (continued)
- [Qemu-devel] [PULL 04/42] block: Accept node-name for block-commit, Kevin Wolf, 2016/09/05
- [Qemu-devel] [PULL 02/42] scsi: scsi-cd without drive property for empty drive, Kevin Wolf, 2016/09/05
- [Qemu-devel] [PULL 03/42] block: Accept node-name for block-stream, Kevin Wolf, 2016/09/05
- [Qemu-devel] [PULL 06/42] block: Accept node-name for blockdev-mirror, Kevin Wolf, 2016/09/05
- [Qemu-devel] [PULL 05/42] block: Accept node-name for blockdev-backup, Kevin Wolf, 2016/09/05
- [Qemu-devel] [PULL 01/42] ide: ide-cd without drive property for empty drive, Kevin Wolf, 2016/09/05
- [Qemu-devel] [PULL 09/42] block: Accept node-name for change-backing-file, Kevin Wolf, 2016/09/05
- [Qemu-devel] [PULL 08/42] block: Accept node-name for blockdev-snapshot-internal-sync, Kevin Wolf, 2016/09/05
- [Qemu-devel] [PULL 12/42] nbd-server: Use a separate BlockBackend, Kevin Wolf, 2016/09/05
- [Qemu-devel] [PULL 07/42] block: Accept node-name for blockdev-snapshot-delete-internal-sync, Kevin Wolf, 2016/09/05
- [Qemu-devel] [PULL 15/42] block: Convert bdrv_pwrite_compressed() to BdrvChild,
Kevin Wolf <=
- [Qemu-devel] [PULL 16/42] block/io: reuse bdrv_co_pwritev() for write compressed, Kevin Wolf, 2016/09/05
- [Qemu-devel] [PULL 19/42] vmdk: add vmdk_co_pwritev_compressed, Kevin Wolf, 2016/09/05
- [Qemu-devel] [PULL 13/42] nbd-server: Allow node name for nbd-server-add, Kevin Wolf, 2016/09/05
- [Qemu-devel] [PULL 14/42] block: switch blk_write_compressed() to byte-based interface, Kevin Wolf, 2016/09/05
- [Qemu-devel] [PULL 10/42] block: Accept node-name for drive-backup, Kevin Wolf, 2016/09/05
- [Qemu-devel] [PULL 11/42] block: Accept node-name for drive-mirror, Kevin Wolf, 2016/09/05
- [Qemu-devel] [PULL 18/42] qcow2: cleanup qcow2_co_pwritev_compressed to avoid the recursion, Kevin Wolf, 2016/09/05
- [Qemu-devel] [PULL 20/42] qcow: add qcow_co_pwritev_compressed, Kevin Wolf, 2016/09/05
- [Qemu-devel] [PULL 17/42] qcow2: add qcow2_co_pwritev_compressed, Kevin Wolf, 2016/09/05
- [Qemu-devel] [PULL 21/42] qcow: cleanup qcow_co_pwritev_compressed to avoid the recursion, Kevin Wolf, 2016/09/05