Changeset 34957 in vbox

Timestamp:

Dec 10, 2010 3:02:55 PM (14 years ago)

Author:

vboxsync

Message:

Recommit 68775

File:

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

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

@@ -2297 +2297 @@
     RTCCUINTREG uOldEFlags = ~(RTCCUINTREG)0;
     unsigned    cResume = 0;
+    PHWACCM_CPUINFO pCpu = HWACCMR0GetCurrentCpu();
 #ifdef VBOX_STRICT
     RTCPUID     idCpuCheck;
@@ -2306 +2307 @@
 
     Assert(!(pVM->hwaccm.s.vmx.msr.vmx_proc_ctls2.n.allowed1 & VMX_VMCS_CTRL_PROC_EXEC2_VIRT_APIC) || (pVCpu->hwaccm.s.vmx.pVAPIC && pVM->hwaccm.s.vmx.pAPIC));
+    AssertReturn(pCpu, VERR_INTERNAL_ERROR);
 
     /* Check if we need to use TPR shadowing. */
@@ -2575 +2577 @@
         )
     {
-        PHWACCM_CPUINFO pCpu;
-
-        pCpu = HWACCMR0GetCurrentCpu();
         if (    pVCpu->hwaccm.s.idLastCpu   != pCpu->idCpu
             ||  pVCpu->hwaccm.s.cTLBFlushes != pCpu->cTLBFlushes)
@@ -2619 +2618 @@
 
     /* Load the guest state */
-    if (!pVCpu->hwaccm.s.fContextUseFlags)
+    if (    !pVCpu->hwaccm.s.fContextUseFlags
+        &&  pVCpu->hwaccm.s.idLastCpu == pCpu->idCpu)
     {
         VMXR0LoadMinimalGuestState(pVM, pVCpu, pCtx);