Changeset 19259 in vbox for trunk/src/VBox

Timestamp:

Apr 29, 2009 12:45:19 PM (16 years ago)

Author:

vboxsync

Message:

Fixes for guest smp assertions

Location:

trunk/src/VBox/VMM

Files:

• DBGF.cpp (modified) (1 diff)
• PATM/VMMAll/PATMAll.cpp (modified) (1 diff)
• VMMAll/PDMAllCritSect.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/DBGF.cpp

@@ -386 +386 @@
 static int dbgfR3EventPrologue(PVM pVM, DBGFEVENTTYPE enmEvent)
 {
-    PVMCPU pVCpu = VMMGetCpu0(pVM);
+    PVMCPU pVCpu = VMMGetCpu(pVM);
 
     /*

trunk/src/VBox/VMM/PATM/VMMAll/PATMAll.cpp

@@ -299 +299 @@
 VMMDECL(bool) PATMAreInterruptsEnabled(PVM pVM)
 {
-    PCPUMCTX pCtx = CPUMQueryGuestCtxPtr(VMMGetCpu0(pVM));
+    PCPUMCTX pCtx = CPUMQueryGuestCtxPtr(VMMGetCpu(pVM));
 
     return PATMAreInterruptsEnabledByCtxCore(pVM, CPUMCTX2CORE(pCtx));

trunk/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp

@@ -35 +35 @@
 #include <iprt/asm.h>
 #include <iprt/assert.h>
+#ifndef IN_RC
+# include <iprt/thread.h>
+#endif
 #ifdef IN_RING3
 # include <iprt/semaphore.h>
@@ -221 +224 @@
 #ifdef IN_RING3
     return RTCritSectIsOwner(&pCritSect->s.Core);
+#elif defined(IN_RING0)
+    PVM pVM = pCritSect->s.CTX_SUFF(pVM);
+    Assert(pVM);
+    return pCritSect->s.Core.NativeThreadOwner == RTThreadNativeSelf();
 #else
     PVM pVM = pCritSect->s.CTX_SUFF(pVM);