diff options
| author | Nir Soffer <nirsof@gmail.com> | 2019-08-27 21:59:12 +0300 |
|---|---|---|
| committer | Max Reitz <mreitz@redhat.com> | 2019-09-16 14:48:30 +0200 |
| commit | 1bbbf32d5fffe334531c315d7bd865fdfb67b6c5 (patch) | |
| tree | e8f70cc6cd882948f07a8dd568b625ab7bac2e3e /block/qcow2-cluster.c | |
| parent | dd25f97c66a75d1508f1d4c6478ed2c95bec428f (diff) | |
| download | qemu-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-cluster.c')
| -rw-r--r-- | block/qcow2-cluster.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index dcacd3c..cb44b6c 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -471,8 +471,8 @@ static bool coroutine_fn do_perform_cow_encrypt(BlockDriverState *bs, { if (bytes && bs->encrypted) { BDRVQcow2State *s = bs->opaque; - assert((offset_in_cluster & ~BDRV_SECTOR_MASK) == 0); - assert((bytes & ~BDRV_SECTOR_MASK) == 0); + assert(QEMU_IS_ALIGNED(offset_in_cluster, BDRV_SECTOR_SIZE)); + assert(QEMU_IS_ALIGNED(bytes, BDRV_SECTOR_SIZE)); assert(s->crypto); if (qcow2_co_encrypt(bs, cluster_offset, src_cluster_offset + offset_in_cluster, |