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

Timestamp:

May 20, 2014 4:47:59 AM (11 years ago)

Author:

vboxsync

Message:

VMM: Retire aGuestCpuIdHyper legacy array.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• CPUMAllMsrs.cpp (modified) (1 diff)
• CPUMAllRegs.cpp (modified) (1 diff)

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

@@ -5593 +5593 @@
 
 #endif /* IN_RING0 */
+

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

@@ -1934 +1934 @@
     else if (iLeaf - UINT32_C(0x80000000) < RT_ELEMENTS(pVM->cpum.s.aGuestCpuIdExt))
         pCpuId = &pVM->cpum.s.aGuestCpuIdExt[iLeaf - UINT32_C(0x80000000)];
-    else if (   iLeaf - UINT32_C(0x40000000) < RT_ELEMENTS(pVM->cpum.s.aGuestCpuIdHyper)
-             && (pVCpu->CTX_SUFF(pVM)->cpum.s.aGuestCpuIdStd[1].ecx & X86_CPUID_FEATURE_ECX_HVP))
-        pCpuId = &pVM->cpum.s.aGuestCpuIdHyper[iLeaf - UINT32_C(0x40000000)];   /* Only report if HVP bit set. */
+    else if (   iLeaf - UINT32_C(0x40000000) < 0x100   /** @todo Fix this later: Hyper-V says 0x400000FF is the last valid leaf. */
+             && (pVCpu->CTX_SUFF(pVM)->cpum.s.aGuestCpuIdStd[1].ecx & X86_CPUID_FEATURE_ECX_HVP)) /* Only report if HVP bit set. */
+    {
+        PCPUMCPUIDLEAF pHyperLeaf = cpumCpuIdGetLeaf(pVM, iLeaf, 0 /* uSubLeaf */);
+        if (RT_LIKELY(pHyperLeaf))
+        {
+            *pEax = pHyperLeaf->uEax;
+            *pEbx = pHyperLeaf->uEbx;
+            *pEcx = pHyperLeaf->uEcx;
+            *pEdx = pHyperLeaf->uEdx;
+        }
+        else
+        {
+            *pEax = *pEbx = *pEcx = *pEdx = 0;
+            LogRel(("CPUM: CPUMGetGuestCpuId: failed to get CPUID leaf for iLeaf=%#RX32\n", iLeaf));
+        }
+        return;
+    }
     else if (iLeaf - UINT32_C(0xc0000000) < RT_ELEMENTS(pVM->cpum.s.aGuestCpuIdCentaur))
         pCpuId = &pVM->cpum.s.aGuestCpuIdCentaur[iLeaf - UINT32_C(0xc0000000)];