Changeset 107483 in vbox for trunk/src

Timestamp:

Jan 8, 2025 9:17:26 AM (11 days ago)

Author:

vboxsync

Message:

Devices/PC/DevPcBios.cpp: Fix some parfait warnings, bugref:3409

File:

• trunk/src/VBox/Devices/PC/DevPcBios.cpp (modified) (5 diffs)

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

@@ -638 +638 @@
             cLCHSHeads = iEndHead + 1;
             cLCHSSectors = iEndSector;
-            cLCHSCylinders = RT_MIN(1024, pMedia->pfnGetSize(pMedia) / (512 * cLCHSHeads * cLCHSSectors));
+
+            uint64_t const cbMedia = pMedia->pfnGetSize(pMedia);
+            cLCHSCylinders = RT_MIN(1024, cbMedia / (512 * cLCHSHeads * cLCHSSectors));
             if (cLCHSCylinders >= 1)
             {
@@ -1082 +1084 @@
             AssertRC(rc2);
 
-            if (i < 4)
+            Assert(i < 4);
+            /* Award BIOS extended drive types for first to fourth disk.
+             * Used by the BIOS for setting the logical geometry. */
+            int offType, offInfo;
+            switch (i)
             {
-                /* Award BIOS extended drive types for first to fourth disk.
-                 * Used by the BIOS for setting the logical geometry. */
-                int offType, offInfo;
-                switch (i)
-                {
-                    case 0:
-                        offType = 0x19;
-                        offInfo = 0x1e;
-                        break;
-                    case 1:
-                        offType = 0x1a;
-                        offInfo = 0x26;
-                        break;
-                    case 2:
-                        offType = 0x00;
-                        offInfo = 0x67;
-                        break;
-                    case 3:
-                    default:
-                        offType = 0x00;
-                        offInfo = 0x70;
-                        break;
-                }
-                pcbiosCmosInitHardDisk(pDevIns, offType, offInfo, &LCHSGeometry);
-                if (i < 2)
-                    pcbiosCmosTryPCATHardDisk(pDevIns, i, &LCHSGeometry);
+                case 0:
+                    offType = 0x19;
+                    offInfo = 0x1e;
+                    break;
+                case 1:
+                    offType = 0x1a;
+                    offInfo = 0x26;
+                    break;
+                case 2:
+                    offType = 0x00;
+                    offInfo = 0x67;
+                    break;
+                case 3:
+                default:
+                    offType = 0x00;
+                    offInfo = 0x70;
+                    break;
             }
+            pcbiosCmosInitHardDisk(pDevIns, offType, offInfo, &LCHSGeometry);
+            if (i < 2)
+                pcbiosCmosTryPCATHardDisk(pDevIns, i, &LCHSGeometry);
+
             LogRel(("PcBios: ATA LUN#%d LCHS=%u/%u/%u\n", i, LCHSGeometry.cCylinders, LCHSGeometry.cHeads, LCHSGeometry.cSectors));
         }
@@ -1140 +1141 @@
                 AssertRC(rc);
 
-                if (i < 4)
+                Assert(i < 4);
+                /* Award BIOS extended drive types for first to fourth disk.
+                 * Used by the BIOS for setting the logical geometry. */
+                int offInfo;
+                switch (i)
                 {
-                    /* Award BIOS extended drive types for first to fourth disk.
-                     * Used by the BIOS for setting the logical geometry. */
-                    int offInfo;
-                    switch (i)
-                    {
-                        case 0:
-                            offInfo = 0x40;
-                            break;
-                        case 1:
-                            offInfo = 0x48;
-                            break;
-                        case 2:
-                            offInfo = 0x50;
-                            break;
-                        case 3:
-                        default:
-                            offInfo = 0x58;
-                            break;
-                    }
-                    pcbiosCmosInitHardDisk(pDevIns, 0x00, offInfo,
-                                           &LCHSGeometry);
+                    case 0:
+                        offInfo = 0x40;
+                        break;
+                    case 1:
+                        offInfo = 0x48;
+                        break;
+                    case 2:
+                        offInfo = 0x50;
+                        break;
+                    case 3:
+                    default:
+                        offInfo = 0x58;
+                        break;
                 }
+                pcbiosCmosInitHardDisk(pDevIns, 0x00, offInfo,
+                                       &LCHSGeometry);
+
                 LogRel(("PcBios: SATA LUN#%d LCHS=%u/%u/%u\n", i, LCHSGeometry.cCylinders, LCHSGeometry.cHeads, LCHSGeometry.cSectors));
             }
@@ -1193 +1193 @@
                 rc = getLogicalDiskGeometry(apHDs[i], &LCHSGeometry);
 
-                if (i < 4 && RT_SUCCESS(rc))
+                if (RT_SUCCESS(rc))
                 {
+                    Assert(i < 4);
+
                     /* Extended drive information (for SCSI disks).
                      * Used by the BIOS for setting the logical geometry, but
@@ -1577 +1579 @@
                                 NULL, pcbiosSaveExec, NULL,
                                 pcbiosLoadPrep, pcbiosLoadExec, pcbiosLoadDone);
+    AssertRCReturn(rc, rc);
 
     /* Clear the net boot device list. All bits set invokes old behavior,