Changeset 19263 in vbox

Timestamp:

Apr 29, 2009 1:05:37 PM (16 years ago)

Author:

vboxsync

Message:

Got rid of more SMP related assertions

Location:

trunk/src/VBox/VMM

Files:

• PATM/CSAM.cpp (modified) (1 diff)
• VMMAll/IOMAll.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/PATM/CSAM.cpp

@@ -1428 +1428 @@
     RTGCPHYS GCPhys = 0;
     uint64_t fFlags = 0;
-    Assert(pVM->cCPUs == 1);
-    PVMCPU pVCpu = VMMGetCpu0(pVM);
+    Assert(pVM->cCPUs == 1 || !CSAMIsEnabled(pVM));
 
     if (!CSAMIsEnabled(pVM))
         return VINF_SUCCESS;
+
+    PVMCPU pVCpu = VMMGetCpu0(pVM);
 
     STAM_PROFILE_START(&pVM->csam.s.StatTimeFlushPage, a);

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

@@ -29 +29 @@
 #include "IOMInternal.h"
 #include <VBox/vm.h>
+#include <VBox/vmm.h>
 #include <VBox/selm.h>
 #include <VBox/trpm.h>
@@ -711 +712 @@
 VMMDECL(int) IOMInterpretCheckPortIOAccess(PVM pVM, PCPUMCTXCORE pCtxCore, RTIOPORT Port, unsigned cb)
 {
-    /* @todo SMP support */
-    Assert(pVM->cCPUs == 1);
-    PVMCPU pVCpu = &pVM->aCpus[0];
+    PVMCPU pVCpu = VMMGetCpu(pVM);
 
     /*