Changeset 29458 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

May 14, 2010 10:16:06 AM (15 years ago)

Author:

vboxsync

Message:

Backed out 61583

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• GMMR0.cpp (modified) (4 diffs)
• VMMR0.cpp (modified) (1 diff)

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

@@ -158 +158 @@
 #include <VBox/param.h>
 #include <VBox/err.h>
-#include <VBox/vm.h>
 #include <iprt/asm.h>
 #include <iprt/avl.h>
@@ -3975 +3974 @@
  * @returns VBox status code.
  * @param   pVM                 VM handle
- * @param   pVCpu               VMCPU handle
- */
-GMMR0DECL(int) GMMR0CheckSharedModules(PVM pVM, PVMCPU pVCpu)
+ * @param   idCpu               VCPU id
+ */
+GMMR0DECL(int) GMMR0CheckSharedModules(PVM pVM, VMCPUID idCpu)
 {
 #ifdef VBOX_WITH_PAGE_SHARING
@@ -3986 +3985 @@
     GMM_GET_VALID_INSTANCE(pGMM, VERR_INTERNAL_ERROR);
     PGVM pGVM;
-    int rc = GVMMR0ByVMAndEMT(pVM, pVCpu->idCpu, &pGVM);
+    int rc = GVMMR0ByVMAndEMT(pVM, idCpu, &pGVM);
     if (RT_FAILURE(rc))
         return rc;
@@ -4001 +4000 @@
         Log(("GMMR0CheckSharedModules\n"));
         Info.pGVM = pGVM;
-        Info.idCpu = pVCpu->idCpu;
+        Info.idCpu = idCpu;
 
         RTAvlGCPtrDoWithAll(&pGVM->gmm.s.pSharedModuleTree, true /* fFromLeft */, gmmR0CheckSharedModule, &Info);

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

@@ -969 +969 @@
             ASMAtomicWriteU32(&pVCpu->idHostCpu, RTMpCpuId());
 
-            int rc = vmmR0CallRing3SetJmp(&pVCpu->vmm.s.CallRing3JmpBufR0, GMMR0CheckSharedModules, pVM, pVCpu); /* this may resume code. */
+            int rc = GMMR0CheckSharedModules(pVM, idCpu);
 
             /* Clear the VCPU context. */