From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44188) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b1Yxe-000582-0i for qemu-devel@nongnu.org; Sat, 14 May 2016 08:46:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b1Yxc-0006ud-I4 for qemu-devel@nongnu.org; Sat, 14 May 2016 08:46:25 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:41947 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b1Yxc-0006uI-3z for qemu-devel@nongnu.org; Sat, 14 May 2016 08:46:24 -0400 From: "Denis V. Lunev" Date: Sat, 14 May 2016 15:45:53 +0300 Message-Id: <1463229957-14253-6-git-send-email-den@openvz.org> In-Reply-To: <1463229957-14253-1-git-send-email-den@openvz.org> References: <1463229957-14253-1-git-send-email-den@openvz.org> Subject: [Qemu-devel] [PATCH 05/10] block: remove BlockDriver.bdrv_write_compressed List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: den@openvz.org, Pavel Butsykin , Jeff Cody , Markus Armbruster , Eric Blake , John Snow , Stefan Hajnoczi , Kevin Wolf From: Pavel Butsykin 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 Signed-off-by: Denis V. Lunev CC: Jeff Cody CC: Markus Armbruster CC: Eric Blake CC: John Snow CC: Stefan Hajnoczi CC: Kevin Wolf --- 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