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

Timestamp:

Jan 11, 2010 4:23:26 PM (15 years ago)

Author:

vboxsync

Message:

PDMCritSect: Deployed lock ordering. (ring-3 only, only DEBUG_bird atm)

Location:

trunk/src/VBox/Devices/Network

Files:

• DevE1000.cpp (modified) (1 diff)
• DevPCNet.cpp (modified) (1 diff)

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

@@ -4911 +4911 @@
 
     /* Initialize critical section */
-    rc = PDMDevHlpCritSectInit(pDevIns, &pState->cs, pState->szInstance);
+    rc = PDMDevHlpCritSectInit(pDevIns, &pState->cs, RT_SRC_POS, "%s", pState->szInstance);
     if (RT_FAILURE(rc))
         return rc;
 #ifndef E1K_GLOBAL_MUTEX
-    char szTmp[sizeof(pState->szInstance) + 2];
-    RTStrPrintf(szTmp, sizeof(szTmp), "%sRX", pState->szInstance);
-    rc = PDMDevHlpCritSectInit(pDevIns, &pState->csRx, szTmp);
+    rc = PDMDevHlpCritSectInit(pDevIns, &pState->csRx, RT_SRC_POS, "%sRX", pState->szInstance);
     if (RT_FAILURE(rc))
         return rc;

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

@@ -5116 +5116 @@
      * attaching drivers or anything else that may call us back.
      */
-    char szName[24];
-    RTStrPrintf(szName, sizeof(szName), "PCNet#%d", iInstance);
-    rc = PDMDevHlpCritSectInit(pDevIns, &pThis->CritSect, szName);
+    rc = PDMDevHlpCritSectInit(pDevIns, &pThis->CritSect, RT_SRC_POS, "PCNet#%d", iInstance);
     if (RT_FAILURE(rc))
         return rc;