Am 13.10.2022 um 14:37 hat Paolo Bonzini geschrieben:
> From: Alberto Faria <[email protected]>
>
> Signed-off-by: Alberto Faria <[email protected]>
> Signed-off-by: Paolo Bonzini <[email protected]>
> @@ -1624,12 +1624,11 @@ static int coroutine_fn
> get_cluster_offset(BlockDriverState *bs,
> }
> l2_table = (char *)extent->l2_cache + (min_index * l2_size_bytes);
> BLKDBG_EVENT(extent->file, BLKDBG_L2_LOAD);
> - if (bdrv_pread(extent->file,
> + if (bdrv_co_pread(extent->file,
> (int64_t)l2_offset * 512,
> l2_size_bytes,
> - l2_table,
> - 0
> - ) < 0) {
> + l2_table, 0
> + ) != l2_size_bytes) {
Another incorrect conflict resolution, this would revert part of commit
353a5d84b25. Fixing it up as well.
Kevin
