Changeset 47456 in vbox for trunk/src

Timestamp:

Jul 29, 2013 12:51:12 PM (11 years ago)

Author:

vboxsync

Message:

VMM/VMMR0,GVMMR0: Thread-context hooks creation/release. The registeration/de-registeration and HM hook implementation is still todo.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/GVMMR0.cpp (modified) (5 diffs)
• include/VMMInternal.h (modified) (1 diff)
• include/VMMInternal.mac (modified) (1 diff)

trunk/src/VBox/VMM/VMMR0/GVMMR0.cpp

@@ -868 +868 @@
                                     }
 
-                                    rc = RTR0MemObjMapUser(&pGVM->gvmm.s.VMPagesMapObj, pGVM->gvmm.s.VMPagesMemObj, (RTR3PTR)-1, 0,
-                                                           RTMEM_PROT_READ | RTMEM_PROT_WRITE, NIL_RTR0PROCESS);
+                                    rc = RTR0MemObjMapUser(&pGVM->gvmm.s.VMPagesMapObj, pGVM->gvmm.s.VMPagesMemObj, (RTR3PTR)-1,
+                                                           0 /* uAlignment */, RTMEM_PROT_READ | RTMEM_PROT_WRITE,
+                                                           NIL_RTR0PROCESS);
                                     if (RT_SUCCESS(rc))
                                     {
@@ -888 +889 @@
                                         pGVMM->cEMTs += cCpus;
 
-                                        VBOXVMM_R0_GVMM_VM_CREATED(pGVM, pVM, ProcId, (void *)hEMT0, cCpus);
-
-                                        gvmmR0UsedUnlock(pGVMM);
-                                        gvmmR0CreateDestroyUnlock(pGVMM);
-
-                                        *ppVM = pVM;
-                                        Log(("GVMMR0CreateVM: pVM=%p pVMR3=%p pGVM=%p hGVM=%d\n", pVM, pVM->pVMR3, pGVM, iHandle));
-                                        return VINF_SUCCESS;
+                                        rc = VMMR0ThreadCtxHooksCreate(&pVM->aCpus[0]);
+                                        if (RT_SUCCESS(rc))
+                                        {
+                                            VBOXVMM_R0_GVMM_VM_CREATED(pGVM, pVM, ProcId, (void *)hEMT0, cCpus);
+
+                                            gvmmR0UsedUnlock(pGVMM);
+                                            gvmmR0CreateDestroyUnlock(pGVMM);
+
+                                            *ppVM = pVM;
+                                            Log(("GVMMR0CreateVM: pVM=%p pVMR3=%p pGVM=%p hGVM=%d\n", pVM, pVM->pVMR3, pGVM, iHandle));
+                                            return VINF_SUCCESS;
+                                        }
                                     }
 
@@ -1098 +1103 @@
     AssertRC(rc);
 
-    /* be careful here because we might theoretically be racing someone else cleaning up. */
+    /* Be careful here because we might theoretically be racing someone else cleaning up. */
     if (    pHandle->pVM == pVM
         &&  (   (   pHandle->hEMT0  == hSelf
@@ -1111 +1116 @@
         pHandle->pvObj = NULL;
         gvmmR0CreateDestroyUnlock(pGVMM);
+
+        for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
+            VMMR0ThreadCtxHooksRelease(&pVM->aCpus[idCpu]);
 
         SUPR0ObjRelease(pvObj, pHandle->pSession);
@@ -1337 +1345 @@
     pVM->aCpus[idCpu].hNativeThreadR0 = pGVM->aCpus[idCpu].hEMT = RTThreadNativeSelf();
 
-    return VINF_SUCCESS;
+    rc = VMMR0ThreadCtxHooksCreate(&pVM->aCpus[idCpu]);
+    return rc;
 }
 

trunk/src/VBox/VMM/include/VMMInternal.h

@@ -418 +418 @@
     R0PTRTYPE(PVMMR0LOGGER)     pR0LoggerR0;
 
+    /** @name Thread-context hooks.
+     *  @{*/
+    RTTHREADCTX                 hR0ThreadCtx;
+    /** @} */
+
     /** @name Rendezvous
      * @{ */

trunk/src/VBox/VMM/include/VMMInternal.mac

@@ -108 +108 @@
         .pR0LoggerR0            RTR0PTR_RES 1
 
+        .hR0ThreadCtx           RTR0PTR_RES 1
+
         .fInRendezvous          resb 1
 %if HC_ARCH_BITS == 32