Changeset 46029 in vbox for trunk/src/VBox/Storage

Timestamp:

May 13, 2013 4:07:36 PM (12 years ago)

Author:

vboxsync

Message:

Storage/VHDX: Disable a few consistency checks. I've seen images in the wild which violate the spec. Because VHDX is supported readonly only so far there is no risk of data corruption

File:

• trunk/src/VBox/Storage/VHDX.cpp (modified) (5 diffs)

trunk/src/VBox/Storage/VHDX.cpp

@@ -587 +587 @@
     {VHDX_METADATA_TBL_ENTRY_ITEM_PAGE83_DATA,    false,   true,     true,        VHDXMETADATAITEM_PAGE83_DATA},
     {VHDX_METADATA_TBL_ENTRY_ITEM_LOG_SECT_SIZE,  false,   true,     true,        VHDXMETADATAITEM_LOGICAL_SECTOR_SIZE},
-    {VHDX_METADATA_TBL_ENTRY_ITEM_PHYS_SECT_SIZE, false,   true,     false,       VHDXMETADATAITEM_PHYSICAL_SECTOR_SIZE},
+    {VHDX_METADATA_TBL_ENTRY_ITEM_PHYS_SECT_SIZE, false,   true,     true,        VHDXMETADATAITEM_PHYSICAL_SECTOR_SIZE},
     {VHDX_METADATA_TBL_ENTRY_ITEM_PARENT_LOCATOR, false,   false,    true,        VHDXMETADATAITEM_PARENT_LOCATOR}
 };
@@ -1178 +1178 @@
                         && (i % uChunkRatio) == 0)
                     {
+/**
+ * Disabled the verification because there are images out there with the sector bitmap
+ * marked as present. The entry is never accessed and the image is readonly anyway,
+ * so no harm done.
+ */
+#if 0
                         /* Sector bitmap block. */
                         if (   VHDX_BAT_ENTRY_GET_STATE(paBatEntries[i].u64BatEntry)
@@ -1187 +1193 @@
                             break;
                         }
+#endif
                     }
                     else
@@ -1420 +1427 @@
                                           s_aVhdxMetadataItemProps[idxProp].pszItemUuid))
                     {
+                        /*
+                         * Check for specification violations and bail out, except
+                         * for the required flag of the physical sector size metadata item.
+                         * Early images had the required flag not set opposed to the specification.
+                         * We don't want to brerak those images.
+                         */
                         if (   !!(MetadataTblEntry.u32Flags & VHDX_METADATA_TBL_ENTRY_FLAGS_IS_USER)
                             != s_aVhdxMetadataItemProps[idxProp].fIsUser)
@@ -1430 +1443 @@
                                            "VHDX: Virtual disk flag of metadata item does not meet expectations \'%s\'",
                                            pImage->pszFilename);
-                        else if (   !!(MetadataTblEntry.u32Flags & VHDX_METADATA_TBL_ENTRY_FLAGS_IS_REQUIRED)
-                                 != s_aVhdxMetadataItemProps[idxProp].fIsRequired)
+                        else if (      !!(MetadataTblEntry.u32Flags & VHDX_METADATA_TBL_ENTRY_FLAGS_IS_REQUIRED)
+                                    != s_aVhdxMetadataItemProps[idxProp].fIsRequired
+                                 && (s_aVhdxMetadataItemProps[idxProp].enmMetadataItem != VHDXMETADATAITEM_PHYSICAL_SECTOR_SIZE))
                             rc = vdIfError(pImage->pIfError, VERR_VD_GEN_INVALID_HEADER, RT_SRC_POS,
                                            "VHDX: Required flag of metadata item does not meet expectations \'%s\'",