From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33128) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VMFiK-0002WV-KN for qemu-devel@nongnu.org; Wed, 18 Sep 2013 07:14:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VMFiD-0000gC-Iw for qemu-devel@nongnu.org; Wed, 18 Sep 2013 07:14:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52473) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VMFiD-0000g6-Aj for qemu-devel@nongnu.org; Wed, 18 Sep 2013 07:14:25 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r8IBEObV014392 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 18 Sep 2013 07:14:24 -0400 From: Fam Zheng Date: Wed, 18 Sep 2013 19:14:15 +0800 Message-Id: <1379502855-27759-3-git-send-email-famz@redhat.com> In-Reply-To: <1379502855-27759-1-git-send-email-famz@redhat.com> References: <1379502855-27759-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] vmdk: fix cluster size check for flat extents List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, asias@redhat.com, famz@redhat.com, stefanha@redhat.com We use the extent size as cluster size for flat extents (where no L1/L2 table is allocated so it's safe). So don't check the cluster size for flat case in opening. Otherwise flat extent opening is broken: # qemu-img create -f vmdk -o subformat=monolithicFlat /tmp/a.vmdk 100G Formatting '/tmp/a.vmdk', fmt=vmdk size=107374182400 compat6=off subformat='monolithicFlat' zeroed_grain=off # qemu-img info /tmp/a.vmdk image: /tmp/a.vmdk file format: raw virtual size: 0 (0 bytes) disk size: 4.0K Signed-off-by: Fam Zheng --- block/vmdk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/vmdk.c b/block/vmdk.c index fb5b529..fdd4eaa 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -396,7 +396,7 @@ static int vmdk_add_extent(BlockDriverState *bs, VmdkExtent *extent; BDRVVmdkState *s = bs->opaque; - if (cluster_sectors > 0x200000) { + if (!flat && cluster_sectors > 0x200000) { /* 0x200000 * 512Bytes = 1GB for one cluster is unrealistic */ error_report("invalid granularity, image may be corrupt"); return -EINVAL; -- 1.8.3.1