Changeset 20222 in vbox for trunk/src/VBox/VMM

Timestamp:

Jun 3, 2009 9:04:49 AM (16 years ago)

Author:

vboxsync

Message:

Multi-core changes.
Return correct error in 64 bits guest smp on 32 host case.

Location:

trunk/src/VBox/VMM

Files:

• CPUM.cpp (modified) (3 diffs)
• VMMR0/HWSVMR0.cpp (modified) (1 diff)
• VMMR0/HWVMXR0.cpp (modified) (1 diff)

trunk/src/VBox/VMM/CPUM.cpp

@@ -387 +387 @@
     pCPUM->aGuestCpuIdStd[1].ebx &= 0x0000ffff;
 #ifdef VBOX_WITH_MULTI_CORE
-    /* 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 (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);
         pCPUM->aGuestCpuIdStd[1].edx |= X86_CPUID_FEATURE_EDX_HTT;  /* necessary for hyper-threading *or* multi-core CPUs */
+    }
 #endif
 
@@ -421 +422 @@
     pCPUM->aGuestCpuIdStd[4].eax = pCPUM->aGuestCpuIdStd[4].ebx = 0;
 #ifdef VBOX_WITH_MULTI_CORE
-    if (pVM->cpum.s.enmCPUVendor == CPUMCPUVENDOR_INTEL)
+    if (    pVM->cCPUs > 1
+        &&  pVM->cpum.s.enmCPUVendor == CPUMCPUVENDOR_INTEL)
     {
         AssertReturn(pVM->cCPUs <= 64, VERR_TOO_MANY_CPUS);
@@ -507 +509 @@
         pCPUM->aGuestCpuIdExt[8].ecx = 0;
 #ifdef VBOX_WITH_MULTI_CORE
-        if (pVM->cpum.s.enmCPUVendor == CPUMCPUVENDOR_AMD)
+        if (    pVM->cCPUs > 1
+            &&  pVM->cpum.s.enmCPUVendor == CPUMCPUVENDOR_AMD)
         {
             /* Legacy method to determine the number of cores. */

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

@@ -2518 +2518 @@
     RTHCUINTREG     uOldEFlags;
 
-    /* @todo This code is not guest SMP safe (hyper stack) */
-    AssertReturn(pVM->cCPUs == 1, VERR_ACCESS_DENIED);
+    /* @todo This code is not guest SMP safe (hyper stack and switchers) */
+    AssertReturn(pVM->cCPUs == 1, VERR_TOO_MANY_CPUS);
     Assert(pfnHandler);
 

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

@@ -4137 +4137 @@
     RTHCPHYS        pPageCpuPhys;
 
-    /* @todo This code is not guest SMP safe (hyper stack) */
-    AssertReturn(pVM->cCPUs == 1, VERR_ACCESS_DENIED);
+    /* @todo This code is not guest SMP safe (hyper stack and switchers) */
+    AssertReturn(pVM->cCPUs == 1, VERR_TOO_MANY_CPUS);
     AssertReturn(pVM->hwaccm.s.pfnHost32ToGuest64R0, VERR_INTERNAL_ERROR);
     Assert(pVCpu->hwaccm.s.vmx.VMCSCache.Write.cValidEntries <= RT_ELEMENTS(pVCpu->hwaccm.s.vmx.VMCSCache.Write.aField));