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

Timestamp:

Sep 21, 2011 6:32:50 PM (13 years ago)

Author:

vboxsync

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

74114

Message:

Storage/VMDK: VMware have apparently introduced a new marker with unknown content, ignore it as long as no one knows what the payload actually means

File:

• trunk/src/VBox/Storage/VMDK.cpp (modified) (2 diffs)

trunk/src/VBox/Storage/VMDK.cpp

@@ -92 +92 @@
 /** Marker for footer in streamOptimized images. */
 #define VMDK_MARKER_FOOTER 3
+
+/** Marker for unknown purpose in streamOptimized images.
+ * Shows up in very recent images created by vSphere, but only sporadically.
+ * They "forgot" to document that one in the VMDK specification. */
+#define VMDK_MARKER_UNSPECIFIED 4
 
 /** Dummy marker for "don't check the marker value". */
@@ -5358 +5363 @@
                     case VMDK_MARKER_FOOTER:
                         uGrainSectorAbs += 2;
+                        break;
+                    case VMDK_MARKER_UNSPECIFIED:
+                        /* Skip over the contents of the unspecified marker
+                         * type 4 which exists in some vSphere created files. */
+                        /** @todo figure out what the payload means. */
+                        uGrainSectorAbs += 1;
                         break;
                     default: