From: Pavel Butsykin <pbutsy...@virtuozzo.com>
There are no block drivers left that implement the old
.bdrv_write_compressed interface, so it can be removed now.
Signed-off-by: Pavel Butsykin <pbutsy...@virtuozzo.com>
Signed-off-by: Denis V. Lunev <d...@openvz.org>
CC: Jeff Cody <jc...@redhat.com>
CC: Markus Armbruster <arm...@redhat.com>
CC: Eric Blake <ebl...@redhat.com>
CC: John Snow <js...@redhat.com>
CC: Stefan Hajnoczi <stefa...@redhat.com>
CC: Kevin Wolf <kw...@redhat.com>
---
block/io.c | 15 ---------------
include/block/block_int.h | 3 ---
qemu-img.c | 2 +-
3 files changed, 1 insertion(+), 19 deletions(-)
diff --git a/block/io.c b/block/io.c
index 54cd9a4..4b06de8 100644
--- a/block/io.c
+++ b/block/io.c
@@ -1825,7 +1825,6 @@ int bdrv_pwrite_compressed(BlockDriverState *bs, int64_t
offset,
{
BdrvWriteCompressedCo data;
QEMUIOVector qiov;
- BlockDriver *drv = bs->drv;
struct iovec iov = {
.iov_base = (void *)buf,
.iov_len = count,
@@ -1839,20 +1838,6 @@ int bdrv_pwrite_compressed(BlockDriverState *bs, int64_t
offset,
.ret = -EINPROGRESS,
};
- if (!drv) {
- return -ENOMEDIUM;
- }
-
- if (drv->bdrv_write_compressed) {
- int ret = bdrv_check_byte_request(bs, offset, count);
- if (ret < 0) {
- return ret;
- }
- assert(QLIST_EMPTY(&bs->dirty_bitmaps));
- return drv->bdrv_write_compressed(bs, offset >> BDRV_SECTOR_BITS, buf,
- count >> BDRV_SECTOR_BITS);
- }
-
if (qemu_in_coroutine()) {
/* Fast-path if already in coroutine context */
bdrv_write_compressed_co_entry(&data);
diff --git a/include/block/block_int.h b/include/block/block_int.h
index ccba9c9..09b9002 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_write_compressed)(BlockDriverState *bs,
int64_t sector_num, int nb_sectors, QEMUIOVector *qiov);
diff --git a/qemu-img.c b/qemu-img.c
index ab54027..8195b93 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -2024,7 +2024,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_write_compressed) {
+ if (!drv->bdrv_co_write_compressed) {
error_report("Compression not supported for this file format");
ret = -1;
goto out;
--
2.1.4
