Changeset 24404 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Nov 5, 2009 5:14:23 PM (15 years ago)

Author:

vboxsync

Message:

VBoxManage: list hostcpuids; showvm nows shows the cpuid overrides.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageHelp.cpp (modified) (1 diff)
• VBoxManageInfo.cpp (modified) (1 diff)
• VBoxManageList.cpp (modified) (4 diffs)

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

@@ -87 +87 @@
                  "                            bridgedifs|hostonlyifs|dhcpservers|hostinfo|\n"
 #else
-                 "                            bridgedifs|hostinfo|dhcpservers|\n"
-#endif
-                 "                            hddbackends|hdds|dvds|floppies|\n"
+                 "                            bridgedifs|dhcpservers|hostinfo|\n"
+#endif
+                 "                            hostcpuids|hddbackends|hdds|dvds|floppies|\n"
                  "                            usbhost|usbfilters|systemproperties\n"
                  "\n");

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

@@ -253 +253 @@
     else
         RTPrintf("Synthetic Cpu:   %s\n", fSyntheticCpu ? "on" : "off");
+
+    if (details != VMINFO_MACHINEREADABLE)
+        RTPrintf("CPUID overrides: ");
+    ULONG cFound = 0;
+    static uint32_t const s_auCpuIdRanges[4] =
+    {
+        UINT32_C(0x00000000), UINT32_C(0x0000000a),
+        UINT32_C(0x80000000), UINT32_C(0x0000000a)
+    };
+    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 uEAX, uEBX, uECX, uEDX;
+            rc = machine->GetCpuIdLeaf(uLeaf, &uEAX, &uEBX, &uECX, &uEDX);
+            if (SUCCEEDED(rc))
+            {
+                if (details == VMINFO_MACHINEREADABLE)
+                    RTPrintf("cpuid=%08x,%08x,%08x,%08x,%08x", uLeaf, uEAX, uEBX, uECX, uEDX);
+                else
+                {
+                    if (!cFound)
+                        RTPrintf("Leaf no.  EAX      EBX      ECX      EDX\n");
+                    RTPrintf("                 %08x  %08x %08x %08x %08x\n", uLeaf, uEAX, uEBX, uECX, uEDX);
+                }
+                cFound++;
+            }
+        }
+    if (!cFound && details != VMINFO_MACHINEREADABLE)
+        RTPrintf("None\n");
 
     ComPtr <IBIOSSettings> biosSettings;

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

@@ -78 +78 @@
     LISTHOSTONLYIFS,
 #endif
+    LISTHOSTCPUIDS,
     LISTHOSTINFO,
     LISTHDDBACKENDS,
@@ -91 +92 @@
 static const RTGETOPTDEF g_aListOptions[]
     = {
-        { "--long",             'l', RTGETOPT_REQ_NOTHING },
-        { "vms",                LISTVMS, RTGETOPT_REQ_NOTHING },
-        { "runningvms",         LISTRUNNINGVMS, RTGETOPT_REQ_NOTHING },
-        { "ostypes",            LISTOSTYPES, RTGETOPT_REQ_NOTHING },
-        { "hostdvds",           LISTHOSTDVDS, RTGETOPT_REQ_NOTHING },
-        { "hostfloppies",       LISTHOSTFLOPPIES, RTGETOPT_REQ_NOTHING },
-        { "hostifs",            LISTBRIDGEDIFS, RTGETOPT_REQ_NOTHING }, /* backward compatibility */
-        { "bridgedifs",         LISTBRIDGEDIFS, RTGETOPT_REQ_NOTHING },
+        { "--long",             'l',                    RTGETOPT_REQ_NOTHING },
+        { "vms",                LISTVMS,                RTGETOPT_REQ_NOTHING },
+        { "runningvms",         LISTRUNNINGVMS,         RTGETOPT_REQ_NOTHING },
+        { "ostypes",            LISTOSTYPES,            RTGETOPT_REQ_NOTHING },
+        { "hostdvds",           LISTHOSTDVDS,           RTGETOPT_REQ_NOTHING },
+        { "hostfloppies",       LISTHOSTFLOPPIES,       RTGETOPT_REQ_NOTHING },
+        { "hostifs",            LISTBRIDGEDIFS,         RTGETOPT_REQ_NOTHING }, /* backward compatibility */
+        { "bridgedifs",         LISTBRIDGEDIFS,         RTGETOPT_REQ_NOTHING },
 #if defined(VBOX_WITH_NETFLT)
-        { "hostonlyifs",        LISTHOSTONLYIFS, RTGETOPT_REQ_NOTHING },
+        { "hostonlyifs",        LISTHOSTONLYIFS,        RTGETOPT_REQ_NOTHING },
 #endif
-        { "hostinfo",           LISTHOSTINFO, RTGETOPT_REQ_NOTHING },
-        { "hddbackends",        LISTHDDBACKENDS, RTGETOPT_REQ_NOTHING },
-        { "hdds",               LISTHDDS, RTGETOPT_REQ_NOTHING },
-        { "dvds",               LISTDVDS, RTGETOPT_REQ_NOTHING },
-        { "floppies",           LISTFLOPPIES, RTGETOPT_REQ_NOTHING },
-        { "usbhost",            LISTUSBHOST, RTGETOPT_REQ_NOTHING },
-        { "usbfilters",         LISTUSBFILTERS, RTGETOPT_REQ_NOTHING },
-        { "systemproperties",   LISTSYSTEMPROPERTIES, RTGETOPT_REQ_NOTHING },
-        { "dhcpservers",        LISTDHCPSERVERS, RTGETOPT_REQ_NOTHING }
+        { "hostinfo",           LISTHOSTINFO,           RTGETOPT_REQ_NOTHING },
+        { "hostcpuids",         LISTHOSTCPUIDS,         RTGETOPT_REQ_NOTHING },
+        { "hddbackends",        LISTHDDBACKENDS,        RTGETOPT_REQ_NOTHING },
+        { "hdds",               LISTHDDS,               RTGETOPT_REQ_NOTHING },
+        { "dvds",               LISTDVDS,               RTGETOPT_REQ_NOTHING },
+        { "floppies",           LISTFLOPPIES,           RTGETOPT_REQ_NOTHING },
+        { "usbhost",            LISTUSBHOST,            RTGETOPT_REQ_NOTHING },
+        { "usbfilters",         LISTUSBFILTERS,         RTGETOPT_REQ_NOTHING },
+        { "systemproperties",   LISTSYSTEMPROPERTIES,   RTGETOPT_REQ_NOTHING },
+        { "dhcpservers",        LISTDHCPSERVERS,        RTGETOPT_REQ_NOTHING }
       };
 
@@ -143 +145 @@
 #endif
             case LISTHOSTINFO:
+            case LISTHOSTCPUIDS:
             case LISTHDDBACKENDS:
             case LISTHDDS:
@@ -431 +434 @@
             CHECK_ERROR (Host, COMGETTER(OSVersion)(oSVersion.asOutParam()));
             RTPrintf("Operating system version: %lS\n", oSVersion.raw());
+        }
+        break;
+
+        case LISTHOSTCPUIDS:
+        {
+            ComPtr<IHost> Host;
+            CHECK_ERROR(a->virtualBox, COMGETTER(Host)(Host.asOutParam()));
+
+            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++)
+                {
+                    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;