Changeset 20228 in vbox for trunk/src/VBox/VMM

Timestamp:

Jun 3, 2009 12:05:11 PM (16 years ago)

Author:

vboxsync

Message:

Fixed VT-x state loading failure.

Location:

trunk/src/VBox/VMM

Files:

• HWACCM.cpp (modified) (1 diff)
• VMMAll/PGMAllBth.h (modified) (1 diff)

trunk/src/VBox/VMM/HWACCM.cpp

@@ -1161 +1161 @@
         {
             PVMCPU pVCpu = &pVM->aCpus[i];
-            /* @todo SMP */
+
             pVCpu->hwaccm.s.enmShadowMode            = PGMGetShadowMode(pVCpu);
-            pVCpu->hwaccm.s.vmx.enmLastSeenGuestMode = PGMGetGuestMode(pVCpu);
+            Assert(pVCpu->hwaccm.s.vmx.enmCurrGuestMode == PGMGetGuestMode(pVCpu));
+            pVCpu->hwaccm.s.vmx.enmCurrGuestMode     = PGMGetGuestMode(pVCpu);
         }
     }

trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

@@ -813 +813 @@
                         uint64_t fPageGst;
                         rc = PGMGstGetPage(pVCpu, pvFault, &fPageGst, &GCPhys);
-                        Assert(RT_SUCCESS(rc) && fPageGst & X86_PTE_RW);
+                        Assert(RT_SUCCESS(rc) && (fPageGst & X86_PTE_RW));
                         LogFlow(("Obsolete physical monitor page out of sync %RGv - phys %RGp flags=%08llx\n", pvFault, GCPhys, (uint64_t)fPageGst));