Changeset 20914 in vbox for trunk

Timestamp:

Jun 25, 2009 8:16:14 AM (16 years ago)

Author:

vboxsync

Message:

Corrected cpuid values for multi-core vcpus.

File:

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

trunk/src/VBox/VMM/CPUM.cpp

@@ -392 +392 @@
     if (pVM->cCPUs > 1)
     {
-        /* Set the Maximum number of addressable IDs for logical processors in this physical package (bits 16-23) */
-        pCPUM->aGuestCpuIdStd[1].ebx |= ((pVM->cCPUs - 1) << 16);
+        /* If CPUID Fn0000_0001_EDX[HTT] = 1 then LogicalProcessorCount is the number of threads per CPU core times the number of CPU cores per processor */
+        pCPUM->aGuestCpuIdStd[1].ebx |= (pVM->cCPUs << 16);
         pCPUM->aGuestCpuIdStd[1].edx |= X86_CPUID_FEATURE_EDX_HTT;  /* necessary for hyper-threading *or* multi-core CPUs */
     }
@@ -430 +430 @@
         AssertReturn(pVM->cCPUs <= 64, VERR_TOO_MANY_CPUS);
         /* One logical processor with possibly multiple cores. */
-        pCPUM->aGuestCpuIdStd[4].eax |= ((pVM->cCPUs - 1) << 26);   /* 6 bits only -> 64 cores! */
+        pCPUM->aGuestCpuIdStd[4].eax |= (pVM->cCPUs << 26);   /* 6 bits only -> 64 cores! */
     }
 #endif