[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/10] block: remove BlockDriver.bdrv_write_compress
From: |
Denis V. Lunev |
Subject: |
[Qemu-devel] [PATCH 05/10] block: remove BlockDriver.bdrv_write_compressed |
Date: |
Sat, 14 May 2016 15:45:53 +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 now.
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/io.c | 14 --------------
include/block/block_int.h | 3 ---
qemu-img.c | 2 +-
3 files changed, 1 insertion(+), 18 deletions(-)
diff --git a/block/io.c b/block/io.c
index 88af10c..ae87e72 100644
--- a/block/io.c
+++ b/block/io.c
@@ -1876,7 +1876,6 @@ static void bdrv_write_compressed_co_entry(void *opaque)
int bdrv_write_compressed(BlockDriverState *bs, int64_t sector_num,
const uint8_t *buf, int nb_sectors)
{
- BlockDriver *drv = bs->drv;
BdrvWriteCompressedCo data = {
.bs = bs,
.sector_num = sector_num,
@@ -1885,19 +1884,6 @@ int bdrv_write_compressed(BlockDriverState *bs, int64_t
sector_num,
.ret = -EINPROGRESS,
};
- if (!drv) {
- return -ENOMEDIUM;
- }
-
- if (drv->bdrv_write_compressed) {
- int ret = bdrv_check_request(bs, sector_num, nb_sectors);
- if (ret < 0) {
- return ret;
- }
- assert(QLIST_EMPTY(&bs->dirty_bitmaps));
- return drv->bdrv_write_compressed(bs, sector_num, buf, nb_sectors);
- }
-
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 3c93ddb..cae838c 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -205,9 +205,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 (*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 0d38eac..fd892e8 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -2022,7 +2022,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
- Re: [Qemu-devel] [PATCH 04/10] qcow: add qcow_co_write_compressed, (continued)
- [Qemu-devel] [PATCH 03/10] vmdk: add vmdk_co_write_compressed, Denis V. Lunev, 2016/05/14
- [Qemu-devel] [PATCH 02/10] qcow2: add qcow2_co_write_compressed, Denis V. Lunev, 2016/05/14
- [Qemu-devel] [PATCH 01/10] block/io: add bdrv_co_write_compressed, Denis V. Lunev, 2016/05/14
- [Qemu-devel] [PATCH 05/10] block: remove BlockDriver.bdrv_write_compressed,
Denis V. Lunev <=
- [Qemu-devel] [PATCH 07/10] blockdev-backup: added support for data compression, Denis V. Lunev, 2016/05/14
- [Qemu-devel] [PATCH 06/10] drive-backup: added support for data compression, Denis V. Lunev, 2016/05/14
- [Qemu-devel] [PATCH 09/10] block: fix backup in vmdk format image, Denis V. Lunev, 2016/05/14