Changeset 1014 in vbox

Timestamp:

Feb 21, 2007 5:54:21 PM (18 years ago)

Author:

vboxsync

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

18870

Message:

Fixed physical CHS detection. Hopefully without breaking existing VDIs.

Location:

trunk/src/VBox/Devices

Files:

• PC/DevPcBios.cpp (modified) (4 diffs)
• Storage/DevATA.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/PC/DevPcBios.cpp

@@ -408 +408 @@
                 }
                 else if (cCylinders <= 1024 && cHeads <= 16 && cSectors <= 63)
+                {
+                    /* Disk <= 512 MByte not needing LBA translation. */
                     enmTranslation = PDMBIOSTRANSLATION_NONE;
+                }
+                else if (cSectors != 63 || (cHeads != 16 && cHeads != 32 && cHeads != 64 && cHeads != 128 && cHeads != 255))
+                {
+                    /* Disk with strange geometry. Using LBA here can
+                     * break booting of the guest OS. Especially operating
+                     * systems from Microsoft are sensitive to BIOS CHS not
+                     * matching what the partition table says. */
+                    enmTranslation = PDMBIOSTRANSLATION_NONE;
+                }
                 else
                     enmTranslation = PDMBIOSTRANSLATION_LBA;
@@ -748 +759 @@
     if (VBOX_FAILURE(rc))
         return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,
-                                   N_("Configuration error: Querying \"%s\" as a string failed"), 
+                                   N_("Configuration error: Querying \"%s\" as a string failed"),
                                    pszParam);
     if (!strcmp(psz, "DVD") || !strcmp(psz, "CDROM"))
@@ -939 +950 @@
     if (VBOX_FAILURE(rc))
         return rc;
-    rc = PDMDevHlpROMRegister(pDevIns, (uint32_t)-g_cbPcBiosBinary, g_cbPcBiosBinary, 
+    rc = PDMDevHlpROMRegister(pDevIns, (uint32_t)-g_cbPcBiosBinary, g_cbPcBiosBinary,
                               &g_abPcBiosBinary[0], "PC BIOS - 0xffffffff");
     if (VBOX_FAILURE(rc))
@@ -947 +958 @@
      * Register the MMIO region for the BIOS Logo: 0x000d0000 to 0x000dffff (64k)
      */
-    rc = PDMDevHlpMMIORegister(pDevIns, 0x000d0000, 0x00010000, 0, 
+    rc = PDMDevHlpMMIORegister(pDevIns, 0x000d0000, 0x00010000, 0,
                                logoMMIOWrite, logoMMIORead, NULL, "PC BIOS - Logo Buffer");
     if (VBOX_FAILURE(rc))

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

@@ -3661 +3661 @@
             cCHSSectors = iEndSector;
             cCHSCylinders = s->cTotalSectors / (cCHSHeads * cCHSSectors);
-            if (cCHSCylinders >= 1 && cCHSCylinders <= 16383)
+            if (cCHSCylinders >= 1)
             {
+                cCHSCylinders = RT_MIN(cCHSCylinders, 16383);
                 *pcHeads = cCHSHeads;
                 *pcSectors = cCHSSectors;
@@ -5220 +5221 @@
         else if (VBOX_FAILURE(rc))
         {
-            rc = ataGuessDiskLCHS(pIf, &pIf->cCHSCylinders, &pIf->cCHSHeads, &pIf->cCHSSectors);
-            if (VBOX_SUCCESS(rc) && pIf->cCHSHeads <= 16 /* if cCHSHeads > 16, it means that a BIOS LBA translation was active, so the default hardware geometry is OK. */
-                )
+            PDMBIOSTRANSLATION enmTranslation;
+            rc = pIf->pDrvBlockBios->pfnGetTranslation(pIf->pDrvBlockBios, &enmTranslation);
+            AssertRC(rc);
+
+            if (enmTranslation == PDMBIOSTRANSLATION_AUTO)
             {
-                /* Disable any translation to be in sync with the logical geometry */
-                PDMBIOSTRANSLATION enmTranslation;
-                rc = pIf->pDrvBlockBios->pfnGetTranslation(pIf->pDrvBlockBios, &enmTranslation);
-                if (VBOX_FAILURE(rc) || enmTranslation == PDMBIOSTRANSLATION_AUTO)
-                    pIf->pDrvBlockBios->pfnSetTranslation(pIf->pDrvBlockBios, PDMBIOSTRANSLATION_NONE);
+                /* Image contains no geometry information, detect geometry. */
+                rc = ataGuessDiskLCHS(pIf, &pIf->cCHSCylinders, &pIf->cCHSHeads, &pIf->cCHSSectors);
+                if (VBOX_SUCCESS(rc))
+                {
+                    /* Set the disk geometry information. */
+                    rc = pIf->pDrvBlockBios->pfnSetGeometry(pIf->pDrvBlockBios, pIf->cCHSCylinders, pIf->cCHSHeads, pIf->cCHSSectors);
+                }
+                else
+                {
+                    /* Flag geometry as invalid, will be replaced below by the
+                     * default geometry. */
+                    pIf->cCHSCylinders = 0;
+                }
             }
-            else
+            /* If there is no geometry, use standard physical disk geometry.
+             * This uses LCHS to LBA translation in the BIOS (which selects
+             * the logical sector count 63 and the logical head count to be
+             * the smallest of 16,32,64,128,255 which makes the logical
+             * cylinder count smaller than 1024 - if that's not possible, it
+             * uses 255 heads, so up to about 8 GByte maximum with the
+             * standard int13 interface, which supports 1024 cylinders). */
+            if (!pIf->cCHSCylinders)
             {
-                /* If no geometry, use a standard physical disk geometry. */
                 uint64_t cCHSCylinders = pIf->cTotalSectors / (16 * 63);
-                pIf->cCHSCylinders = (uint32_t)RT_MIN(RT_MAX(cCHSCylinders, 2), 16383);
+                pIf->cCHSCylinders = (uint32_t)RT_MIN(RT_MAX(cCHSCylinders, 1), 16383);
                 pIf->cCHSHeads = 16;
                 pIf->cCHSSectors = 63;
+                /* Set the disk geometry information. */
+                rc = pIf->pDrvBlockBios->pfnSetGeometry(pIf->pDrvBlockBios, pIf->cCHSCylinders, pIf->cCHSHeads, pIf->cCHSSectors);
             }
-            pIf->pDrvBlockBios->pfnSetGeometry(pIf->pDrvBlockBios, pIf->cCHSCylinders, pIf->cCHSHeads, pIf->cCHSSectors);
         }
         LogRel(("PIIX3 ATA: LUN#%d: disk, CHS=%d/%d/%d, total number of sectors %Ld\n", pIf->iLUN, pIf->cCHSCylinders, pIf->cCHSHeads, pIf->cCHSSectors, pIf->cTotalSectors));