Changeset 90931 in vbox for trunk/src/VBox/Devices/Network/DevVirtioNet_1_0.cpp

Timestamp:

Aug 27, 2021 5:42:02 AM (3 years ago)

Author:

vboxsync

Message:

Fixes issue in BugRef(8651) Comment #100

File:

• trunk/src/VBox/Devices/Network/DevVirtioNet_1_0.cpp (modified) (8 diffs)

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

@@ -149 +149 @@
 #define CTRLQIDX                        (FEATURE_ENABLED(MQ) ? ((VIRTIONET_MAX_QPAIRS - 1) * 2 + 2) : 2)
 
-#define IS_LINK_UP(pState)              (pState->virtioNetConfig.uStatus & VIRTIONET_F_LINK_UP)
+#define IS_LINK_UP(pState)              !!(pState->virtioNetConfig.uStatus & VIRTIONET_F_LINK_UP)
 #define IS_LINK_DOWN(pState)            !IS_LINK_UP(pState)
 
@@ -2279 +2279 @@
     PVIRTIOCORE pVirtio = &pThis->Virtio;
 
+
+    if (!pThis->fVirtioReady)
+    {
+        LogFunc(("%s Ignoring Tx requests. VirtIO not ready (status=0x%x).\n",
+                pThis->szInst, pThis->virtioNetConfig.uStatus));
+        return;
+    }
+
+    if (!pThis->fCableConnected)
+    {
+        Log(("%s Ignoring transmit requests while cable is disconnected.\n", pThis->szInst));
+        return;
+    }
+
     /*
      * Only one thread is allowed to transmit at a time, others should skip
@@ -2287 +2301 @@
         return;
 
-
-    if (!pThis->fVirtioReady)
-    {
-        LogFunc(("%s Ignoring Tx requests. VirtIO not ready (status=0x%x).\n",
-                pThis->szInst, pThis->virtioNetConfig.uStatus));
-        return;
-    }
-
-    if (!pThis->fCableConnected)
-    {
-        Log(("%s Ignoring transmit requests while cable is disconnected.\n", pThis->szInst));
-        return;
-    }
 
 
@@ -2486 +2487 @@
 static void virtioNetR3TempLinkDown(PPDMDEVINS pDevIns, PVIRTIONET pThis, PVIRTIONETCC pThisCC)
 {
+
     if (IS_LINK_UP(pThis))
     {
@@ -2507 +2509 @@
     PVIRTIONET   pThis   = PDMDEVINS_2_DATA(pDevIns, PVIRTIONET);
 
-    bool fCachedLinkIsUp = IS_LINK_UP(pThis);
-    bool fActiveLinkIsUp = (enmState == PDMNETWORKLINKSTATE_UP);
+    bool fRequestedLinkStateIsUp = (enmState == PDMNETWORKLINKSTATE_UP);
 
     if (LogIs7Enabled())
@@ -2531 +2532 @@
     if (enmState == PDMNETWORKLINKSTATE_DOWN_RESUME)
     {
-        if (fCachedLinkIsUp)
+
+        if (IS_LINK_UP(pThis))
         {
             /*
@@ -2542 +2544 @@
         }
     }
-    else if (fActiveLinkIsUp != fCachedLinkIsUp)
-    {
-        if (fCachedLinkIsUp)
+    else if (fRequestedLinkStateIsUp != IS_LINK_UP(pThis))
+    {
+        if (fRequestedLinkStateIsUp)
         {
             Log(("%s Link is up\n", pThis->szInst));
@@ -2551 +2553 @@
             virtioCoreNotifyConfigChanged(&pThis->Virtio);
         }
-        else /* cached Link state is down */
+        else /* Link requested to be brought down */
         {
             /* The link was brought down explicitly, make sure it won't come up by timer.  */