[Qemu-devel] [PATCH 2/2] vmdk: fix cluster size check for flat extents

[Fam Zheng]

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 <address@hidden>
---
 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