Changeset 71944 in vbox for trunk/src/VBox/Devices

Timestamp:

Apr 20, 2018 1:56:33 PM (7 years ago)

Author:

vboxsync

Message:

Applied patch for (bugref:9098) Dev/VirtioNet: no sends on disconnected link; do not raise interrupts until driver ready.

File:

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

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

@@ -528 +528 @@
 
 /**
+ * Helper function that raises an interrupt if the guest is ready to receive it.
+ */
+int vnetRaiseInterrupt(PVNETSTATE pThis, int rcBusy, uint8_t u8IntCause)
+{
+    if (pThis->VPCI.uStatus & VPCI_STATUS_DRV_OK)
+        return vpciRaiseInterrupt(&pThis->VPCI, rcBusy, u8IntCause);
+    return rcBusy;
+}
+
+
+/**
  * Takes down the link temporarily if it's current status is up.
  *
@@ -543 +554 @@
     {
         STATUS &= ~VNET_S_LINK_UP;
-        vpciRaiseInterrupt(&pThis->VPCI, VERR_SEM_BUSY, VPCI_ISR_CONFIG);
+        vnetRaiseInterrupt(pThis, VERR_SEM_BUSY, VPCI_ISR_CONFIG);
         /* Restore the link back in 5 seconds. */
         int rc = TMTimerSetMillies(pThis->pLinkUpTimer, pThis->cMsLinkUpDelay);
@@ -564 +575 @@
         return;
     STATUS |= VNET_S_LINK_UP;
-    vpciRaiseInterrupt(&pThis->VPCI, VERR_SEM_BUSY, VPCI_ISR_CONFIG);
+    vnetRaiseInterrupt(pThis, VERR_SEM_BUSY, VPCI_ISR_CONFIG);
     vnetWakeupReceive(pDevIns);
     vnetCsLeave(pThis);
@@ -1076 +1087 @@
         {
             Log(("%s Link is up\n", INSTANCE(pThis)));
+            pThis->fCableConnected = true;
             STATUS |= VNET_S_LINK_UP;
-            vpciRaiseInterrupt(&pThis->VPCI, VERR_SEM_BUSY, VPCI_ISR_CONFIG);
+            vnetRaiseInterrupt(pThis, VERR_SEM_BUSY, VPCI_ISR_CONFIG);
         }
         else
@@ -1084 +1096 @@
             TMTimerStop(pThis->pLinkUpTimer);
             Log(("%s Link is down\n", INSTANCE(pThis)));
+            pThis->fCableConnected = false;
             STATUS &= ~VNET_S_LINK_UP;
-            vpciRaiseInterrupt(&pThis->VPCI, VERR_SEM_BUSY, VPCI_ISR_CONFIG);
+            vnetRaiseInterrupt(pThis, VERR_SEM_BUSY, VPCI_ISR_CONFIG);
         }
         if (pThis->pDrv)
@@ -1276 +1289 @@
     {
         Log(("%s Ignoring transmit requests from non-existent driver (status=0x%x).\n", INSTANCE(pThis), pThis->VPCI.uStatus));
+        return;
+    }
+
+    if (!pThis->fCableConnected)
+    {
+        Log(("%s Ignoring transmit requests while cable is disconnected.\n", INSTANCE(pThis)));
         return;
     }