aboutsummaryrefslogtreecommitdiff
path: root/block/qcow2.c
diff options
context:
space:
mode:
authorNir Soffer <nirsof@gmail.com>2019-08-27 21:59:12 +0300
committerMax Reitz <mreitz@redhat.com>2019-09-16 14:48:30 +0200
commit1bbbf32d5fffe334531c315d7bd865fdfb67b6c5 (patch)
treee8f70cc6cd882948f07a8dd568b625ab7bac2e3e /block/qcow2.c
parentdd25f97c66a75d1508f1d4c6478ed2c95bec428f (diff)
downloadqemu-1bbbf32d5fffe334531c315d7bd865fdfb67b6c5.zip
qemu-1bbbf32d5fffe334531c315d7bd865fdfb67b6c5.tar.gz
qemu-1bbbf32d5fffe334531c315d7bd865fdfb67b6c5.tar.bz2
block: Use QEMU_IS_ALIGNED
Replace instances of: (n & (BDRV_SECTOR_SIZE - 1)) == 0 And: (n & ~BDRV_SECTOR_MASK) == 0 With: QEMU_IS_ALIGNED(n, BDRV_SECTOR_SIZE) Which reveals the intent of the code better, and makes it easier to locate the code checking alignment. Signed-off-by: Nir Soffer <nsoffer@redhat.com> Message-id: 20190827185913.27427-2-nsoffer@redhat.com Reviewed-by: John Snow <jsnow@redhat.com> Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'block/qcow2.c')
-rw-r--r--block/qcow2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/block/qcow2.c b/block/qcow2.c
index 57734f2..cac18f0 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -2067,8 +2067,8 @@ static coroutine_fn int qcow2_co_preadv_part(BlockDriverState *bs,
goto fail;
}
- assert((offset & (BDRV_SECTOR_SIZE - 1)) == 0);
- assert((cur_bytes & (BDRV_SECTOR_SIZE - 1)) == 0);
+ assert(QEMU_IS_ALIGNED(offset, BDRV_SECTOR_SIZE));
+ assert(QEMU_IS_ALIGNED(cur_bytes, BDRV_SECTOR_SIZE));
if (qcow2_co_decrypt(bs, cluster_offset, offset,
cluster_data, cur_bytes) < 0) {
ret = -EIO;