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

Timestamp:

Nov 13, 2012 10:35:55 AM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

82046

Message:

Storage: Introduce new flag to skip unnecessary consistency checks in the VMDK backend while opening an image in readonly mode to speed up opening snapshots

Location:

trunk/src/VBox/Storage

Files:

• VD.cpp (modified) (1 diff)
• VMDK.cpp (modified) (2 diffs)

trunk/src/VBox/Storage/VD.cpp

@@ -5357 +5357 @@
                            rc = VERR_INVALID_PARAMETER);
         AssertMsgBreakStmt((uOpenFlags & ~VD_OPEN_FLAGS_MASK) == 0,
+                           ("uOpenFlags=%#x\n", uOpenFlags),
+                           rc = VERR_INVALID_PARAMETER);
+        AssertMsgBreakStmt(   !(uOpenFlags & VD_OPEN_FLAGS_SKIP_CONSISTENCY_CHECKS)
+                           ||  (uOpenFlags & VD_OPEN_FLAGS_READONLY),
                            ("uOpenFlags=%#x\n", uOpenFlags),
                            rc = VERR_INVALID_PARAMETER);

trunk/src/VBox/Storage/VMDK.cpp

@@ -1086 +1086 @@
         *pGDTmp = RT_LE2H_U32(*pGDTmp);
 
-    if (pExtent->uSectorRGD)
+    if (   pExtent->uSectorRGD
+        && !(pImage->uOpenFlags & VD_OPEN_FLAGS_SKIP_CONSISTENCY_CHECKS))
     {
         /* The VMDK 1.1 spec seems to talk about compressed grain directories,
@@ -6548 +6549 @@
         else
             rc = VERR_INVALID_PARAMETER;
-        goto out;
-    }
-
-    /* Implement this operation via reopening the image. */
-    vmdkFreeImage(pImage, false);
-    rc = vmdkOpenImage(pImage, uOpenFlags);
+    }
+    else
+    {
+        /* Implement this operation via reopening the image. */
+        vmdkFreeImage(pImage, false);
+        rc = vmdkOpenImage(pImage, uOpenFlags);
+    }
 
 out: