Changeset 75004 in vbox

Timestamp:

Oct 23, 2018 2:43:06 PM (6 years ago)

Author:

vboxsync

Message:

VMM: Register ring-3 probes after initialization of SUPLib to avoid asserting when SUPR3Init failed during RTR3Init(). ticketref:18048

File:

• trunk/src/VBox/VMM/VMMR3/VM.cpp (modified) (3 diffs)

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

@@ -117 +117 @@
 
 /**
- * Do global VMM init.
- *
- * @returns VBox status code.
- */
-VMMR3DECL(int)   VMR3GlobalInit(void)
-{
-    /*
-     * Only once.
-     */
-    static bool volatile s_fDone = false;
-    if (s_fDone)
-        return VINF_SUCCESS;
-
-#if defined(VBOX_WITH_DTRACE_R3) && !defined(VBOX_WITH_NATIVE_DTRACE)
-    SUPR3TracerRegisterModule(~(uintptr_t)0, "VBoxVMM", &g_VTGObjHeader, (uintptr_t)&g_VTGObjHeader,
-                              SUP_TRACER_UMOD_FLAGS_SHARED);
-#endif
-
-    /*
-     * We're done.
-     */
-    s_fDone = true;
-    return VINF_SUCCESS;
-}
-
-
-/**
  * Creates a virtual machine by calling the supplied configuration constructor.
  *
@@ -201 +174 @@
 
     /*
-     * Because of the current hackiness of the applications
-     * we'll have to initialize global stuff from here.
-     * Later the applications will take care of this in a proper way.
-     */
-    static bool fGlobalInitDone = false;
-    if (!fGlobalInitDone)
-    {
-        int rc = VMR3GlobalInit();
-        if (RT_FAILURE(rc))
-            return rc;
-        fGlobalInitDone = true;
-    }
-
-    /*
      * Validate input.
      */
@@ -237 +196 @@
         if (RT_SUCCESS(rc))
         {
+#if defined(VBOX_WITH_DTRACE_R3) && !defined(VBOX_WITH_NATIVE_DTRACE)
+            /* Now that we've opened the device, we can register trace probes. */
+            static bool s_fRegisteredProbes = false;
+            if (ASMAtomicCmpXchgBool(&s_fRegisteredProbes, true, false))
+                SUPR3TracerRegisterModule(~(uintptr_t)0, "VBoxVMM", &g_VTGObjHeader, (uintptr_t)&g_VTGObjHeader,
+                                          SUP_TRACER_UMOD_FLAGS_SHARED);
+#endif
+
             /*
              * Call vmR3CreateU in the EMT thread and wait for it to finish.