From 00721a3529977004da50207ecb4769ef251d7ede Mon Sep 17 00:00:00 2001 From: Vladimir Sementsov-Ogievskiy Date: Tue, 4 Jun 2019 19:15:12 +0300 Subject: block/qcow2: refactor qcow2_co_preadv to use buffer-based io Use buffer based io in encrypted case. Signed-off-by: Vladimir Sementsov-Ogievskiy Acked-by: Stefan Hajnoczi Message-id: 20190604161514.262241-11-vsementsov@virtuozzo.com Message-Id: <20190604161514.262241-11-vsementsov@virtuozzo.com> Signed-off-by: Stefan Hajnoczi --- block/qcow2.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) (limited to 'block') diff --git a/block/qcow2.c b/block/qcow2.c index 7c5a4859f7..b2b87d1a8d 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -2059,19 +2059,15 @@ static coroutine_fn int qcow2_co_preadv(BlockDriverState *bs, uint64_t offset, } assert(cur_bytes <= QCOW_MAX_CRYPT_CLUSTERS * s->cluster_size); - qemu_iovec_reset(&hd_qiov); - qemu_iovec_add(&hd_qiov, cluster_data, cur_bytes); - } - BLKDBG_EVENT(bs->file, BLKDBG_READ_AIO); - ret = bdrv_co_preadv(s->data_file, - cluster_offset + offset_in_cluster, - cur_bytes, &hd_qiov, 0); - if (ret < 0) { - goto fail; - } - if (bs->encrypted) { - assert(s->crypto); + BLKDBG_EVENT(bs->file, BLKDBG_READ_AIO); + ret = bdrv_co_pread(s->data_file, + cluster_offset + offset_in_cluster, + cur_bytes, cluster_data, 0); + if (ret < 0) { + goto fail; + } + assert((offset & (BDRV_SECTOR_SIZE - 1)) == 0); assert((cur_bytes & (BDRV_SECTOR_SIZE - 1)) == 0); if (qcow2_co_decrypt(bs, cluster_offset, offset, @@ -2080,6 +2076,14 @@ static coroutine_fn int qcow2_co_preadv(BlockDriverState *bs, uint64_t offset, goto fail; } qemu_iovec_from_buf(qiov, bytes_done, cluster_data, cur_bytes); + } else { + BLKDBG_EVENT(bs->file, BLKDBG_READ_AIO); + ret = bdrv_co_preadv(s->data_file, + cluster_offset + offset_in_cluster, + cur_bytes, &hd_qiov, 0); + if (ret < 0) { + goto fail; + } } break; -- cgit v1.2.3