Changeset 18557 in vbox

Timestamp:

Mar 30, 2009 5:42:47 PM (16 years ago)

Author:

vboxsync

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

45432

Message:

Storage/VBoxHDD: drop 1024 cylinder LCHS paranoia. SCSI controllers have larger values, and this caused unnecessary trouble when converting images. The clipping is already done in DevPcBios.

Location:

trunk/src/VBox/Devices

Files:

• PC/DevPcBios.cpp (modified) (1 diff)
• Storage/VBoxHDD.cpp (modified) (8 diffs)

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

@@ -410 +410 @@
     if (   rc == VERR_PDM_GEOMETRY_NOT_SET
         || LCHSGeometry.cCylinders == 0
-        || LCHSGeometry.cCylinders > 1024
         || LCHSGeometry.cHeads == 0
         || LCHSGeometry.cHeads > 255

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

@@ -1124 +1124 @@
         {
             /* Make sure the LCHS geometry is properly clipped. */
-            pDisk->LCHSGeometry.cCylinders = RT_MIN(pDisk->LCHSGeometry.cCylinders, 1024);
             pDisk->LCHSGeometry.cHeads = RT_MIN(pDisk->LCHSGeometry.cHeads, 255);
             pDisk->LCHSGeometry.cSectors = RT_MIN(pDisk->LCHSGeometry.cSectors, 63);
@@ -1183 +1182 @@
  * @param   pszComment      Pointer to image comment. NULL is ok.
  * @param   pPCHSGeometry   Pointer to physical disk geometry <= (16383,16,63). Not NULL.
- * @param   pLCHSGeometry   Pointer to logical disk geometry <= (1024,255,63). Not NULL.
+ * @param   pLCHSGeometry   Pointer to logical disk geometry <= (x,255,63). Not NULL.
  * @param   pUuid           New UUID of the image. If NULL, a new UUID is created.
  * @param   uOpenFlags      Image file open mode, see VD_OPEN_FLAGS_* constants.
@@ -1246 +1245 @@
         /* The LCHS geometry fields may be 0 to leave it to later autodetection. */
         AssertMsgBreakStmt(   VALID_PTR(pLCHSGeometry)
-                           && pLCHSGeometry->cCylinders <= 1024
                            && pLCHSGeometry->cHeads <= 255
                            && pLCHSGeometry->cSectors <= 63,
@@ -1362 +1360 @@
             {
                 /* Make sure the CHS geometry is properly clipped. */
-                pDisk->LCHSGeometry.cCylinders = RT_MIN(pDisk->LCHSGeometry.cCylinders, 1024);
                 pDisk->LCHSGeometry.cHeads = RT_MIN(pDisk->LCHSGeometry.cHeads, 255);
                 pDisk->LCHSGeometry.cSectors = RT_MIN(pDisk->LCHSGeometry.cSectors, 63);
@@ -2197 +2194 @@
         {
             /* Make sure the LCHS geometry is properly clipped. */
-            pDisk->LCHSGeometry.cCylinders = RT_MIN(pDisk->LCHSGeometry.cCylinders, 1024);
             pDisk->LCHSGeometry.cHeads = RT_MIN(pDisk->LCHSGeometry.cHeads, 255);
             pDisk->LCHSGeometry.cSectors = RT_MIN(pDisk->LCHSGeometry.cSectors, 63);
@@ -2592 +2588 @@
                 {
                     /* Make sure the CHS geometry is properly clipped. */
-                    pDisk->PCHSGeometry.cCylinders = RT_MIN(pDisk->PCHSGeometry.cCylinders, 1024);
                     pDisk->PCHSGeometry.cHeads = RT_MIN(pDisk->PCHSGeometry.cHeads, 255);
                     pDisk->PCHSGeometry.cSectors = RT_MIN(pDisk->PCHSGeometry.cSectors, 63);
@@ -2701 +2696 @@
         /* Check arguments. */
         AssertMsgBreakStmt(   VALID_PTR(pLCHSGeometry)
-                           && pLCHSGeometry->cCylinders <= 1024
                            && pLCHSGeometry->cHeads <= 255
                            && pLCHSGeometry->cSectors <= 63,
@@ -2738 +2732 @@
                 {
                     /* Make sure the CHS geometry is properly clipped. */
-                    pDisk->LCHSGeometry.cCylinders = RT_MIN(pDisk->LCHSGeometry.cCylinders, 1024);
                     pDisk->LCHSGeometry.cHeads = RT_MIN(pDisk->LCHSGeometry.cHeads, 255);
                     pDisk->LCHSGeometry.cSectors = RT_MIN(pDisk->LCHSGeometry.cSectors, 63);