Changeset 49665 in vbox

Timestamp:

Nov 26, 2013 4:04:30 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

90920

Message:

VMM/HMVMXR0: Careful with preemption!

File:

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

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

@@ -5843 +5843 @@
 static int hmR0VmxSaveGuestLazyMsrs(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
 {
-    if (pVCpu->hm.s.vmx.fUpdatedGuestState & HMVMX_UPDATED_GUEST_LAZY_MSRS)
-        return VINF_SUCCESS;
-
 #if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
     if (   HMVMX_IS_64BIT_HOST_MODE()
@@ -5854 +5851 @@
         HM_DISABLE_PREEMPT_IF_NEEDED();
 
-        hmR0VmxLazySaveGuestMsrs(pVCpu, pMixedCtx);
+        if (!(pVCpu->hm.s.vmx.fUpdatedGuestState & HMVMX_UPDATED_GUEST_LAZY_MSRS))
+        {
+            hmR0VmxLazySaveGuestMsrs(pVCpu, pMixedCtx);
+            pVCpu->hm.s.vmx.fUpdatedGuestState |= HMVMX_UPDATED_GUEST_LAZY_MSRS;
+        }
 
         HM_RESTORE_PREEMPT_IF_NEEDED();
         VMMRZCallRing3Enable(pVCpu);
     }
-#endif
-
+#else
     pVCpu->hm.s.vmx.fUpdatedGuestState |= HMVMX_UPDATED_GUEST_LAZY_MSRS;
+#endif
+
     return VINF_SUCCESS;
 }