From: Kevin Wolf <kwolf@redhat.com>
Date: Wed, 5 Mar 2014 14:49:55 +0000 (+0100)
Subject: block: Fix bs->request_alignment assertion for bs->sg=1
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=47ea2de2d68b6c5319308b7de1980f463b7c125c;p=qemu.git

block: Fix bs->request_alignment assertion for bs->sg=1

For sg backends, bs->request_alignment is meaningless and may be 0.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Benoit Canet <benoit@irqsave.net>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/block.c b/block.c
index 38bbdf3083..f01b91cef1 100644
--- a/block.c
+++ b/block.c
@@ -935,7 +935,7 @@ static int bdrv_open_common(BlockDriverState *bs, BlockDriverState *file,
 
     bdrv_refresh_limits(bs);
     assert(bdrv_opt_mem_align(bs) != 0);
-    assert(bs->request_alignment != 0);
+    assert((bs->request_alignment != 0) || bs->sg);
 
 #ifndef _WIN32
     if (bs->is_temporary) {