Index: /trunk/src/VBox/VMM/VMMR0/GVMMR0.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR0/GVMMR0.cpp	(revision 67955)
+++ /trunk/src/VBox/VMM/VMMR0/GVMMR0.cpp	(revision 67956)
@@ -1183,13 +1183,13 @@
                     VERR_WRONG_ORDER);
 
-    uint32_t hGVM = pGVM->hSelf;
+    uint32_t        hGVM = pGVM->hSelf;
     AssertReturn(hGVM != NIL_GVM_HANDLE, VERR_INVALID_HANDLE);
     AssertReturn(hGVM < RT_ELEMENTS(pGVMM->aHandles), VERR_INVALID_HANDLE);
 
-    PGVMHANDLE pHandle = &pGVMM->aHandles[hGVM];
+    PGVMHANDLE      pHandle = &pGVMM->aHandles[hGVM];
     AssertReturn(pHandle->pVM == pVM, VERR_NOT_OWNER);
 
-    RTPROCESS      ProcId = RTProcSelf();
-    RTNATIVETHREAD hSelf  = RTThreadNativeSelf();
+    RTPROCESS       ProcId = RTProcSelf();
+    RTNATIVETHREAD  hSelf  = RTThreadNativeSelf();
     AssertReturn(   (   pHandle->hEMT0  == hSelf
                      && pHandle->ProcId == ProcId)
@@ -1203,4 +1203,7 @@
     int rc = gvmmR0CreateDestroyLock(pGVMM);
     AssertRC(rc);
+
+/** @todo Check that all other EMTs have said bye-bye. */
+
 
     /* Be careful here because we might theoretically be racing someone else cleaning up. */
Index: /trunk/src/VBox/VMM/VMMR0/VMMR0.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR0/VMMR0.cpp	(revision 67955)
+++ /trunk/src/VBox/VMM/VMMR0/VMMR0.cpp	(revision 67956)
@@ -2010,4 +2010,5 @@
  *
  * @returns VBox status code.
+ * @param   pGVM            The global (ring-0) VM structure.
  * @param   pVM             The cross context VM structure.
  * @param   idCpu           Virtual CPU ID argument. Must be NIL_VMCPUID if pVM