Changeset 30241 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Jun 16, 2010 12:33:44 PM (15 years ago)

Author:

vboxsync

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

62736

Message:

VMMGetCpu was completely broken in the context of GMMR0CheckSharedModules

File:

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

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

@@ -59 +59 @@
     if (pVM->cCpus == 1)
         return 0;
-    return HWACCMR0GetVMCPUId(pVM);
+
+    /* RTMpCpuId had better be cheap. */
+    RTCPUID idHostCpu = RTMpCpuId();
+
+    /** @todo optimize for large number of VCPUs when that becomes more common. */
+    for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
+    {
+        PVMCPU pVCpu = &pVM->aCpus[idCpu];
+
+        if (pVCpu->idHostCpu == idHostCpu)
+            return pVCpu->idCpu;
+    }
+    return NIL_VMCPUID;
 
 #else /* RC: Always EMT(0) */
@@ -86 +98 @@
     if (pVM->cCpus == 1)
         return &pVM->aCpus[0];
-    return HWACCMR0GetVMCPU(pVM);
+
+    /* RTMpCpuId had better be cheap. */
+    RTCPUID idHostCpu = RTMpCpuId();
+
+    /** @todo optimize for large number of VCPUs when that becomes more common. */
+    for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
+    {
+        PVMCPU pVCpu = &pVM->aCpus[idCpu];
+
+        if (pVCpu->idHostCpu == idHostCpu)
+            return pVCpu;
+    }
+    return NULL;
 
 #else /* RC: Always EMT(0) */