Changeset 48019 in vbox for trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp

Timestamp:

Aug 23, 2013 11:56:47 AM (11 years ago)

Author:

vboxsync

Message:

VMM/HMSVMR0: Fix assertion caused by EMT preemption in HM context.

File:

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

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

@@ -1718 +1718 @@
                                       | HM_CHANGED_SVM_RESERVED3);
 
-    AssertMsg(!pVCpu->hm.s.fContextUseFlags,
+    AssertMsg(!(pVCpu->hm.s.fContextUseFlags & HM_CHANGED_ALL_GUEST),
              ("Missed updating flags while loading guest state. pVM=%p pVCpu=%p fContextUseFlags=%#RX32\n",
               pVM, pVCpu, pVCpu->hm.s.fContextUseFlags));
@@ -2770 +2770 @@
     int rc = hmR0SvmLoadGuestState(pVM, pVCpu, pCtx);
     AssertRC(rc);
+    pVCpu->hm.s.fContextUseFlags &= ~HM_CHANGED_HOST_CONTEXT;       /* Preemption might set this, nothing to do on AMD-V. */
     AssertMsg(!pVCpu->hm.s.fContextUseFlags, ("fContextUseFlags =%#x\n", pVCpu->hm.s.fContextUseFlags));
     STAM_COUNTER_INC(&pVCpu->hm.s.StatLoadFull);