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

Timestamp:

May 7, 2019 3:57:37 PM (6 years ago)

Author:

vboxsync

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

130438

Message:

VMM: More refactoring of GVM & VM structures for bugref:9217

File:

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

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

@@ -24 +24 @@
 #include "VMMInternal.h"
 #include <VBox/vmm/vm.h>
+#ifdef IN_RING0
+# include <VBox/vmm/gvm.h>
+#endif
 #include <VBox/vmm/hm.h>
 #include <VBox/vmm/vmcpuset.h>
@@ -203 +206 @@
     if (pVM->cCpus == 1)
         return 0;
+# ifdef VBOX_BUGREF_9217
+    PGVM          pGVM  = (PGVM)pVM;
+    VMCPUID const cCpus = pGVM->cCpusSafe;
+# else
+    VMCPUID const cCpus = pVM->cCpus;
+# endif
 
     /* Search first by host cpu id (most common case)
@@ -215 +224 @@
 
         /** @todo optimize for large number of VCPUs when that becomes more common. */
-        for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
+        for (VMCPUID idCpu = 0; idCpu < cCpus; idCpu++)
         {
+# ifdef VBOX_BUGREF_9217
+            PVMCPU pVCpu = &pGVM->aCpus[idCpu];
+# else
             PVMCPU pVCpu = &pVM->aCpus[idCpu];
+# endif
 
             if (pVCpu->idHostCpu == idHostCpu)
@@ -228 +241 @@
 
     /** @todo optimize for large number of VCPUs when that becomes more common. */
-    for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
-    {
+    for (VMCPUID idCpu = 0; idCpu < cCpus; idCpu++)
+    {
+# ifdef VBOX_BUGREF_9217
+        PVMCPU pVCpu = &pGVM->aCpus[idCpu];
+# else
         PVMCPU pVCpu = &pVM->aCpus[idCpu];
+# endif
 
         if (pVCpu->hNativeThreadR0 == hThread)
@@ -259 +276 @@
         return NULL;
     Assert(idCpu < pVM->cCpus);
+# ifdef VBOX_BUGREF_9217
+    return pVM->apCpus[idCpu];
+# else
     return &pVM->aCpus[idCpu];
+# endif
 
 #elif defined(IN_RING0)
+# ifdef VBOX_BUGREF_9217
+    PGVM          pGVM  = (PGVM)pVM;
+    VMCPUID const cCpus = pGVM->cCpusSafe;
+# else
+    VMCPUID const cCpus = pVM->cCpus;
+# endif
     if (pVM->cCpus == 1)
+# ifdef VBOX_BUGREF_9217
+        return &pGVM->aCpus[0];
+# else
         return &pVM->aCpus[0];
+# endif
 
     /*
@@ -277 +308 @@
 
         /** @todo optimize for large number of VCPUs when that becomes more common. */
-        for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
+        for (VMCPUID idCpu = 0; idCpu < cCpus; idCpu++)
         {
+# ifdef VBOX_BUGREF_9217
+            PVMCPU pVCpu = &pGVM->aCpus[idCpu];
+# else
             PVMCPU pVCpu = &pVM->aCpus[idCpu];
-
+# endif
             if (pVCpu->idHostCpu == idHostCpu)
                 return pVCpu;
@@ -291 +325 @@
     /** @todo optimize for large number of VCPUs when that becomes more common.
      * Use a map like GIP does that's indexed by the host CPU index.  */
-    for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
-    {
+    for (VMCPUID idCpu = 0; idCpu < cCpus; idCpu++)
+    {
+# ifdef VBOX_BUGREF_9217
+        PVMCPU pVCpu = &pGVM->aCpus[idCpu];
+# else
         PVMCPU pVCpu = &pVM->aCpus[idCpu];
-
+# endif
         if (pVCpu->hNativeThreadR0 == hThread)
             return pVCpu;
@@ -301 +338 @@
 
 #else /* RC: Always EMT(0) */
-    return &pVM->aCpus[0];
+    RT_NOREF(pVM);
+    return &g_VCpu0;
 #endif /* IN_RING0 */
 }
@@ -316 +354 @@
 {
     Assert(pVM->cCpus == 1);
+#ifdef VBOX_BUGREF_9217
+# ifdef IN_RING3
+    return pVM->apCpus[0];
+# elif defined(IN_RING0)
+    return &((PGVM)pVM)->aCpus[0];
+# else /* RC  */
+    RT_NOREF(pVM);
+    return &g_VCpu0;
+# endif
+#else
     return &pVM->aCpus[0];
+#endif
 }
 
@@ -332 +381 @@
 {
     AssertReturn(idCpu < pVM->cCpus, NULL);
+#ifdef VBOX_BUGREF_9217
+# ifdef IN_RING3
+    return pVM->apCpus[idCpu];
+# elif defined(IN_RING0)
+    return &((PGVM)pVM)->aCpus[0];
+# else /* RC  */
+    RT_NOREF(pVM, idCpu);
+    Assert(idCpu == 0);
+    return &g_VCpu0;
+# endif
+#else
     return &pVM->aCpus[idCpu];
+#endif
 }