Changeset 19462 in vbox

Timestamp:

May 6, 2009 8:20:47 PM (16 years ago)

Author:

vboxsync

Message:

VMM: iLastGZRc from VMM to VMMCPU.

Location:

trunk/src/VBox/VMM

Files:

• VMM.cpp (modified) (4 diffs)
• VMMInternal.h (modified) (2 diffs)
• VMMR0/VMMR0.cpp (modified) (9 diffs)
• VMMTests.cpp (modified) (4 diffs)
• testcase/tstVMStructGC.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMM.cpp

@@ -1071 +1071 @@
             rc = SUPCallVMMR0Fast(pVM->pVMR0, VMMR0_DO_RAW_RUN, 0);
             if (RT_LIKELY(rc == VINF_SUCCESS))
-                rc = pVM->vmm.s.iLastGZRc;
+                rc = pVCpu->vmm.s.iLastGZRc;
 #endif
         } while (rc == VINF_EM_RAW_INTERRUPT_HYPER);
@@ -1122 +1122 @@
             rc = SUPCallVMMR0Fast(pVM->pVMR0, VMMR0_DO_HWACC_RUN, pVCpu->idCpu);
             if (RT_LIKELY(rc == VINF_SUCCESS))
-                rc = pVM->vmm.s.iLastGZRc;
+                rc = pVCpu->vmm.s.iLastGZRc;
 #endif
         } while (rc == VINF_EM_RAW_INTERRUPT_HYPER);
@@ -1211 +1211 @@
             rc = SUPCallVMMR0Fast(pVM->pVMR0, VMMR0_DO_RAW_RUN, 0);
             if (RT_LIKELY(rc == VINF_SUCCESS))
-                rc = pVM->vmm.s.iLastGZRc;
+                rc = pVCpu->vmm.s.iLastGZRc;
 #endif
         } while (rc == VINF_EM_RAW_INTERRUPT_HYPER);
@@ -1315 +1315 @@
             rc = SUPCallVMMR0Fast(pVM->pVMR0, VMMR0_DO_RAW_RUN, 0);
             if (RT_LIKELY(rc == VINF_SUCCESS))
-                rc = pVM->vmm.s.iLastGZRc;
+                rc = pVCpu->vmm.s.iLastGZRc;
 #endif
         } while (rc == VINF_EM_RAW_INTERRUPT_HYPER);

trunk/src/VBox/VMM/VMMInternal.h

@@ -199 +199 @@
     /** Array of offsets to the different switchers within the core code. */
     RTUINT                      aoffSwitchers[VMMSWITCHER_MAX];
-    uint32_t                    u32Padding0; /**< Alignment padding. */
-
-    /** The last RC/R0 return code. */
-    RTINT                       iLastGZRc;
+
     /** Resume Guest Execution. See CPUMGCResumeGuest(). */
     RTRCPTR                     pfnCPUMRCResumeGuest;
@@ -328 +325 @@
      * See VMM2VMCPU(). */
     RTINT                       offVMCPU;
-    RTINT                       offDummy;
+
+    /** The last RC/R0 return code. */
+    int32_t                     iLastGZRc;
 
     /** VMM stack, pointer to the top of the stack in R3.

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

@@ -533 +533 @@
 {
     if (RT_UNLIKELY(idCpu >= pVM->cCPUs))
-    {
-        pVM->vmm.s.iLastGZRc = VERR_INVALID_PARAMETER;
         return;
-    }
     PVMCPU pVCpu = &pVM->aCpus[idCpu];
 
@@ -556 +553 @@
                 if (RT_UNLIKELY(pVM->cCPUs > 1))
                 {
-                    pVM->vmm.s.iLastGZRc = VERR_RAW_MODE_INVALID_SMP;
+                    pVCpu->vmm.s.iLastGZRc = VERR_RAW_MODE_INVALID_SMP;
                     return;
                 }
@@ -563 +560 @@
                 if (RT_UNLIKELY(!PGMGetHyperCR3(pVCpu)))
                 {
-                    pVM->vmm.s.iLastGZRc = VERR_PGM_NO_CR3_SHADOW_ROOT;
+                    pVCpu->vmm.s.iLastGZRc = VERR_PGM_NO_CR3_SHADOW_ROOT;
                     return;
                 }
@@ -572 +569 @@
                 if (RT_FAILURE(rc))
                 {
-                    pVM->vmm.s.iLastGZRc = rc;
+                    pVCpu->vmm.s.iLastGZRc = rc;
                     return;
                 }
@@ -581 +578 @@
                 TMNotifyStartOfExecution(pVCpu);
                 rc = pVM->vmm.s.pfnHostToGuestR0(pVM);
-                pVM->vmm.s.iLastGZRc = rc;
+                pVCpu->vmm.s.iLastGZRc = rc;
                 TMNotifyEndOfExecution(pVCpu);
 
@@ -604 +601 @@
             {
                 Assert(!pVM->vmm.s.fSwitcherDisabled);
-                pVM->vmm.s.iLastGZRc = VERR_NOT_SUPPORTED;
+                pVCpu->vmm.s.iLastGZRc = VERR_NOT_SUPPORTED;
             }
             break;
@@ -642 +639 @@
                 rc = VINF_EM_RAW_INTERRUPT;
             }
-            pVM->vmm.s.iLastGZRc = rc;
+            pVCpu->vmm.s.iLastGZRc = rc;
 
             ASMAtomicWriteU32(&pVCpu->idHostCpu, NIL_RTCPUID);
@@ -660 +657 @@
          */
         case VMMR0_DO_NOP:
-            pVM->vmm.s.iLastGZRc = VINF_SUCCESS;
+            pVCpu->vmm.s.iLastGZRc = VINF_SUCCESS;
             break;
 
@@ -668 +665 @@
         default:
             AssertMsgFailed(("%#x\n", enmOperation));
-            pVM->vmm.s.iLastGZRc = VERR_NOT_SUPPORTED;
+            pVCpu->vmm.s.iLastGZRc = VERR_NOT_SUPPORTED;
             break;
     }

trunk/src/VBox/VMM/VMMTests.cpp

@@ -75 +75 @@
     rc = SUPCallVMMR0Fast(pVM->pVMR0, VMMR0_DO_RAW_RUN, 0);
     if (RT_LIKELY(rc == VINF_SUCCESS))
-        rc = pVM->vmm.s.iLastGZRc;
+        rc = pVCpu->vmm.s.iLastGZRc;
     return rc;
 }
@@ -115 +115 @@
     rc = SUPCallVMMR0Fast(pVM->pVMR0, VMMR0_DO_RAW_RUN, 0);
     if (RT_LIKELY(rc == VINF_SUCCESS))
-        rc = pVM->vmm.s.iLastGZRc;
+        rc = pVCpu->vmm.s.iLastGZRc;
     bool fDump = false;
     if (rc != rcExpect)
@@ -363 +363 @@
             rc = SUPCallVMMR0Fast(pVM->pVMR0, VMMR0_DO_RAW_RUN, 0);
             if (RT_LIKELY(rc == VINF_SUCCESS))
-                rc = pVM->vmm.s.iLastGZRc;
+                rc = pVCpu->vmm.s.iLastGZRc;
             if (RT_FAILURE(rc))
             {
@@ -417 +417 @@
             rc = SUPCallVMMR0Fast(pVM->pVMR0, VMMR0_DO_RAW_RUN, 0);
             if (RT_LIKELY(rc == VINF_SUCCESS))
-                rc = pVM->vmm.s.iLastGZRc;
+                rc = pVCpu->vmm.s.iLastGZRc;
             uint64_t TickThisElapsed = ASMReadTSC() - TickThisStart;
             if (RT_FAILURE(rc))

trunk/src/VBox/VMM/testcase/tstVMStructGC.cpp

@@ -872 +872 @@
     GEN_CHECK_OFF(VMM, pfnCPUMRCResumeGuest);
     GEN_CHECK_OFF(VMM, pfnCPUMRCResumeGuestV86);
-    GEN_CHECK_OFF(VMM, iLastGZRc);
+    GEN_CHECK_OFF(VMMCPU, iLastGZRc);
     GEN_CHECK_OFF(VMMCPU, pbEMTStackR3);
     GEN_CHECK_OFF(VMMCPU, pbEMTStackRC);