[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/12] block/qcow2: refactor qcow2_co_preadv to use b
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 10/12] block/qcow2: refactor qcow2_co_preadv to use buffer-based io |
Date: |
Tue, 27 Aug 2019 21:16:37 +0100 |
From: Vladimir Sementsov-Ogievskiy <address@hidden>
Use buffer based io in encrypted case.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Acked-by: Stefan Hajnoczi <address@hidden>
Message-id: address@hidden
Message-Id: <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/qcow2.c | 28 ++++++++++++++++------------
1 file changed, 16 insertions(+), 12 deletions(-)
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;
--
2.21.0
- [Qemu-devel] [PULL 00/12] Block patches, Stefan Hajnoczi, 2019/08/27
- [Qemu-devel] [PULL 01/12] util/iov: introduce qemu_iovec_init_extended, Stefan Hajnoczi, 2019/08/27
- [Qemu-devel] [PULL 02/12] util/iov: improve qemu_iovec_is_zero, Stefan Hajnoczi, 2019/08/27
- [Qemu-devel] [PULL 03/12] block/io: refactor padding, Stefan Hajnoczi, 2019/08/27
- [Qemu-devel] [PULL 04/12] block: define .*_part io handlers in BlockDriver, Stefan Hajnoczi, 2019/08/27
- [Qemu-devel] [PULL 05/12] block/io: bdrv_co_do_copy_on_readv: use and support qiov_offset, Stefan Hajnoczi, 2019/08/27
- [Qemu-devel] [PULL 06/12] block/io: bdrv_co_do_copy_on_readv: lazy allocation, Stefan Hajnoczi, 2019/08/27
- [Qemu-devel] [PULL 07/12] block/io: bdrv_aligned_preadv: use and support qiov_offset, Stefan Hajnoczi, 2019/08/27
- [Qemu-devel] [PULL 08/12] block/io: bdrv_aligned_pwritev: use and support qiov_offset, Stefan Hajnoczi, 2019/08/27
- [Qemu-devel] [PULL 09/12] block/io: introduce bdrv_co_p{read, write}v_part, Stefan Hajnoczi, 2019/08/27
- [Qemu-devel] [PULL 10/12] block/qcow2: refactor qcow2_co_preadv to use buffer-based io,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 11/12] block/qcow2: implement .bdrv_co_preadv_part, Stefan Hajnoczi, 2019/08/27
- [Qemu-devel] [PULL 12/12] block/qcow2: implement .bdrv_co_pwritev(_compressed)_part, Stefan Hajnoczi, 2019/08/27