Changeset 17732 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Mar 12, 2009 11:15:24 AM (16 years ago)

Author:

vboxsync

Message:

Storage/AHCI: fix iSCSI-induced geometry error preventing VM start in the AHCI case. ATA change is a no-op, just to make the code as similar as possible.

File:

• trunk/src/VBox/Devices/Storage/DevATA.cpp (modified) (3 diffs)

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

@@ -5706 +5706 @@
             pIf->PCHSGeometry.cHeads = 16;
             pIf->PCHSGeometry.cSectors = 63;
-            /* Set the disk geometry information. */
-            rc = pIf->pDrvBlockBios->pfnSetPCHSGeometry(pIf->pDrvBlockBios,
-                                                        &pIf->PCHSGeometry);
+            /* Set the disk geometry information. Ignore errors. */
+            pIf->pDrvBlockBios->pfnSetPCHSGeometry(pIf->pDrvBlockBios,
+                                                   &pIf->PCHSGeometry);
+            rc = VINF_SUCCESS;
         }
         LogRel(("PIIX3 ATA: LUN#%d: disk, PCHS=%u/%u/%u, total number of sectors %Ld\n", pIf->iLUN, pIf->PCHSGeometry.cCylinders, pIf->PCHSGeometry.cHeads, pIf->PCHSGeometry.cSectors, pIf->cTotalSectors));
     }
-    return VINF_SUCCESS;
+    return rc;
 }
 
@@ -6184 +6185 @@
         return rc;
     pThis->u8Type = (uint8_t)enmChipset;
-    
+
     /*
      * Initialize data (most of it anyway).
@@ -6195 +6196 @@
     PCIDevSetVendorId(&pThis->dev, 0x8086); /* Intel */
 
-    /* 
+    /*
      * When adding more IDE chipsets, don't forget to update pci_bios_init_device()
      * as it explicitly checks for PCI id for IDE controllers.