Changeset 3935 in vbox

Timestamp:

Jul 31, 2007 10:01:48 AM (18 years ago)

Author:

vboxsync

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

23344

Message:

Fix the if nesting and condition for the geometry fix that hopefully
makes all VMDK images work.

File:

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

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

@@ -5514 +5514 @@
                 rc = pIf->pDrvBlockBios->pfnSetGeometry(pIf->pDrvBlockBios, pIf->cCHSCylinders, pIf->cCHSHeads, pIf->cCHSSectors);
             }
-            else if (enmTranslation == PDMBIOSTRANSLATION_LBA)
+        }
+        else
+        {
+            PDMBIOSTRANSLATION enmTranslation;
+            rc = pIf->pDrvBlockBios->pfnGetTranslation(pIf->pDrvBlockBios, &enmTranslation);
+            if ((   rc == VERR_PDM_TRANSLATION_NOT_SET
+                 || enmTranslation == PDMBIOSTRANSLATION_LBA)
+                &&  pIf->cCHSSectors == 63
+                && (pIf->cCHSHeads != 16 || pIf->cCHSCylinders >= 1024))
             {
                 /* Use the official LBA physical CHS geometry. */