Changeset 24416 in vbox for trunk/src/VBox

Timestamp:

Nov 5, 2009 9:17:56 PM (15 years ago)

Author:

vboxsync

Message:

Fixed bugs in VBoxManage list hostcpuids and the cpuid part of the showvminfo output. Use the s_auCpuIdRanges thing more places.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageInfo.cpp (modified) (1 diff)
• Frontends/VBoxManage/VBoxManageList.cpp (modified) (1 diff)
• Main/ConsoleImpl2.cpp (modified) (1 diff)
• VMM/CPUM.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

@@ -257 +257 @@
         RTPrintf("CPUID overrides: ");
     ULONG cFound = 0;
-    static uint32_t const s_auCpuIdRanges[4] =
+    static uint32_t const s_auCpuIdRanges[] =
     {
         UINT32_C(0x00000000), UINT32_C(0x0000000a),
-        UINT32_C(0x80000000), UINT32_C(0x0000000a)
+        UINT32_C(0x80000000), UINT32_C(0x8000000a)
     };
     for (unsigned i = 0; i < RT_ELEMENTS(s_auCpuIdRanges); i += 2)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp

@@ -444 +444 @@
             RTPrintf("Host CPUIDs:\n\nLeaf no.  EAX      EBX      ECX      EDX\n");
             ULONG uCpuNo = 0; /* ASSUMES that CPU#0 is online. */
-            ULONG uEAX, uEBX, uECX, uEDX;
-            ULONG cLeafs;
-
-            /* Standard */
-            CHECK_ERROR(Host, GetProcessorCpuIdLeaf(uCpuNo, 0, 0, &cLeafs, &uEBX, &uECX, &uEDX));
-            if (cLeafs > UINT32_C(0x00000000) && cLeafs <= UINT32_C(0x0000007f))
-                for (ULONG iLeaf = 0; iLeaf < cLeafs; iLeaf++)
+            static uint32_t const s_auCpuIdRanges[] =
+            {
+                UINT32_C(0x00000000), UINT32_C(0x0000007f),
+                UINT32_C(0x80000000), UINT32_C(0x8000007f),
+                UINT32_C(0xc0000000), UINT32_C(0xc000007f)
+            };
+            for (unsigned i = 0; i < RT_ELEMENTS(s_auCpuIdRanges); i += 2)
+            {
+                ULONG uEAX, uEBX, uECX, uEDX, cLeafs;
+                CHECK_ERROR(Host, GetProcessorCpuIdLeaf(uCpuNo, s_auCpuIdRanges[i], 0, &cLeafs, &uEBX, &uECX, &uEDX));
+                if (cLeafs < s_auCpuIdRanges[i] || cLeafs > s_auCpuIdRanges[i+1])
+                    continue;
+                cLeafs++;
+                for (ULONG iLeaf = s_auCpuIdRanges[i]; iLeaf <= cLeafs; iLeaf++)
                 {
                     CHECK_ERROR(Host, GetProcessorCpuIdLeaf(uCpuNo, iLeaf, 0, &uEAX, &uEBX, &uECX, &uEDX));
                     RTPrintf("%08x  %08x %08x %08x %08x\n", iLeaf, uEAX, uEBX, uECX, uEDX);
                 }
-
-            /* Extended */
-            CHECK_ERROR(Host, GetProcessorCpuIdLeaf(uCpuNo, UINT32_C(0x80000000), 0, &cLeafs, &uEBX, &uECX, &uEDX));
-            if (cLeafs > UINT32_C(0x80000000) && cLeafs <= UINT32_C(0x8000007f))
-                for (ULONG iLeaf = UINT32_C(0x80000000); iLeaf < cLeafs; iLeaf++)
-                {
-                    CHECK_ERROR(Host, GetProcessorCpuIdLeaf(uCpuNo, iLeaf, 0, &uEAX, &uEBX, &uECX, &uEDX));
-                    RTPrintf("%08x  %08x %08x %08x %08x\n", iLeaf, uEAX, uEBX, uECX, uEDX);
-                }
+            }
         }
         break;

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -245 +245 @@
     rc = CFGMR3InsertInteger(pRoot, "CSAMEnabled",          1);     /* boolean */   RC_CHECK();
 
-    /* Standard cpuid leaf overrides. */
-    for (uint32_t leaf = 0; leaf < 0xA; leaf++)
-    {
-        ULONG ulEax, ulEbx, ulEcx, ulEdx;
-        hrc = pMachine->GetCpuIdLeaf(leaf, &ulEax, &ulEbx, &ulEcx, &ulEdx);
-        if (SUCCEEDED(hrc))
-        {
-            PCFGMNODE pLeaf;
-            rc = CFGMR3InsertNodeF(pRoot, &pLeaf, "CPUM/HostCPUID/%RX32", leaf);    RC_CHECK();
-
-            rc = CFGMR3InsertInteger(pLeaf, "eax", ulEax);                          RC_CHECK();
-            rc = CFGMR3InsertInteger(pLeaf, "ebx", ulEbx);                          RC_CHECK();
-            rc = CFGMR3InsertInteger(pLeaf, "ecx", ulEcx);                          RC_CHECK();
-            rc = CFGMR3InsertInteger(pLeaf, "edx", ulEdx);                          RC_CHECK();
-        }
-        else if (hrc != E_INVALIDARG)                                               H();
-    }
-
-    /* Extended cpuid leaf overrides. */
-    for (uint32_t leaf = 0x80000000; leaf < 0x8000000A; leaf++)
-    {
-        ULONG ulEax, ulEbx, ulEcx, ulEdx;
-        hrc = pMachine->GetCpuIdLeaf(leaf, &ulEax, &ulEbx, &ulEcx, &ulEdx);
-        if (SUCCEEDED(hrc))
-        {
-            PCFGMNODE pLeaf;
-            rc = CFGMR3InsertNodeF(pRoot, &pLeaf, "CPUM/HostCPUID/%RX32", leaf);    RC_CHECK();
-
-            rc = CFGMR3InsertInteger(pLeaf, "eax", ulEax);                          RC_CHECK();
-            rc = CFGMR3InsertInteger(pLeaf, "ebx", ulEbx);                          RC_CHECK();
-            rc = CFGMR3InsertInteger(pLeaf, "ecx", ulEcx);                          RC_CHECK();
-            rc = CFGMR3InsertInteger(pLeaf, "edx", ulEdx);                          RC_CHECK();
-        }
-        else if (hrc != E_INVALIDARG)                                               H();
-    }
+    /* cpuid leaf overrides. */
+    static uint32_t const s_auCpuIdRanges[] =
+    {
+        UINT32_C(0x00000000), UINT32_C(0x0000000a),
+        UINT32_C(0x80000000), UINT32_C(0x8000000a)
+    };
+    for (unsigned i = 0; i < RT_ELEMENTS(s_auCpuIdRanges); i += 2)
+        for (uint32_t uLeaf = s_auCpuIdRanges[i]; uLeaf < s_auCpuIdRanges[i + 1]; uLeaf++)
+        {
+            ULONG ulEax, ulEbx, ulEcx, ulEdx;
+            hrc = pMachine->GetCpuIdLeaf(uLeaf, &ulEax, &ulEbx, &ulEcx, &ulEdx);
+            if (SUCCEEDED(hrc))
+            {
+                PCFGMNODE pLeaf;
+                rc = CFGMR3InsertNodeF(pRoot, &pLeaf, "CPUM/HostCPUID/%RX32", uLeaf);   RC_CHECK();
+
+                rc = CFGMR3InsertInteger(pLeaf, "eax", ulEax);                          RC_CHECK();
+                rc = CFGMR3InsertInteger(pLeaf, "ebx", ulEbx);                          RC_CHECK();
+                rc = CFGMR3InsertInteger(pLeaf, "ecx", ulEcx);                          RC_CHECK();
+                rc = CFGMR3InsertInteger(pLeaf, "edx", ulEdx);                          RC_CHECK();
+            }
+            else if (hrc != E_INVALIDARG)                                               H();
+        }
 
     if (osTypeId == "WindowsNT4")

trunk/src/VBox/VMM/CPUM.cpp

@@ -1383 +1383 @@
 
 #ifdef VBOX_WITH_LIVE_MIGRATION
+    /*
+     * Guest CPU config and CPUID.
+     */
+    /** @todo config. */
+
     if (uVersion > CPUM_SAVED_STATE_VERSION_VER3_0)
         return cpumR3LoadCpuId(pVM, pSSM, uVersion);