Changeset 36437 in vbox for trunk/src/VBox/Main

Timestamp:

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

Author:

vboxsync

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

70801

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/Main

Files:

• include/ConsoleImpl.h (modified) (2 diffs)
• src-client/ConsoleImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -590 +590 @@
     static DECLCALLBACK(int)   powerDownThread(RTTHREAD Thread, void *pvUser);
 
-    static DECLCALLBACK(int)    vmm2User_SaveState(PCVMM2USERMETHODS pThis, PVM pVM);
+    static DECLCALLBACK(int)    vmm2User_SaveState(PCVMM2USERMETHODS pThis, PUVM pUVM);
+    static DECLCALLBACK(void)   vmm2User_NotifyEmtTerm(PCVMM2USERMETHODS pThis, PUVM pUVM, PUVMCPU pUVCpu);
+    static DECLCALLBACK(void)   vmm2User_NotifyPdmtTerm(PCVMM2USERMETHODS pThis, PUVM pUVM);
 
     static DECLCALLBACK(void *) drvStatus_QueryInterface(PPDMIBASE pInterface, const char *pszIID);
@@ -682 +684 @@
     bool mfSnapshotFolderDiskTypeShown : 1;
 
-    /** Pointer to the VMM -> User (that's us) callbacks.
-     * This structure is followed by a pointer to the Console object. */
-    PCVMM2USERMETHODS mpVmm2UserMethods;
+    /** Pointer to the VMM -> User (that's us) callbacks. */
+    struct MYVMM2USERMETHODS : public VMM2USERMETHODS
+    {
+        Console *pConsole;
+    } *mpVmm2UserMethods;
 
     /** The current network attachment type in the VM.

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -346 +346 @@
 typedef ListenerImpl<VmEventListener, Console*> VmEventListenerImpl;
 
+
 VBOX_LISTENER_DECLARE(VmEventListenerImpl)
 
@@ -390 +391 @@
         maStorageDevType[i] = DeviceType_Null;
 
-    VMM2USERMETHODS *pVmm2UserMethods = (VMM2USERMETHODS *)RTMemAlloc(sizeof(*mpVmm2UserMethods) + sizeof(Console *));
+    MYVMM2USERMETHODS *pVmm2UserMethods = (MYVMM2USERMETHODS *)RTMemAllocZ(sizeof(*mpVmm2UserMethods) + sizeof(Console *));
     if (!pVmm2UserMethods)
         return E_OUTOFMEMORY;
-    pVmm2UserMethods->u32Magic      = VMM2USERMETHODS_MAGIC;
-    pVmm2UserMethods->u32Version    = VMM2USERMETHODS_VERSION;
-    pVmm2UserMethods->pfnSaveState  = Console::vmm2User_SaveState;
-    pVmm2UserMethods->u32EndMagic   = VMM2USERMETHODS_MAGIC;
-    *(Console **)(pVmm2UserMethods + 1) = this; /* lazy bird. */
+    pVmm2UserMethods->u32Magic          = VMM2USERMETHODS_MAGIC;
+    pVmm2UserMethods->u32Version        = VMM2USERMETHODS_VERSION;
+    pVmm2UserMethods->pfnSaveState      = Console::vmm2User_SaveState;
+    pVmm2UserMethods->pfnNotifyEmtInit  = NULL;
+    pVmm2UserMethods->pfnNotifyEmtTerm  = Console::vmm2User_NotifyEmtTerm;
+    pVmm2UserMethods->pfnNotifyPdmtInit = NULL;
+    pVmm2UserMethods->pfnNotifyPdmtTerm = Console::vmm2User_NotifyPdmtTerm;
+    pVmm2UserMethods->u32EndMagic       = VMM2USERMETHODS_MAGIC;
+    pVmm2UserMethods->pConsole          = this;
     mpVmm2UserMethods = pVmm2UserMethods;
 
@@ -8790 +8795 @@
  * @interface_method_impl{VMM2USERMETHODS,pfnSaveState}
  */
-/*static*/
-DECLCALLBACK(int) Console::vmm2User_SaveState(PCVMM2USERMETHODS pThis, PVM pVM)
-{
-    Console *pConsole = *(Console **)(pThis + 1); /* lazy bird */
+/*static*/ DECLCALLBACK(int)
+Console::vmm2User_SaveState(PCVMM2USERMETHODS pThis, PUVM pUVM)
+{
+    Console *pConsole = ((MYVMM2USERMETHODS *)pThis)->pConsole;
+    NOREF(pUVM);
 
     /*
@@ -8802 +8808 @@
     return SUCCEEDED(hrc) ? VINF_SUCCESS : Global::vboxStatusCodeFromCOM(hrc);
 }
+
+/**
+ * @interface_method_impl{VMM2USERMETHODS,pfnNotifyEmtTerm}
+ */
+/*static*/ DECLCALLBACK(void)
+Console::vmm2User_NotifyEmtTerm(PCVMM2USERMETHODS pThis, PUVM pUVM, PUVMCPU pUVCpu)
+{
+    NOREF(pThis); NOREF(pUVM); NOREF(pUVCpu);
+#ifdef RT_OS_WINDOWS
+    CoUninitialize();
+#endif
+}
+
+/**
+ * @interface_method_impl{VMM2USERMETHODS,pfnNotifyPdmtTerm}
+ */
+/*static*/ DECLCALLBACK(void)
+Console::vmm2User_NotifyPdmtTerm(PCVMM2USERMETHODS pThis, PUVM pUVM)
+{
+    NOREF(pThis); NOREF(pUVM);
+#ifdef RT_OS_WINDOWS
+    CoUninitialize();
+#endif
+}
+