Changeset 84765 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Jun 10, 2020 5:39:10 PM (5 years ago)

Author:

vboxsync

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

138564

Message:

VMM/PDMDevice: Need to assign the device helper tracing variant before calling the constructor to catch all interesting events, bugref:9210

File:

• trunk/src/VBox/VMM/VMMR3/PDMDevice.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR3/PDMDevice.cpp

@@ -497 +497 @@
         }
 
+#ifdef VBOX_WITH_DBGF_TRACING
+        /*
+         * Allocate memory for the MMIO/IO port registration tracking if DBGF tracing is enabled.
+         */
+        if (hDbgfTraceEvtSrc != NIL_DBGFTRACEREVTSRC)
+        {
+            pDevIns->Internal.s.paDbgfTraceTrack = (PPDMDEVINSDBGFTRACK)RTMemAllocZ(PDM_MAX_DEVICE_DBGF_TRACING_TRACK);
+            if (!pDevIns->Internal.s.paDbgfTraceTrack)
+            {
+                LogRel(("PDM: Failed to construct '%s'/%d! %Rra\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_NO_MEMORY));
+                if (VMR3GetErrorCount(pVM->pUVM) == 0)
+                    VMSetError(pVM, rc, RT_SRC_POS, "Failed to construct device '%s' instance #%u",
+                               pDevIns->pReg->szName, pDevIns->iInstance);
+                paDevs[i].pDev->cInstances--;
+                return VERR_NO_MEMORY;
+            }
+
+            pDevIns->Internal.s.idxDbgfTraceTrackNext = 0;
+            pDevIns->Internal.s.cDbgfTraceTrackMax = PDM_MAX_DEVICE_DBGF_TRACING_TRACK / sizeof(PDMDEVINSDBGFTRACK);
+            pDevIns->pHlpR3 = &g_pdmR3DevHlpTracing;
+        }
+#endif
+
         /*
          * Call the constructor.
@@ -514 +537 @@
             return rc == VERR_VERSION_MISMATCH ? VERR_PDM_DEVICE_VERSION_MISMATCH : rc;
         }
-
-#ifdef VBOX_WITH_DBGF_TRACING
-        /*
-         * Allocate memory for the MMIO/IO port registration tracking if DBGF tracing is enabled.
-         */
-        if (hDbgfTraceEvtSrc != NIL_DBGFTRACEREVTSRC)
-        {
-            pDevIns->Internal.s.paDbgfTraceTrack = (PPDMDEVINSDBGFTRACK)RTMemAllocZ(PDM_MAX_DEVICE_DBGF_TRACING_TRACK);
-            if (!pDevIns->Internal.s.paDbgfTraceTrack)
-            {
-                LogRel(("PDM: Failed to construct '%s'/%d! %Rra\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_NO_MEMORY));
-                if (VMR3GetErrorCount(pVM->pUVM) == 0)
-                    VMSetError(pVM, rc, RT_SRC_POS, "Failed to construct device '%s' instance #%u",
-                               pDevIns->pReg->szName, pDevIns->iInstance);
-                paDevs[i].pDev->cInstances--;
-                return VERR_NO_MEMORY;
-            }
-
-            pDevIns->Internal.s.idxDbgfTraceTrackNext = 0;
-            pDevIns->Internal.s.cDbgfTraceTrackMax = PDM_MAX_DEVICE_DBGF_TRACING_TRACK / sizeof(PDMDEVINSDBGFTRACK);
-            pDevIns->pHlpR3 = &g_pdmR3DevHlpTracing;
-        }
-#endif
 
         /*