Changeset 44537 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Feb 5, 2013 9:31:10 AM (12 years ago)

Author:

vboxsync

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

83586

Message:

DevE1000.cpp: Don't use the default device critsect.

File:

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

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

@@ -6439 +6439 @@
 
 /**
- * @callback_method_impl{FNSSMDEVSAVEPREP}
+ * @callback_method_impl{FNSSMDEVSAVEPREP,Synchronize.}
  */
 static DECLCALLBACK(int) e1kSavePrep(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
@@ -6475 +6475 @@
 
 /**
- * @callback_method_impl{FNSSMDEVSAVEEXEc}
+ * @callback_method_impl{FNSSMDEVSAVEEXEC}
  */
 static DECLCALLBACK(int) e1kSaveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
@@ -7406 +7406 @@
     pThis->INetworkConfig.pfnSetLinkState   = e1kSetLinkState;
 
-
     /*
      * Validate configuration.
@@ -7464 +7463 @@
     Assert(pThis->cMsLinkUpDelay <= 300000); /* less than 5 minutes */
     if (pThis->cMsLinkUpDelay > 5000)
-    {
-        LogRel(("%s WARNING! Link up delay is set to %u seconds!\n",
-                INSTANCE(pThis), pThis->cMsLinkUpDelay / 1000));
-    }
+        LogRel(("%s WARNING! Link up delay is set to %u seconds!\n", INSTANCE(pThis), pThis->cMsLinkUpDelay / 1000));
     else if (pThis->cMsLinkUpDelay == 0)
-    {
         LogRel(("%s WARNING! Link up delay is disabled!\n", INSTANCE(pThis)));
-    }
 
     E1kLog(("%s Chip=%s LinkUpDelay=%ums EthernetCRC=%s GSO=%s\n", INSTANCE(pThis),
@@ -7485 +7479 @@
     Phy::setLinkStatus(&pThis->phy, pThis->fCableConnected);
 
-    /* Initialize critical sections. */
+    /* Initialize critical sections. We do our own locking. */
+    rc = PDMDevHlpSetDeviceCritSect(pDevIns, PDMDevHlpCritSectGetNop(pDevIns));
+    AssertRCReturn(rc, rc);
+
     rc = PDMDevHlpCritSectInit(pDevIns, &pThis->cs, RT_SRC_POS, "%s", pThis->szInstance);
     if (RT_FAILURE(rc))
@@ -7508 +7505 @@
     /* Set PCI config registers */
     e1kConfigurePCI(pThis->pciDevice, pThis->eChip);
+
     /* Register PCI device */
     rc = PDMDevHlpPCIRegister(pDevIns, &pThis->pciDevice);