Changeset 90447 in vbox for trunk/src/VBox/Devices/Network/DevVirtioNet.cpp

Timestamp:

Jul 31, 2021 12:44:13 AM (3 years ago)

Author:

vboxsync

Message:

Dev*: Checked up all the PDMDevHlpCritSectEnter calls to make sure the status code is checked. bugref:6695

File:

• trunk/src/VBox/Devices/Network/DevVirtioNet.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/Network/DevVirtioNet.cpp

@@ -328 +328 @@
     return !!(pThis->VPCI.uGuestFeatures & VNET_F_MRG_RXBUF);
 }
+
+#define VNET_R3_CS_ENTER_RETURN_VOID(a_pDevIns, a_pThis) VPCI_R3_CS_ENTER_RETURN_VOID(a_pDevIns, &(a_pThis)->VPCI)
 
 DECLINLINE(int) vnetR3CsEnter(PPDMDEVINS pDevIns, PVNETSTATE pThis, int rcBusy)
@@ -648 +650 @@
     RT_NOREF(hTimer, pvUser);
 
-    int rc = vnetR3CsEnter(pDevIns, pThis, VERR_SEM_BUSY);
-    AssertRCReturnVoid(rc);
+    VNET_R3_CS_ENTER_RETURN_VOID(pDevIns, pThis);
 
     pThis->config.uStatus |= VNET_S_LINK_UP;
@@ -1509 +1510 @@
         Log3(("%s vnetR3QueueTransmit: Got kicked with notification disabled, re-enable notification and flush TX queue\n", INSTANCE(pThis)));
         vnetR3TransmitPendingPackets(pDevIns, pThis, pThisCC, pQueue, false /*fOnWorkerThread*/);
-        if (RT_FAILURE(vnetR3CsEnter(pDevIns, pThis, VERR_SEM_BUSY)))
-            LogRel(("vnetR3QueueTransmit: Failed to enter critical section!/n"));
-        else
-        {
-            vringSetNotification(pDevIns, &pThisCC->pTxQueue->VRing, true);
-            vnetR3CsLeave(pDevIns, pThis);
-        }
+
+        VNET_R3_CS_ENTER_RETURN_VOID(pDevIns, pThis);
+
+        vringSetNotification(pDevIns, &pThisCC->pTxQueue->VRing, true);
+
+        vnetR3CsLeave(pDevIns, pThis);
     }
     else
     {
-        if (RT_FAILURE(vnetR3CsEnter(pDevIns, pThis, VERR_SEM_BUSY)))
-            LogRel(("vnetR3QueueTransmit: Failed to enter critical section!/n"));
-        else
-        {
-            vringSetNotification(pDevIns, &pThisCC->pTxQueue->VRing, false);
-            PDMDevHlpTimerSetMicro(pDevIns, pThis->hTxTimer, VNET_TX_DELAY);
-            pThis->u64NanoTS = RTTimeNanoTS();
-            vnetR3CsLeave(pDevIns, pThis);
-        }
+        VNET_R3_CS_ENTER_RETURN_VOID(pDevIns, pThis);
+
+        vringSetNotification(pDevIns, &pThisCC->pTxQueue->VRing, false);
+        PDMDevHlpTimerSetMicro(pDevIns, pThis->hTxTimer, VNET_TX_DELAY);
+        pThis->u64NanoTS = RTTimeNanoTS();
+
+        vnetR3CsLeave(pDevIns, pThis);
     }
 }
@@ -1552 +1550 @@
 //    Log3(("%s vnetR3TxTimer: Expired\n", INSTANCE(pThis)));
     vnetR3TransmitPendingPackets(pDevIns, pThis, pThisCC, pThisCC->pTxQueue, false /*fOnWorkerThread*/);
-    int rc = vnetR3CsEnter(pDevIns, pThis, VERR_SEM_BUSY)
-    AssertLogRelRCReturnVoid(rc);
+
+    VNET_R3_CS_ENTER_RETURN_VOID(pDevIns, pThis);
     vringSetNotification(pDevIns, &pThisCC->pTxQueue->VRing, true);
     vnetR3CsLeave(pDevIns, pThis);
@@ -2043 +2041 @@
     AssertLogRelReturnVoid(iLUN == 0);
 
-    int rc = vnetR3CsEnter(pDevIns, pThis, VERR_SEM_BUSY);
-    if (RT_FAILURE(rc))
-    {
-        LogRel(("vnetR3Detach failed to enter critical section!\n"));
-        return;
-    }
+    VNET_R3_CS_ENTER_RETURN_VOID(pDevIns, pThis);
 
     vnetR3DestroyTxThreadAndEvent(pDevIns, pThis, pThisCC);
@@ -2075 +2068 @@
 
     int rc = vnetR3CsEnter(pDevIns, pThis, VERR_SEM_BUSY);
-    if (RT_FAILURE(rc))
-    {
-        LogRel(("vnetR3Attach failed to enter critical section!\n"));
-        return rc;
-    }
+    AssertRCReturn(rc, rc);
 
     /*