Changeset 85885 in vbox

Timestamp:

Aug 25, 2020 8:02:51 PM (4 years ago)

Author:

vboxsync

Message:

VBoxInternalManager.cpp,vd.h,VMDK.cpp: Use self documenting structure names in VDISKRAWPARTDESC when it comes to the two offsets. bugref:9224

File:

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

trunk/src/VBox/Storage/VMDK.cpp

@@ -3473 +3473 @@
         {
             PVDISKRAWPARTDESC pPart = &pRaw->pPartDescs[i];
-            if (uStart > pPart->uStart)
+            if (uStart > pPart->offStartInVDisk)
                 return vdIfError(pImage->pIfError, VERR_INVALID_PARAMETER, RT_SRC_POS,
                                  N_("VMDK: incorrect partition data area ordering set up by the caller in '%s'"), pImage->pszFilename);
 
-            if (uStart < pPart->uStart)
+            if (uStart < pPart->offStartInVDisk)
                 cExtents++;
-            uStart = pPart->uStart + pPart->cbData;
+            uStart = pPart->offStartInVDisk + pPart->cbData;
             cExtents++;
         }
@@ -3521 +3521 @@
             pExtent = &pImage->pExtents[cExtents++];
 
-            if (uStart < pPart->uStart)
+            if (uStart < pPart->offStartInVDisk)
             {
                 pExtent->pszBasename = NULL;
                 pExtent->pszFullname = NULL;
                 pExtent->enmType = VMDKETYPE_ZERO;
-                pExtent->cNominalSectors = VMDK_BYTE2SECTOR(pPart->uStart - uStart);
+                pExtent->cNominalSectors = VMDK_BYTE2SECTOR(pPart->offStartInVDisk - uStart);
                 pExtent->uSectorOffset = 0;
                 pExtent->enmAccess = VMDKACCESS_READWRITE;
@@ -3533 +3533 @@
                 pExtent = &pImage->pExtents[cExtents++];
             }
-            uStart = pPart->uStart + pPart->cbData;
+            uStart = pPart->offStartInVDisk + pPart->cbData;
 
             if (pPart->pvPartitionData)
@@ -3592 +3592 @@
                     pExtent->enmType = VMDKETYPE_FLAT;
                     pExtent->cNominalSectors = VMDK_BYTE2SECTOR(pPart->cbData);
-                    pExtent->uSectorOffset = VMDK_BYTE2SECTOR(pPart->uStartOffset);
+                    pExtent->uSectorOffset = VMDK_BYTE2SECTOR(pPart->offStartInDevice);
                     pExtent->enmAccess = (pPart->uFlags & VDISKRAW_READONLY) ? VMDKACCESS_READONLY : VMDKACCESS_READWRITE;
                     pExtent->fMetaDirty = false;