Changeset 24327 in vbox for trunk/src/VBox

Timestamp:

Nov 4, 2009 1:19:32 PM (15 years ago)

Author:

vboxsync

Message:

Load CPUID leaf override; we currently don't care if the caller specifies features the host CPU doesn't support.

File:

• trunk/src/VBox/VMM/CPUM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/CPUM.cpp

@@ -292 +292 @@
      */
     for (i = 0; i < RT_ELEMENTS(pVM->cpum.s.aGuestCpuIdStd); i++)
+    {
         ASMCpuId_Idx_ECX(i, 0,
                          &pCPUM->aGuestCpuIdStd[i].eax, &pCPUM->aGuestCpuIdStd[i].ebx,
                          &pCPUM->aGuestCpuIdStd[i].ecx, &pCPUM->aGuestCpuIdStd[i].edx);
+
+        /* Load standard CPUID leaf override; we currently don't care if the caller specifies features the host CPU doesn't support. */
+        PCFGMNODE pLeaf = CFGMR3GetChildF(CFGMR3GetRoot(pVM), "CPUM/CPUID/%x", i);
+        if (pLeaf)
+        {
+            CFGMR3QueryU32(pLeaf, "eax", &pCPUM->aGuestCpuIdStd[i].eax);
+            CFGMR3QueryU32(pLeaf, "ebx", &pCPUM->aGuestCpuIdStd[i].ebx);
+            CFGMR3QueryU32(pLeaf, "ecx", &pCPUM->aGuestCpuIdStd[i].ecx);
+            CFGMR3QueryU32(pLeaf, "edx", &pCPUM->aGuestCpuIdStd[i].edx);
+        }
+    }
     for (i = 0; i < RT_ELEMENTS(pCPUM->aGuestCpuIdExt); i++)
+    {
         ASMCpuId(0x80000000 + i,
                  &pCPUM->aGuestCpuIdExt[i].eax, &pCPUM->aGuestCpuIdExt[i].ebx,
                  &pCPUM->aGuestCpuIdExt[i].ecx, &pCPUM->aGuestCpuIdExt[i].edx);
+
+        /* Load extended CPUID leaf override; we currently don't care if the caller specifies features the host CPU doesn't support. */
+        PCFGMNODE pLeaf = CFGMR3GetChildF(CFGMR3GetRoot(pVM), "CPUM/CPUID/%x", i);
+        if (pLeaf)
+        {
+            CFGMR3QueryU32(pLeaf, "eax", &pCPUM->aGuestCpuIdExt[i].eax);
+            CFGMR3QueryU32(pLeaf, "ebx", &pCPUM->aGuestCpuIdExt[i].ebx);
+            CFGMR3QueryU32(pLeaf, "ecx", &pCPUM->aGuestCpuIdExt[i].ecx);
+            CFGMR3QueryU32(pLeaf, "edx", &pCPUM->aGuestCpuIdExt[i].edx);
+        }
+    }
     for (i = 0; i < RT_ELEMENTS(pCPUM->aGuestCpuIdCentaur); i++)
+    {
         ASMCpuId(0xc0000000 + i,
                  &pCPUM->aGuestCpuIdCentaur[i].eax, &pCPUM->aGuestCpuIdCentaur[i].ebx,
                  &pCPUM->aGuestCpuIdCentaur[i].ecx, &pCPUM->aGuestCpuIdCentaur[i].edx);
+
+        /* Load Centaur CPUID leaf override; we currently don't care if the caller specifies features the host CPU doesn't support. */
+        PCFGMNODE pLeaf = CFGMR3GetChildF(CFGMR3GetRoot(pVM), "CPUM/CPUID/%x", i);
+        if (pLeaf)
+        {
+            CFGMR3QueryU32(pLeaf, "eax", &pCPUM->aGuestCpuIdCentaur[i].eax);
+            CFGMR3QueryU32(pLeaf, "ebx", &pCPUM->aGuestCpuIdCentaur[i].ebx);
+            CFGMR3QueryU32(pLeaf, "ecx", &pCPUM->aGuestCpuIdCentaur[i].ecx);
+            CFGMR3QueryU32(pLeaf, "edx", &pCPUM->aGuestCpuIdCentaur[i].edx);
+        }
+    }
 
     /*