[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 23/24] vmdk: switch to *_co_* functions
From: |
Kevin Wolf |
Subject: |
Re: [PATCH 23/24] vmdk: switch to *_co_* functions |
Date: |
Thu, 27 Oct 2022 19:07:44 +0200 |
Am 13.10.2022 um 14:37 hat Paolo Bonzini geschrieben:
> From: Alberto Faria <afaria@redhat.com>
>
> Signed-off-by: Alberto Faria <afaria@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> @@ -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
- [PATCH 22/24] vhdx: switch to *_co_* functions, (continued)
- [PATCH 22/24] vhdx: switch to *_co_* functions, Paolo Bonzini, 2022/10/13
- [PATCH 14/24] commit: switch to *_co_* functions, Paolo Bonzini, 2022/10/13
- [PATCH 11/24] qcow: manually add more coroutine_fn annotations, Paolo Bonzini, 2022/10/13
- [PATCH 21/24] vdi: switch to *_co_* functions, Paolo Bonzini, 2022/10/13
- [PATCH 19/24] qcow2: switch to *_co_* functions, Paolo Bonzini, 2022/10/13
- [PATCH 24/24] monitor: switch to *_co_* functions, Paolo Bonzini, 2022/10/13
- [PATCH 17/24] parallels: switch to *_co_* functions, Paolo Bonzini, 2022/10/13
- [PATCH 16/24] mirror: switch to *_co_* functions, Paolo Bonzini, 2022/10/13
- [PATCH 23/24] vmdk: switch to *_co_* functions, Paolo Bonzini, 2022/10/13
- Re: [PATCH 23/24] vmdk: switch to *_co_* functions,
Kevin Wolf <=
- [PATCH 18/24] qcow: switch to *_co_* functions, Paolo Bonzini, 2022/10/13
- [PATCH 20/24] qed: switch to *_co_* functions, Paolo Bonzini, 2022/10/13
- Re: [PATCH 00/24] More coroutine_fn fixes, Kevin Wolf, 2022/10/27