Changeset 31919 in vbox for trunk/src/VBox

Timestamp:

Aug 24, 2010 12:53:24 PM (15 years ago)

Author:

vboxsync

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

65129

Message:

VBoxHDD/Resize: Calculate the CHS geometry if the caller doesn't provide one and image has a valid geometry set

File:

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

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

@@ -4975 +4975 @@
         fLockWrite = true;
 
-        rc = pImage->Backend->pfnResize(pImage->pvBackendData,
-                                        cbSize * _1M,
-                                        pPCHSGeometry,
-                                        pLCHSGeometry,
-                                        0, 99,
-                                        pDisk->pVDIfsDisk,
-                                        pImage->pVDIfsImage,
-                                        pVDIfsOperation);
+        PDMMEDIAGEOMETRY PCHSGeometryOld;
+        PDMMEDIAGEOMETRY LCHSGeometryOld;
+        PCPDMMEDIAGEOMETRY pPCHSGeometryNew;
+        PCPDMMEDIAGEOMETRY pLCHSGeometryNew;
+
+        if (pPCHSGeometry->cCylinders == 0)
+        {
+            /* Auto-detect marker, calculate new value ourself. */
+            rc = pImage->Backend->pfnGetPCHSGeometry(pImage->pvBackendData, &PCHSGeometryOld);
+            if (RT_SUCCESS(rc) && (PCHSGeometryOld.cCylinders != 0))
+                PCHSGeometryOld.cCylinders = RT_MIN(cbSize / 512 / PCHSGeometryOld.cHeads / PCHSGeometryOld.cSectors, 16383);
+            else if (rc == VERR_VD_GEOMETRY_NOT_SET)
+                rc = VINF_SUCCESS;
+
+            pPCHSGeometryNew = &PCHSGeometryOld;
+        }
+        else
+            pPCHSGeometryNew = pPCHSGeometry;
+
+        if (pLCHSGeometry->cCylinders == 0)
+        {
+            /* Auto-detect marker, calculate new value ourself. */
+            rc = pImage->Backend->pfnGetLCHSGeometry(pImage->pvBackendData, &LCHSGeometryOld);
+            if (RT_SUCCESS(rc) && (LCHSGeometryOld.cCylinders != 0))
+                LCHSGeometryOld.cCylinders = cbSize / 512 / LCHSGeometryOld.cHeads / LCHSGeometryOld.cSectors;
+            else if (rc == VERR_VD_GEOMETRY_NOT_SET)
+                rc = VINF_SUCCESS;
+
+            pLCHSGeometryNew = &LCHSGeometryOld;
+        }
+        else
+            pLCHSGeometryNew = pLCHSGeometry;
+
+        if (RT_SUCCESS(rc))
+            rc = pImage->Backend->pfnResize(pImage->pvBackendData,
+                                            cbSize * _1M,
+                                            pPCHSGeometryNew,
+                                            pLCHSGeometryNew,
+                                            0, 99,
+                                            pDisk->pVDIfsDisk,
+                                            pImage->pVDIfsImage,
+                                            pVDIfsOperation);
     } while (0);