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

Timestamp:

Oct 20, 2022 11:02:43 PM (2 years ago)

Author:

vboxsync

Message:

Frontends/VBoxManage+Storage/VMDK+doc/manual: 'VBoxManage createmedium
disk --Variant Rawdisk ...' neglects to use the calculated raw disk size
but instead uses the passed in value which is zero (unless --size or
--sizebyte has been specified) when creating the VMDK image and also
forgets to update the physical disk geometry (PCHS) for the VMDK image.
bugref:9224 ticketref:21125

File:

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

trunk/src/VBox/Storage/VMDK.cpp

@@ -5046 +5046 @@
         if (RT_SUCCESS(rc))
         {
+            pImage->cbSize = cbSize;
             /*
              * Create the raw-drive descriptor
@@ -5746 +5747 @@
             rc = vmdkMakeRawDescriptor(pImage, &pRaw);
             if (RT_FAILURE(rc))
-                return vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: could get raw descriptor for '%s'"), pImage->pszFilename);
+                return vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: could not create raw descriptor for '%s'"),
+                    pImage->pszFilename);
+            if (!cbSize)
+                cbSize = pImage->cbSize;
 
             rc = vmdkCreateRawImage(pImage, pRaw, cbSize);
@@ -5787 +5791 @@
                 vmdkDescExtRemoveDummy(pImage, &pImage->Descriptor);
 
-            if (   RT_SUCCESS(rc)
-                && pPCHSGeometry->cCylinders != 0
-                && pPCHSGeometry->cHeads != 0
-                && pPCHSGeometry->cSectors != 0)
-                rc = vmdkDescSetPCHSGeometry(pImage, pPCHSGeometry);
+            pImage->LCHSGeometry = *pLCHSGeometry;
+            pImage->PCHSGeometry = *pPCHSGeometry;
+
+            if (RT_SUCCESS(rc))
+            {
+                if (   pPCHSGeometry->cCylinders != 0
+                    && pPCHSGeometry->cHeads != 0
+                    && pPCHSGeometry->cSectors != 0)
+                    rc = vmdkDescSetPCHSGeometry(pImage, pPCHSGeometry);
+                else if (uImageFlags & VD_VMDK_IMAGE_FLAGS_RAWDISK)
+                {
+                    VDGEOMETRY RawDiskPCHSGeometry;
+                    RawDiskPCHSGeometry.cCylinders = (uint32_t)RT_MIN(pImage->cbSize / 512 / 16 / 63, 16383);
+                    RawDiskPCHSGeometry.cHeads = 16;
+                    RawDiskPCHSGeometry.cSectors = 63;
+                    rc = vmdkDescSetPCHSGeometry(pImage, &RawDiskPCHSGeometry);
+                }
+            }
 
             if (   RT_SUCCESS(rc)
@@ -5798 +5815 @@
                 && pLCHSGeometry->cSectors != 0)
                 rc = vmdkDescSetLCHSGeometry(pImage, pLCHSGeometry);
-
-            pImage->LCHSGeometry = *pLCHSGeometry;
-            pImage->PCHSGeometry = *pPCHSGeometry;
 
             pImage->ImageUuid = *pUuid;