Changeset 33081 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Oct 12, 2010 5:54:54 PM (14 years ago)

Author:

vboxsync

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

66608

Message:

Storage/VDI: fix a sneaky bug which led to temporary amnesia what the LCHS geometry is set for a newly created image

File:

• trunk/src/VBox/Devices/Storage/VDIHDDCore.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Storage/VDIHDDCore.cpp

@@ -349 +349 @@
 {
     pHeader->uVersion = VDI_IMAGE_VERSION;
-    pHeader->u.v1.cbHeader = sizeof(VDIHEADER1);
-    pHeader->u.v1.u32Type = (uint32_t)vdiTranslateImageFlags2VDI(uImageFlags);
-    pHeader->u.v1.fFlags = (uImageFlags & VD_VDI_IMAGE_FLAGS_ZERO_EXPAND) ? 1 : 0;
+    pHeader->u.v1plus.cbHeader = sizeof(VDIHEADER1PLUS);
+    pHeader->u.v1plus.u32Type = (uint32_t)vdiTranslateImageFlags2VDI(uImageFlags);
+    pHeader->u.v1plus.fFlags = (uImageFlags & VD_VDI_IMAGE_FLAGS_ZERO_EXPAND) ? 1 : 0;
 #ifdef VBOX_STRICT
     char achZero[VDI_IMAGE_COMMENT_SIZE] = {0};
-    Assert(!memcmp(pHeader->u.v1.szComment, achZero, VDI_IMAGE_COMMENT_SIZE));
+    Assert(!memcmp(pHeader->u.v1plus.szComment, achZero, VDI_IMAGE_COMMENT_SIZE));
 #endif
-    pHeader->u.v1.szComment[0] = '\0';
+    pHeader->u.v1plus.szComment[0] = '\0';
     if (pszComment)
     {
-        AssertMsg(strlen(pszComment) < sizeof(pHeader->u.v1.szComment),
+        AssertMsg(strlen(pszComment) < sizeof(pHeader->u.v1plus.szComment),
                   ("HDD Comment is too long, cb=%d\n", strlen(pszComment)));
-        strncat(pHeader->u.v1.szComment, pszComment, sizeof(pHeader->u.v1.szComment)-1);
+        strncat(pHeader->u.v1plus.szComment, pszComment, sizeof(pHeader->u.v1plus.szComment)-1);
     }
 
     /* Mark the legacy geometry not-calculated. */
-    pHeader->u.v1.LegacyGeometry.cCylinders = 0;
-    pHeader->u.v1.LegacyGeometry.cHeads = 0;
-    pHeader->u.v1.LegacyGeometry.cSectors = 0;
-    pHeader->u.v1.LegacyGeometry.cbSector = VDI_GEOMETRY_SECTOR_SIZE;
-    pHeader->u.v1.u32Dummy = 0; /* used to be the translation value */
-
-    pHeader->u.v1.cbDisk = cbDisk;
-    pHeader->u.v1.cbBlock = cbBlock;
-    pHeader->u.v1.cBlocks = (uint32_t)(cbDisk / cbBlock);
+    pHeader->u.v1plus.LegacyGeometry.cCylinders = 0;
+    pHeader->u.v1plus.LegacyGeometry.cHeads = 0;
+    pHeader->u.v1plus.LegacyGeometry.cSectors = 0;
+    pHeader->u.v1plus.LegacyGeometry.cbSector = VDI_GEOMETRY_SECTOR_SIZE;
+    pHeader->u.v1plus.u32Dummy = 0; /* used to be the translation value */
+
+    pHeader->u.v1plus.cbDisk = cbDisk;
+    pHeader->u.v1plus.cbBlock = cbBlock;
+    pHeader->u.v1plus.cBlocks = (uint32_t)(cbDisk / cbBlock);
     if (cbDisk % cbBlock)
-        pHeader->u.v1.cBlocks++;
-    pHeader->u.v1.cbBlockExtra = cbBlockExtra;
-    pHeader->u.v1.cBlocksAllocated = 0;
+        pHeader->u.v1plus.cBlocks++;
+    pHeader->u.v1plus.cbBlockExtra = cbBlockExtra;
+    pHeader->u.v1plus.cBlocksAllocated = 0;
 
     /* Init offsets. */
-    pHeader->u.v1.offBlocks = RT_ALIGN_32(sizeof(VDIPREHEADER) + sizeof(VDIHEADER1), VDI_DATA_ALIGN);
-    pHeader->u.v1.offData = RT_ALIGN_32(pHeader->u.v1.offBlocks + (pHeader->u.v1.cBlocks * sizeof(VDIIMAGEBLOCKPOINTER)), VDI_DATA_ALIGN);
+    pHeader->u.v1plus.offBlocks = RT_ALIGN_32(sizeof(VDIPREHEADER) + sizeof(VDIHEADER1PLUS), VDI_DATA_ALIGN);
+    pHeader->u.v1plus.offData = RT_ALIGN_32(pHeader->u.v1plus.offBlocks + (pHeader->u.v1plus.cBlocks * sizeof(VDIIMAGEBLOCKPOINTER)), VDI_DATA_ALIGN);
 
     /* Init uuids. */
-    RTUuidCreate(&pHeader->u.v1.uuidCreate);
-    RTUuidClear(&pHeader->u.v1.uuidModify);
-    RTUuidClear(&pHeader->u.v1.uuidLinkage);
-    RTUuidClear(&pHeader->u.v1.uuidParentModify);
+    RTUuidCreate(&pHeader->u.v1plus.uuidCreate);
+    RTUuidClear(&pHeader->u.v1plus.uuidModify);
+    RTUuidClear(&pHeader->u.v1plus.uuidLinkage);
+    RTUuidClear(&pHeader->u.v1plus.uuidParentModify);
 
     /* Mark LCHS geometry not-calculated. */