[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 23/24] qcow2: Relax is_zero() assertion
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v6 23/24] qcow2: Relax is_zero() assertion |
Date: |
Wed, 11 Oct 2017 22:47:19 -0500 |
Now that bdrv_is_allocated accepts non-aligned inputs, we can
remove the TODO added in earlier refactoring.
Signed-off-by: Eric Blake <address@hidden>
---
v6: new patch [Kevin]
---
block/qcow2.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index 092a3cabdb..92cb9f9bfa 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -3003,22 +3003,16 @@ static bool is_zero(BlockDriverState *bs, int64_t
offset, int64_t bytes)
{
int64_t nr;
int res;
- int64_t start;
-
- /* TODO: Widening to sector boundaries should only be needed as
- * long as we can't query finer granularity. */
- start = QEMU_ALIGN_DOWN(offset, BDRV_SECTOR_SIZE);
- bytes = QEMU_ALIGN_UP(offset + bytes, BDRV_SECTOR_SIZE) - start;
/* Clamp to image length, before checking status of underlying sectors */
- if (start + bytes > bs->total_sectors * BDRV_SECTOR_SIZE) {
- bytes = bs->total_sectors * BDRV_SECTOR_SIZE - start;
+ if (offset + bytes > bs->total_sectors * BDRV_SECTOR_SIZE) {
+ bytes = bs->total_sectors * BDRV_SECTOR_SIZE - offset;
}
if (!bytes) {
return true;
}
- res = bdrv_block_status_above(bs, NULL, start, bytes, &nr, NULL, NULL);
+ res = bdrv_block_status_above(bs, NULL, offset, bytes, &nr, NULL, NULL);
return res >= 0 && (res & BDRV_BLOCK_ZERO) && nr == bytes;
}
--
2.13.6
- [Qemu-devel] [PATCH v6 13/24] qemu-img: Simplify logic in img_compare(), (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, 2017/10/11
- [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 <=
- [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