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

Timestamp:

Aug 6, 2009 3:27:25 PM (15 years ago)

Author:

vboxsync

Message:

VMM: correct report cores count, also expose more CPUID leaves by default

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• CPUMAllRegs.cpp (modified) (3 diffs)
• EMAll.cpp (modified) (1 diff)

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

@@ -1065 +1065 @@
         pCpuId = &pVM->cpum.s.GuestCpuIdDef;
 
+    bool fHasMoreCaches = (*pEcx == 0);
+
     *pEax = pCpuId->eax;
     *pEbx = pCpuId->ebx;
@@ -1076 +1078 @@
         Assert(pVCpu->idCpu <= 255);
         *pEbx |= (pVCpu->idCpu << 24);
+   }
+
+    if ( iLeaf == 4 && fHasMoreCaches &&
+         pVM->cpum.s.enmCPUVendor == CPUMCPUVENDOR_INTEL)
+    {
+        /* Report unified L0 cache, Linux'es num_cpu_cores() requires
+         * that to be non-0 to detect core count correctly. */
+        *pEax |= (1 << 5) | 3;
     }
 
@@ -2048 +2058 @@
     return enmMode;
 }
-

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

@@ -1985 +1985 @@
     pRegFrame->rax = 0;
     pRegFrame->rbx = 0;
-    pRegFrame->rcx = 0;
+    pRegFrame->rcx &= UINT64_C(0x00000000ffffffff);
     pRegFrame->rdx = 0;