Changeset 15541 in vbox

Timestamp:

Dec 15, 2008 8:29:08 PM (16 years ago)

Author:

vboxsync

Message:

Don't exit intnet receive loop if sem wait inside NIC was interrupted. Fixes hostif net loss after VM reboot.

File:

• trunk/src/VBox/Devices/Network/DrvIntNet.cpp (modified) (1 diff)

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

@@ -464 +464 @@
                     if (RT_FAILURE(rc))
                     {
-                        STAM_PROFILE_ADV_STOP(&pThis->StatReceive, a);
-                        LogFlow(("drvIntNetAsyncIoRun: returns %Rrc (wait-for-space)\n", rc));
-                        return rc;
+                        if (rc == VERR_INTERRUPTED)
+                        {
+                            /*
+                             * NIC is going down, likely because the VM is being reset. Skip the frame.
+                             */
+                            AssertMsg(pHdr->u16Type == INTNETHDR_TYPE_FRAME, ("Unknown frame type %RX16! offRead=%#x\n",
+                                                                              pHdr->u16Type, pRingBuf->offRead));
+                            INTNETRingSkipFrame(pBuf, pRingBuf);
+                        }
+                        else
+                        {
+                            STAM_PROFILE_ADV_STOP(&pThis->StatReceive, a);
+                            LogFlow(("drvIntNetAsyncIoRun: returns %Rrc (wait-for-space)\n", rc));
+                            return rc;
+                        }
                     }
                 }