Changeset 19434 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

May 6, 2009 1:58:35 PM (16 years ago)

Author:

vboxsync

Message:

Further splitup of VMM (ring 0 jump buffer).

File:

• trunk/src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (10 diffs)

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

@@ -308 +308 @@
 VMMR0DECL(int) VMMR0CallHost(PVM pVM, VMMCALLHOST enmOperation, uint64_t uArg)
 {
+    PVMCPU pVCpu = VMMGetCpu(pVM);
+
 /** @todo profile this! */
-    pVM->vmm.s.enmCallHostOperation = enmOperation;
-    pVM->vmm.s.u64CallHostArg = uArg;
-    pVM->vmm.s.rcCallHost = VERR_INTERNAL_ERROR;
-    int rc = vmmR0CallHostLongJmp(&pVM->vmm.s.CallHostR0JmpBuf, VINF_VMM_CALL_HOST);
+    pVCpu->vmm.s.enmCallHostOperation = enmOperation;
+    pVCpu->vmm.s.u64CallHostArg = uArg;
+    pVCpu->vmm.s.rcCallHost = VERR_INTERNAL_ERROR;
+    int rc = vmmR0CallHostLongJmp(&pVCpu->vmm.s.CallHostR0JmpBuf, VINF_VMM_CALL_HOST);
     if (rc == VINF_SUCCESS)
-        rc = pVM->vmm.s.rcCallHost;
+        rc = pVCpu->vmm.s.rcCallHost;
     return rc;
 }
@@ -323 +325 @@
  * Record return code statistics
  * @param   pVM         The VM handle.
+ * @param   pVCpu       The VMCPU handle.
  * @param   rc          The status code.
  */
-static void vmmR0RecordRC(PVM pVM, int rc)
+static void vmmR0RecordRC(PVM pVM, PVMCPU pVCpu, int rc)
 {
     /*
@@ -438 +441 @@
             break;
         case VINF_VMM_CALL_HOST:
-            switch (pVM->vmm.s.enmCallHostOperation)
+            switch (pVCpu->vmm.s.enmCallHostOperation)
             {
                 case VMMCALLHOST_PDM_LOCK:
@@ -590 +593 @@
 #ifdef VBOX_WITH_STATISTICS
                 STAM_COUNTER_INC(&pVM->vmm.s.StatRunRC);
-                vmmR0RecordRC(pVM, rc);
+                vmmR0RecordRC(pVM, pVCpu, rc);
 #endif
             }
@@ -623 +626 @@
                 if (RT_SUCCESS(rc))
                 {
-                    rc = vmmR0CallHostSetJmp(&pVM->vmm.s.CallHostR0JmpBuf, HWACCMR0RunGuestCode, pVM, pVCpu); /* this may resume code. */
+                    rc = vmmR0CallHostSetJmp(&pVCpu->vmm.s.CallHostR0JmpBuf, HWACCMR0RunGuestCode, pVM, pVCpu); /* this may resume code. */
                     int rc2 = HWACCMR0Leave(pVM, pVCpu);
                     AssertRC(rc2);
@@ -639 +642 @@
 
 #ifdef VBOX_WITH_STATISTICS
-            vmmR0RecordRC(pVM, rc);
+            vmmR0RecordRC(pVM, pVCpu, rc);
 #endif
             /* No special action required for external interrupts, just return. */
@@ -1084 +1087 @@
             case VMMR0_DO_VMMR0_TERM:
             {
-                if (!pVM->vmm.s.CallHostR0JmpBuf.pvSavedStack)
+                PVMCPU pVCpu = &pVM->aCpus[idCpu];
+
+                if (!pVCpu->vmm.s.CallHostR0JmpBuf.pvSavedStack)
                     break;
 
@@ -1095 +1100 @@
                 Args.u64Arg = u64Arg;
                 Args.pSession = pSession;
-                return vmmR0CallHostSetJmpEx(&pVM->vmm.s.CallHostR0JmpBuf, vmmR0EntryExWrapper, &Args);
+                return vmmR0CallHostSetJmpEx(&pVCpu->vmm.s.CallHostR0JmpBuf, vmmR0EntryExWrapper, &Args);
             }
 
@@ -1141 +1146 @@
     }
 
+    PVMCPU pVCpu = VMMGetCpu(pVM);
+
     /*
      * Check that the jump buffer is armed.
      */
 #ifdef RT_ARCH_X86
-    if (    !pVM->vmm.s.CallHostR0JmpBuf.eip
-        ||  pVM->vmm.s.CallHostR0JmpBuf.fInRing3Call)
+    if (    !pVCpu->vmm.s.CallHostR0JmpBuf.eip
+        ||  pVCpu->vmm.s.CallHostR0JmpBuf.fInRing3Call)
 #else
-    if (    !pVM->vmm.s.CallHostR0JmpBuf.rip
-        ||  pVM->vmm.s.CallHostR0JmpBuf.fInRing3Call)
+    if (    !pVCpu->vmm.s.CallHostR0JmpBuf.rip
+        ||  pVCpu->vmm.s.CallHostR0JmpBuf.fInRing3Call)
 #endif
     {
@@ -1200 +1207 @@
     if (pVM)
     {
+        PVMCPU pVCpu = VMMGetCpu(pVM);
+
 #ifdef RT_ARCH_X86
-        if (    pVM->vmm.s.CallHostR0JmpBuf.eip
-            &&  !pVM->vmm.s.CallHostR0JmpBuf.fInRing3Call)
+        if (    pVCpu->vmm.s.CallHostR0JmpBuf.eip
+            &&  !pVCpu->vmm.s.CallHostR0JmpBuf.fInRing3Call)
 #else
-        if (    pVM->vmm.s.CallHostR0JmpBuf.rip
-            &&  !pVM->vmm.s.CallHostR0JmpBuf.fInRing3Call)
+        if (    pVCpu->vmm.s.CallHostR0JmpBuf.rip
+            &&  !pVCpu->vmm.s.CallHostR0JmpBuf.fInRing3Call)
 #endif
         {