Changeset 22555 in vbox

Timestamp:

Aug 28, 2009 4:14:04 PM (15 years ago)

Author:

vboxsync

Message:

E1000: delay the bringup of link for 5 sec after VM restore.

File:

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

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

@@ -4306 +4306 @@
             STATUS &= ~STATUS_LU;
             Phy::setLinkStatus(&pState->phy, false);
-            e1kRaiseInterrupt(pState, ICR_LSC);
+            e1kRaiseInterrupt(pState, VERR_SEM_BUSY, ICR_LSC);
             /* Restore the link back in 5 second. */
             e1kArmTimer(pState, pState->pLUTimer, 5000000);
@@ -4315 +4315 @@
             STATUS &= ~STATUS_LU;
             Phy::setLinkStatus(&pState->phy, false);
+            e1kRaiseInterrupt(pState, VERR_SEM_BUSY, ICR_LSC);
         }
-        e1kRaiseInterrupt(pState, VERR_SEM_BUSY, ICR_LSC);
         if (pState->pDrv)
             pState->pDrv->pfnNotifyLinkChanged(pState->pDrv, enmState);
@@ -4515 +4515 @@
  * @param   pSSMHandle  The handle to the saved state.
  */
-#if 0
 static DECLCALLBACK(int) e1kLoadDone(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle)
 {
@@ -4532 +4531 @@
         STATUS &= ~STATUS_LU;
         Phy::setLinkStatus(&pState->phy, false);
-        e1kRaiseInterrupt(pState, ICR_LSC);
+        e1kRaiseInterrupt(pState, VERR_SEM_BUSY, ICR_LSC);
         /* Restore the link back in half a second. */
-        e1kArmTimer(pState, pState->pLUTimer, 500000);
+        e1kArmTimer(pState, pState->pLUTimer, 5000000);
     }
     e1kMutexRelease(pState);
     return VINF_SUCCESS;
 }
-#endif
 
 /**
@@ -4765 +4763 @@
                                 NULL, NULL, NULL,
                                 e1kSavePrep, e1kSaveExec, NULL,
-                                e1kLoadPrep, e1kLoadExec, NULL);
+                                e1kLoadPrep, e1kLoadExec, e1kLoadDone);
     if (RT_FAILURE(rc))
         return rc;
@@ -5126 +5124 @@
         STATUS &= ~STATUS_LU;
         Phy::setLinkStatus(&pState->phy, false);
-        e1kRaiseInterrupt(pState, ICR_LSC);
+        e1kRaiseInterrupt(pState, VERR_SEM_BUSY, ICR_LSC);
         /* Restore the link back in 5 second. */
         e1kArmTimer(pState, pState->pLUTimer, 5000000);