From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52352) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WLuu1-0003S7-DE for qemu-devel@nongnu.org; Fri, 07 Mar 2014 08:33:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WLutw-0001j4-BP for qemu-devel@nongnu.org; Fri, 07 Mar 2014 08:33:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:18398) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WLutw-0001iq-3q for qemu-devel@nongnu.org; Fri, 07 Mar 2014 08:33:24 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s27DXNHI006842 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 7 Mar 2014 08:33:23 -0500 From: Kevin Wolf Date: Fri, 7 Mar 2014 14:32:54 +0100 Message-Id: <1394199187-9576-7-git-send-email-kwolf@redhat.com> In-Reply-To: <1394199187-9576-1-git-send-email-kwolf@redhat.com> References: <1394199187-9576-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 06/19] block: Fix bs->request_alignment assertion for bs->sg=1 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com For sg backends, bs->request_alignment is meaningless and may be 0. Signed-off-by: Kevin Wolf Reviewed-by: Benoit Canet Acked-by: Paolo Bonzini --- block.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block.c b/block.c index 38bbdf3..f01b91c 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) { -- 1.8.1.4