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

Timestamp:

Mar 25, 2011 3:36:59 PM (14 years ago)

Author:

vboxsync

Message:

VMM,Main: Added VMM thread init and term notifications so that Main can make sure COM is uninitialized. (Maybe we should just say IPRT cleans up COM?)

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• PDMDevHlp.cpp (modified) (1 diff)
• PDMThread.cpp (modified) (2 diffs)
• VM.cpp (modified) (2 diffs)
• VMEmt.cpp (modified) (2 diffs)

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

@@ -3029 +3029 @@
     if (RT_SUCCESS(rc))
     {
-        rc = pVM->pUVM->pVmm2UserMethods->pfnSaveState(pVM->pUVM->pVmm2UserMethods, pVM);
+        PUVM pUVM = pVM->pUVM;
+        rc = pUVM->pVmm2UserMethods->pfnSaveState(pVM->pUVM->pVmm2UserMethods, pUVM);
 
         /*

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

@@ -759 +759 @@
     pThread->Thread = Thread;
 
+    PUVM pUVM = pThread->Internal.s.pVM->pUVM;
+    if (   pUVM->pVmm2UserMethods
+        && pUVM->pVmm2UserMethods->pfnNotifyPdmtInit)
+        pUVM->pVmm2UserMethods->pfnNotifyPdmtInit(pUVM->pVmm2UserMethods, pUVM);
+
     /*
      * The run loop.
@@ -840 +845 @@
     int rc2 = RTThreadUserSignal(Thread); AssertRC(rc2);
 
+    if (   pUVM->pVmm2UserMethods
+        && pUVM->pVmm2UserMethods->pfnNotifyPdmtTerm)
+        pUVM->pVmm2UserMethods->pfnNotifyPdmtTerm(pUVM->pVmm2UserMethods, pUVM);
     Log(("PDMThread: Terminating thread %RTthrd / %p / '%s': %Rrc\n", Thread, pThread, RTThreadGetName(Thread), rc));
     return rc;

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

@@ -169 +169 @@
  * @returns VBox error code on failure.
  * @param   cCpus               Number of virtual CPUs for the new VM.
- * @param   pVmm2UserMethods    An optional method table that the VMM can use to
- *                              make the user perform various action, like for
- *                              instance state saving.
+ * @param   pVmm2UserMethods    An optional method table that the VMM can use
+ *                              to make the user perform various action, like
+ *                              for instance state saving.
  * @param   pfnVMAtError        Pointer to callback function for setting VM
- *                              errors. This was added as an implicit call to
+ *                              errors.  This was added as an implicit call to
  *                              VMR3AtErrorRegister() since there is no way the
  *                              caller can get to the VM handle early enough to
@@ -197 +197 @@
         AssertReturn(pVmm2UserMethods->u32Magic    == VMM2USERMETHODS_MAGIC,   VERR_INVALID_PARAMETER);
         AssertReturn(pVmm2UserMethods->u32Version  == VMM2USERMETHODS_VERSION, VERR_INVALID_PARAMETER);
-        AssertPtrReturn(pVmm2UserMethods->pfnSaveState, VERR_INVALID_POINTER);
+        AssertPtrNullReturn(pVmm2UserMethods->pfnSaveState, VERR_INVALID_POINTER);
+        AssertPtrNullReturn(pVmm2UserMethods->pfnNotifyEmtInit, VERR_INVALID_POINTER);
+        AssertPtrNullReturn(pVmm2UserMethods->pfnNotifyEmtTerm, VERR_INVALID_POINTER);
+        AssertPtrNullReturn(pVmm2UserMethods->pfnNotifyPdmtInit, VERR_INVALID_POINTER);
+        AssertPtrNullReturn(pVmm2UserMethods->pfnNotifyPdmtTerm, VERR_INVALID_POINTER);
         AssertReturn(pVmm2UserMethods->u32EndMagic == VMM2USERMETHODS_MAGIC,   VERR_INVALID_PARAMETER);
     }

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

@@ -81 +81 @@
     AssertReleaseMsgRCReturn(rc, ("RTTlsSet %x failed with %Rrc\n", pUVM->vm.s.idxTLS, rc), rc);
 
+    if (   pUVM->pVmm2UserMethods
+        && pUVM->pVmm2UserMethods->pfnNotifyEmtInit)
+        pUVM->pVmm2UserMethods->pfnNotifyEmtInit(pUVM->pVmm2UserMethods, pUVM, pUVCpu);
+
     /*
      * The request loop.
@@ -254 +258 @@
         AssertLogRelRC(rc2);
     }
+
+    if (   pUVM->pVmm2UserMethods
+        && pUVM->pVmm2UserMethods->pfnNotifyEmtTerm)
+        pUVM->pVmm2UserMethods->pfnNotifyEmtTerm(pUVM->pVmm2UserMethods, pUVM, pUVCpu);
 
     pUVCpu->vm.s.NativeThreadEMT = NIL_RTNATIVETHREAD;