[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v5 08/15] block: remove BlockDriver.bdrv_write_compr
From: |
Denis V. Lunev |
Subject: |
[Qemu-block] [PATCH v5 08/15] block: remove BlockDriver.bdrv_write_compressed |
Date: |
Mon, 4 Jul 2016 15:28:19 +0300 |
From: Pavel Butsykin <address@hidden>
There are no block drivers left that implement the old
.bdrv_write_compressed interface, so it can be removed. Also now we have
no need to use the bdrv_pwrite_compressed function and we can remove it
entirely.
Signed-off-by: Pavel Butsykin <address@hidden>
Signed-off-by: Denis V. Lunev <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>
---
block/block-backend.c | 8 ++------
block/io.c | 31 -------------------------------
include/block/block.h | 2 --
include/block/block_int.h | 3 ---
qemu-img.c | 2 +-
5 files changed, 3 insertions(+), 43 deletions(-)
diff --git a/block/block-backend.c b/block/block-backend.c
index 3c1fc50..a6c212a 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -1480,12 +1480,8 @@ int coroutine_fn blk_co_pwrite_zeroes(BlockBackend *blk,
int64_t offset,
int blk_pwrite_compressed(BlockBackend *blk, int64_t offset, const void *buf,
int count)
{
- int ret = blk_check_byte_request(blk, offset, count);
- if (ret < 0) {
- return ret;
- }
-
- return bdrv_pwrite_compressed(blk_bs(blk), offset, buf, count);
+ return blk_prw(blk, offset, (void *) buf, count, blk_write_entry,
+ BDRV_REQ_WRITE_COMPRESSED);
}
int blk_truncate(BlockBackend *blk, int64_t offset)
diff --git a/block/io.c b/block/io.c
index 49742eb..82ba079 100644
--- a/block/io.c
+++ b/block/io.c
@@ -1843,37 +1843,6 @@ int bdrv_is_allocated_above(BlockDriverState *top,
return 0;
}
-int bdrv_pwrite_compressed(BlockDriverState *bs, int64_t offset,
- const void *buf, int bytes)
-{
- QEMUIOVector qiov;
- struct iovec iov;
- BlockDriver *drv = bs->drv;
-
- if (!drv) {
- return -ENOMEDIUM;
- }
-
- if (drv->bdrv_write_compressed) {
- int ret = bdrv_check_byte_request(bs, offset, bytes);
- if (ret < 0) {
- return ret;
- }
- assert(QLIST_EMPTY(&bs->dirty_bitmaps));
- assert((offset & (BDRV_SECTOR_SIZE - 1)) == 0);
- assert((bytes & (BDRV_SECTOR_SIZE - 1)) == 0);
- return drv->bdrv_write_compressed(bs, offset >> BDRV_SECTOR_BITS, buf,
- bytes >> BDRV_SECTOR_BITS);
- }
- iov = (struct iovec) {
- .iov_base = (void *)buf,
- .iov_len = bytes,
- };
- qemu_iovec_init_external(&qiov, &iov, 1);
-
- return bdrv_prwv_co(bs, offset, &qiov, true, BDRV_REQ_WRITE_COMPRESSED);
-}
-
typedef struct BdrvVmstateCo {
BlockDriverState *bs;
QEMUIOVector *qiov;
diff --git a/include/block/block.h b/include/block/block.h
index 0d01ffd..bbc0a7b 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -402,8 +402,6 @@ 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,
- const void *buf, int bytes);
int bdrv_get_info(BlockDriverState *bs, BlockDriverInfo *bdi);
ImageInfoSpecific *bdrv_get_specific_info(BlockDriverState *bs);
void bdrv_round_sectors_to_clusters(BlockDriverState *bs,
diff --git a/include/block/block_int.h b/include/block/block_int.h
index 17a5efe..d8048e3 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -204,9 +204,6 @@ struct BlockDriver {
bool has_variable_length;
int64_t (*bdrv_get_allocated_file_size)(BlockDriverState *bs);
- int (*bdrv_write_compressed)(BlockDriverState *bs, int64_t sector_num,
- const uint8_t *buf, int nb_sectors);
-
int coroutine_fn (*bdrv_co_pwritev_compressed)(BlockDriverState *bs,
uint64_t offset, uint64_t bytes, QEMUIOVector *qiov);
diff --git a/qemu-img.c b/qemu-img.c
index 7bb1cfc..d90bac6 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -2023,7 +2023,7 @@ static int img_convert(int argc, char **argv)
const char *preallocation =
qemu_opt_get(opts, BLOCK_OPT_PREALLOC);
- if (!drv->bdrv_write_compressed && !drv->bdrv_co_pwritev_compressed) {
+ if (!drv->bdrv_co_pwritev_compressed) {
error_report("Compression not supported for this file format");
ret = -1;
goto out;
--
2.1.4
- [Qemu-block] [PATCH v5 02/15] block/io: reuse bdrv_co_pwritev() for write compressed, (continued)
- [Qemu-block] [PATCH v5 02/15] block/io: reuse bdrv_co_pwritev() for write compressed, Denis V. Lunev, 2016/07/04
- [Qemu-block] [PATCH v5 03/15] qcow2: add qcow2_co_pwritev_compressed, Denis V. Lunev, 2016/07/04
- [Qemu-block] [PATCH v5 05/15] vmdk: add vmdk_co_pwritev_compressed, Denis V. Lunev, 2016/07/04
- [Qemu-block] [PATCH v5 01/15] block: switch blk_write_compressed() to byte-based interface, Denis V. Lunev, 2016/07/04
- [Qemu-block] [PATCH v5 06/15] qcow: add qcow_co_pwritev_compressed, Denis V. Lunev, 2016/07/04
- [Qemu-block] [PATCH v5 07/15] qcow: cleanup qcow_co_pwritev_compressed to avoid the recursion, Denis V. Lunev, 2016/07/04
- [Qemu-block] [PATCH v5 09/15] block/io: turn on dirty_bitmaps for the compressed writes, Denis V. Lunev, 2016/07/04
- [Qemu-block] [PATCH v5 08/15] block: remove BlockDriver.bdrv_write_compressed,
Denis V. Lunev <=
- [Qemu-block] [PATCH v5 10/15] block: simplify drive-backup, Denis V. Lunev, 2016/07/04
- [Qemu-block] [PATCH v5 11/15] block: simplify blockdev-backup, Denis V. Lunev, 2016/07/04
- [Qemu-block] [PATCH v5 13/15] blockdev-backup: added support for data compression, Denis V. Lunev, 2016/07/04
- [Qemu-block] [PATCH v5 12/15] drive-backup: added support for data compression, Denis V. Lunev, 2016/07/04