Changeset 54712 in vbox for trunk/include/VBox

Timestamp:

Mar 11, 2015 12:54:03 PM (10 years ago)

Author:

vboxsync

Message:

VMM: Clear idHostCpu mapping while deregistering the context-hooks rather than in HMR0Leave().
Simplified HMR0_[DISABLE|RESTORE]_PREEMPT_IF_NEEDED() and made VMMR0ThreadCtxHooksDeregister() check before deregistering the
hook rather than asking the caller to do it each time.

File:

• trunk/include/VBox/vmm/hm.h (modified) (3 diffs)

trunk/include/VBox/vmm/hm.h

@@ -179 +179 @@
 VMMR0_INT_DECL(void)            HMR0SavePendingIOPortRead(PVMCPU pVCpu, RTGCPTR GCPtrRip, RTGCPTR GCPtrRipNext,
                                                           unsigned uPort, unsigned uAndVal, unsigned cbSize);
-/** Disables preemption if required. */
+#ifdef VBOX_STRICT
 # define HM_DISABLE_PREEMPT_IF_NEEDED() \
     RTTHREADPREEMPTSTATE PreemptStateInternal = RTTHREADPREEMPTSTATE_INITIALIZER; \
@@ -190 +190 @@
     } else do { } while (0)
 
-/** Restores preemption if previously disabled by HM_DISABLE_PREEMPT(). */
 # define HM_RESTORE_PREEMPT_IF_NEEDED() \
     do \
@@ -197 +196 @@
             RTThreadPreemptRestore(&PreemptStateInternal); \
     } while (0)
+#else
+# define HM_DISABLE_PREEMPT_IF_NEEDED() \
+    RTTHREADPREEMPTSTATE PreemptStateInternal = RTTHREADPREEMPTSTATE_INITIALIZER; \
+    RTThreadPreemptDisable(&PreemptStateInternal);
+
+# define HM_RESTORE_PREEMPT_IF_NEEDED() do { RTThreadPreemptRestore(&PreemptStateInternal); } while(0)
+#endif /* VBOX_STRICT */
 
 VMMR0_INT_DECL(int)             HMR0SetupVM(PVM pVM);