[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 22/24] block: Relax bdrv_aligned_preadv() asserti
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v6 22/24] block: Relax bdrv_aligned_preadv() assertion |
Date: |
Wed, 11 Oct 2017 22:47:18 -0500 |
Now that bdrv_is_allocated accepts non-aligned inputs, we can
remove the TODO added in commit d6a644bb.
Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: John Snow <address@hidden>
---
v4-v5: no change
v3: new patch [Kevin]
---
block/io.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/block/io.c b/block/io.c
index 35431dc9dd..e4caa4acf1 100644
--- a/block/io.c
+++ b/block/io.c
@@ -1104,18 +1104,14 @@ static int coroutine_fn bdrv_aligned_preadv(BdrvChild
*child,
}
if (flags & BDRV_REQ_COPY_ON_READ) {
- /* TODO: Simplify further once bdrv_is_allocated no longer
- * requires sector alignment */
- int64_t start = QEMU_ALIGN_DOWN(offset, BDRV_SECTOR_SIZE);
- int64_t end = QEMU_ALIGN_UP(offset + bytes, BDRV_SECTOR_SIZE);
int64_t pnum;
- ret = bdrv_is_allocated(bs, start, end - start, &pnum);
+ ret = bdrv_is_allocated(bs, offset, bytes, &pnum);
if (ret < 0) {
goto out;
}
- if (!ret || pnum != end - start) {
+ if (!ret || pnum != bytes) {
ret = bdrv_co_do_copy_on_readv(child, offset, bytes, qiov);
goto out;
}
--
2.13.6
- Re: [Qemu-devel] [PATCH v6 12/24] block: Convert bdrv_get_block_status_above() to bytes, (continued)
[Qemu-devel] [PATCH v6 13/24] qemu-img: Simplify logic in img_compare(), Eric Blake, 2017/10/11
[Qemu-devel] [PATCH v6 15/24] qemu-img: Add find_nonzero(), Eric Blake, 2017/10/11
[Qemu-devel] [PATCH v6 14/24] qemu-img: Speed up compare on pre-allocated larger file, Eric Blake, 2017/10/11
[Qemu-devel] [PATCH v6 17/24] qemu-img: Change check_empty_sectors() to byte-based, Eric Blake, 2017/10/11
[Qemu-devel] [PATCH v6 16/24] qemu-img: Drop redundant error message in compare, Eric Blake, 2017/10/11
[Qemu-devel] [PATCH v6 18/24] qemu-img: Change compare_sectors() to be byte-based, Eric Blake, 2017/10/11
[Qemu-devel] [PATCH v6 19/24] qemu-img: Change img_rebase() to be byte-based, Eric Blake, 2017/10/11
[Qemu-devel] [PATCH v6 20/24] qemu-img: Change img_compare() to be byte-based, Eric Blake, 2017/10/11
[Qemu-devel] [PATCH v6 22/24] block: Relax bdrv_aligned_preadv() assertion,
Eric Blake <=
[Qemu-devel] [PATCH v6 21/24] block: Align block status requests, Eric Blake, 2017/10/11
[Qemu-devel] [PATCH v6 23/24] qcow2: Relax is_zero() assertion, Eric Blake, 2017/10/11
[Qemu-devel] [PATCH v6 24/24] qemu-io: Relax 'alloc' now that block-status doesn't assert, Eric Blake, 2017/10/11
Re: [Qemu-devel] [PATCH v6 00/24] make bdrv_get_block_status byte-based, Kevin Wolf, 2017/10/20