Changeset 19457 in vbox for trunk

Timestamp:

May 6, 2009 7:33:30 PM (16 years ago)

Author:

vboxsync

Message:

HWACCM: Work the VMCPU::enmState.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HWSVMR0.cpp (modified) (3 diffs)
• HWVMXR0.cpp (modified) (3 diffs)

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

@@ -914 +914 @@
     }
 
+    VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED_EXEC);
+
     /* When external interrupts are pending, we should exit the VM when IF is set. */
     /* Note! *After* VM_FF_INHIBIT_INTERRUPTS check!!! */
@@ -1070 +1072 @@
     pVCpu->hwaccm.s.svm.pfnVMRun(pVM->hwaccm.s.svm.pVMCBHostPhys, pVCpu->hwaccm.s.svm.pVMCBPhys, pCtx, pVM, pVCpu);
     TMNotifyEndOfExecution(pVCpu);
+    VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED);
     STAM_PROFILE_ADV_STOP(&pVCpu->hwaccm.s.StatInGC, x);
 
@@ -2127 +2130 @@
         rc = VINF_EM_RAW_EMULATE_INSTR;
 
+    /* Just set the correct state here instead of trying to catch every goto above. */
+    VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED);
+
     STAM_PROFILE_ADV_STOP(&pVCpu->hwaccm.s.StatExit1, x);
     return rc;

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

@@ -2107 +2107 @@
     /** @todo check timers?? */
 
+    VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED_EXEC);
+
     /* TPR caching using CR8 is only available in 64 bits mode */
     /* Note the 32 bits exception for AMD (X86_CPUID_AMD_FEATURE_ECX_CR8L), but that appears missing in Intel CPUs */
@@ -2221 +2223 @@
     rc = pVCpu->hwaccm.s.vmx.pfnStartVM(pVCpu->hwaccm.s.fResumeVM, pCtx, &pVCpu->hwaccm.s.vmx.VMCSCache, pVM, pVCpu);
     TMNotifyEndOfExecution(pVCpu);
+    VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED);
 
     AssertMsg(!pVCpu->hwaccm.s.vmx.VMCSCache.Write.cValidEntries, ("pVCpu->hwaccm.s.vmx.VMCSCache.Write.cValidEntries=%d\n", pVCpu->hwaccm.s.vmx.VMCSCache.Write.cValidEntries));
@@ -3514 +3517 @@
         pVCpu->hwaccm.s.vmx.lasterror.idCurrentCpu   = RTMpCpuId();
     }
+
+    /* Just set the correct state here instead of trying to catch every goto above. */
+    VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED);
 
     STAM_STATS({