From: Peter Lieven <pl@kamp.de>
Date: Mon, 30 May 2016 11:59:59 +0000 (+0200)
Subject: block: assert that bs->request_alignment is a power of 2
X-Git-Tag: v2.7.0-rc0~138^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=107d433cbbc347cdd140c0f2de4574ff3675bdbe;p=thirdparty%2Fqemu.git

block: assert that bs->request_alignment is a power of 2

at least bdrv_co_preadv/pwritev expect this.

Signed-off-by: Peter Lieven <pl@kamp.de>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/block.c b/block.c
index 736432f67ed..f54bc25e8a9 100644
--- a/block.c
+++ b/block.c
@@ -1018,7 +1018,7 @@ static int bdrv_open_common(BlockDriverState *bs, BdrvChild *file,
 
     assert(bdrv_opt_mem_align(bs) != 0);
     assert(bdrv_min_mem_align(bs) != 0);
-    assert((bs->request_alignment != 0) || bdrv_is_sg(bs));
+    assert(is_power_of_2(bs->request_alignment) || bdrv_is_sg(bs));
 
     qemu_opts_del(opts);
     return 0;