Changeset 40234 in vbox for trunk

Timestamp:

Feb 23, 2012 2:48:24 PM (13 years ago)

Author:

vboxsync

Message:

Optionally present basic hypervisor CPUID leaves.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/CPUMAllRegs.cpp (modified) (2 diffs)
• VMMR3/CPUM.cpp (modified) (3 diffs)
• include/CPUMInternal.h (modified) (1 diff)
• include/CPUMInternal.mac (modified) (1 diff)

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

@@ -1455 +1455 @@
     if (iLeaf < RT_ELEMENTS(pVM->cpum.s.aGuestCpuIdStd))
         pCpuId = &pVM->cpum.s.aGuestCpuIdStd[iLeaf];
+    else if (iLeaf - UINT32_C(0x40000000) < RT_ELEMENTS(pVM->cpum.s.aGuestCpuIdHyper))
+        if ((pVCpu->CTX_SUFF(pVM)->cpum.s.aGuestCpuIdStd[1].ecx & X86_CPUID_FEATURE_ECX_HVP) != 0)
+            pCpuId = &pVM->cpum.s.aGuestCpuIdHyper[iLeaf - UINT32_C(0x40000000)];   /* Only report if HVP bit set. */
     else if (iLeaf - UINT32_C(0x80000000) < RT_ELEMENTS(pVM->cpum.s.aGuestCpuIdExt))
         pCpuId = &pVM->cpum.s.aGuestCpuIdExt[iLeaf - UINT32_C(0x80000000)];
@@ -1884 +1887 @@
 
         case CPUMCPUIDFEATURE_HVP:
-            if (pVM->cpum.s.aGuestCpuIdExt[0].eax >= 1)
-                pVM->cpum.s.aGuestCpuIdExt[1].ecx &= ~X86_CPUID_FEATURE_ECX_HVP;
+            if (pVM->cpum.s.aGuestCpuIdStd[0].eax >= 1)
+                pVM->cpum.s.aGuestCpuIdStd[1].ecx &= ~X86_CPUID_FEATURE_ECX_HVP;
             break;
 

trunk/src/VBox/VMM/VMMR3/CPUM.cpp

@@ -906 +906 @@
             pCPUM->aGuestCpuIdCentaur[i] = pCPUM->GuestCpuIdDef;
 
+    /* 
+     * Hypervisor identification.
+     *
+     * We only return minimal information, primarily ensuring that the
+     * 0x40000000 function returns 0x40000001 and identifying ourselves.
+     * Currently we do not support any hypervisor-specific interface.
+     */
+    pCPUM->aGuestCpuIdHyper[0].eax = UINT32_C(0x40000001);
+    pCPUM->aGuestCpuIdHyper[0].ebx = pCPUM->aGuestCpuIdHyper[0].ecx
+                                   = pCPUM->aGuestCpuIdHyper[0].edx = 0x786f4256;   /* 'VBox' */
+    pCPUM->aGuestCpuIdHyper[1].eax = 0x656e6f6e;                            /* 'none' */
+    pCPUM->aGuestCpuIdHyper[1].ebx = pCPUM->aGuestCpuIdHyper[1].ecx
+                                   = pCPUM->aGuestCpuIdHyper[1].edx = 0;    /* Reserved */
 
     /*
@@ -1553 +1566 @@
         CPUID_RAW_FEATURE_RET(Std, ecx, RT_BIT_32(29) /*reserved*/);
         CPUID_RAW_FEATURE_RET(Std, ecx, RT_BIT_32(30) /*reserved*/);
-        CPUID_RAW_FEATURE_RET(Std, ecx, RT_BIT_32(31) /*reserved*/);
+        CPUID_RAW_FEATURE_RET(Std, ecx, X86_CPUID_FEATURE_ECX_HVP);
 
         /* CPUID(1).edx */
@@ -1759 +1772 @@
     CPUID_GST_FEATURE_RET(Std, ecx, RT_BIT_32(29) /*reserved*/);
     CPUID_GST_FEATURE_RET(Std, ecx, RT_BIT_32(30) /*reserved*/);
-    CPUID_GST_FEATURE_RET(Std, ecx, RT_BIT_32(31) /*reserved*/);
+    CPUID_GST_FEATURE_IGN(Std, ecx, X86_CPUID_FEATURE_ECX_HVP);     // Normally not set by host
 
     /* CPUID(1).edx */

trunk/src/VBox/VMM/include/CPUMInternal.h

@@ -303 +303 @@
     uint8_t                 abPadding[HC_ARCH_BITS == 64 ? 5 : 1];
 
-    /** The standard set of CpuId leafs. */
+    /** The standard set of CpuId leaves. */
     CPUMCPUID               aGuestCpuIdStd[6];
-    /** The extended set of CpuId leafs. */
+    /** The extended set of CpuId leaves. */
     CPUMCPUID               aGuestCpuIdExt[10];
-    /** The centaur set of CpuId leafs. */
+    /** The centaur set of CpuId leaves. */
     CPUMCPUID               aGuestCpuIdCentaur[4];
-    /** The default set of CpuId leafs. */
+    /** The hypervisor specific set of CpuId leaves. */
+    CPUMCPUID               aGuestCpuIdHyper[4];
+    /** The default set of CpuId leaves. */
     CPUMCPUID               GuestCpuIdDef;
 

trunk/src/VBox/VMM/include/CPUMInternal.mac

@@ -80 +80 @@
     .aGuestCpuIdExt       resb    16*10
     .aGuestCpuIdCentaur   resb    16*4
+    .aGuestCpuIdHyper     resb    16*4
     .GuestCpuIdDef        resb    16