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

Timestamp:

May 28, 2009 1:58:57 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

47885

Message:

DevPCNet: TM locking regression (state restore).

File:

• trunk/src/VBox/Devices/Network/DevPCNet.cpp (modified) (3 diffs)

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

@@ -3842 +3842 @@
 {
     PCNetState *pThis = PDMINS_2_DATA(pDevIns, PCNetState *);
-
-    int rc = VERR_GENERAL_FAILURE;
+    int         rc = PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
+    AssertReleaseRC(rc);
+
+    rc = VERR_GENERAL_FAILURE;
     if (pThis->cLinkDownReported <= PCNET_MAX_LINKDOWN_REPORTED)
         rc = TMTimerSetMillies(pThis->pTimerRestore, 1500);
@@ -3862 +3864 @@
         Log(("#%d pcnetTimerRestore: cLinkDownReported=%d, wait another 1500ms...\n",
              pDevIns->iInstance, pThis->cLinkDownReported));
-}
-
+
+    PDMCritSectLeave(&pThis->CritSect);
+}
 
 /**
@@ -4954 +4957 @@
     if (RT_FAILURE(rc))
         return rc;
-    TMR3TimerSetCritSect(pThis->pTimerRestore, &pThis->CritSect);
 
     rc = PDMDevHlpSSMRegister(pDevIns, pDevIns->pDevReg->szDeviceName, iInstance,