Changeset 103425 in vbox for trunk/src

Timestamp:

Feb 19, 2024 11:12:14 AM (12 months ago)

Author:

vboxsync

Message:

Devices/Serial: Fix some warnings, parfait:3409

Location:

trunk/src/VBox/Devices/Serial

Files:

• DevPL011.cpp (modified) (2 diffs)
• DevSerial.cpp (modified) (1 diff)
• DrvChar.cpp (modified) (1 diff)
• DrvHostSerial.cpp (modified) (2 diffs)
• DrvTCP.cpp (modified) (1 diff)
• UartCore.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Serial/DevPL011.cpp

@@ -708 +708 @@
 
     PPL011FIFO pFifo = &pThis->FifoRecv;
-    size_t cbFill = RT_MIN(pl011FifoFreeGet(pFifo),
-                           ASMAtomicReadU32(&pThis->cbAvailRdr));
+    size_t const cbFifoFree = pl011FifoFreeGet(pFifo);
+    uint32_t const cbAvailRdr = ASMAtomicReadU32(&pThis->cbAvailRdr);
+    size_t const cbFill = RT_MIN(cbFifoFree, cbAvailRdr);
     size_t cbFilled = 0;
 
@@ -1473 +1474 @@
         rc = pl011R3FifoLoadExec(pHlp, &pThis->FifoRecv, pSSM);
     if (RT_SUCCESS(rc))
+    {
         rc = PDMDevHlpTimerLoad(pDevIns, pThis->hTimerTxUnconnected, pSSM);
+        AssertRCReturn(rc, rc);
+    }
 
     /* The marker. */

trunk/src/VBox/Devices/Serial/DevSerial.cpp

@@ -246 +246 @@
 
             bIrq        = (uint8_t)iIrqTmp;
-            PortAddress = (uint32_t)uPortAddressTmp;
+            PortAddress = (RTIOPORT)uPortAddressTmp;
         }
         else

trunk/src/VBox/Devices/Serial/DrvChar.cpp

@@ -332 +332 @@
                     /* Notify the upper device/driver. */
                     rc = pThis->pDrvSerialPort->pfnDataAvailRdrNotify(pThis->pDrvSerialPort, cbRead);
+                    if (RT_FAILURE(rc))
+                    {
+                        LogRel(("Char#%d: Notifying upper driver about available data failed with %Rrc\n",
+                                pDrvIns->iInstance, rc));
+                        break;
+                    }
                 }
             }

trunk/src/VBox/Devices/Serial/DrvHostSerial.cpp

@@ -264 +264 @@
     {
         void *pvSrc = NULL;
-        size_t cbThisRead = RT_MIN(drvHostSerialReadBufGetRead(pThis, &pvSrc), cbRead);
+        size_t cbReadMax  = drvHostSerialReadBufGetRead(pThis, &pvSrc);
+        size_t cbThisRead = RT_MIN(cbReadMax, cbRead);
         if (cbThisRead)
         {
@@ -423 +424 @@
 
     LogFlowFunc(("-> %Rrc\n", rc));
-    return VINF_SUCCESS;
+    return rc;
 }
 

trunk/src/VBox/Devices/Serial/DrvTCP.cpp

@@ -277 +277 @@
             /* Adjust remaining time to wait. */
             uint64_t tsPollSpanMs = RTTimeMilliTS() - tsStartMs;
-            cMillies -= RT_MIN(cMillies, tsPollSpanMs);
+            Assert(tsPollSpanMs == (RTMSINTERVAL)tsPollSpanMs);
+
+            cMillies -= RT_MIN(cMillies, (RTMSINTERVAL)tsPollSpanMs);
             if (RT_SUCCESS(rc))
             {

trunk/src/VBox/Devices/Serial/UartCore.cpp

@@ -640 +640 @@
 
     PUARTFIFO pFifo = &pThis->FifoRecv;
-    size_t cbFill = RT_MIN(uartFifoFreeGet(pFifo),
-                           ASMAtomicReadU32(&pThis->cbAvailRdr));
+    size_t const cbFifoFree = uartFifoFreeGet(pFifo);
+    uint32_t const cbAvailRdr = ASMAtomicReadU32(&pThis->cbAvailRdr);
+    size_t const cbFill = RT_MIN(cbFifoFree, cbAvailRdr);
     size_t cbFilled = 0;