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

Timestamp:

Apr 10, 2016 3:42:46 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

106496

Message:

IMachine: Added CPUProfile attribute (read/write string). Added a modifyvm option for setting it. Show non-default values in showvminfo, but always show it starting with 6.0.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageInfo.cpp (modified) (3 diffs)
• VBoxManageModifyVM.cpp (modified) (4 diffs)

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

@@ -36 +36 @@
 
 #include <VBox/log.h>
+#include <VBox/version.h>
 #include <iprt/stream.h>
 #include <iprt/time.h>
@@ -445 +446 @@
     } while (0)
 
+    /** @def SHOW_STRING_PROP_MAJ
+     * For not breaking the output in a dot release we don't show default values. */
+#define SHOW_STRING_PROP_MAJ(a_pObj, a_Prop, a_szMachine, a_szHuman, a_szUnless, a_uMajorVer) \
+    do \
+    { \
+        Bstr bstr; \
+        CHECK_ERROR2I_RET(a_pObj, COMGETTER(a_Prop)(bstr.asOutParam()), hrcCheck); \
+        if ((a_uMajorVer) <= VBOX_VERSION_MAJOR || !bstr.equals(a_szUnless)) \
+        { \
+            if (details == VMINFO_MACHINEREADABLE)\
+                outputMachineReadableString(a_szMachine, &bstr); \
+            else \
+                RTPrintf("%-16s %ls\n", a_szHuman ":", bstr.raw()); \
+        } \
+    } while (0)
+
 #define SHOW_STRINGARRAY_PROP(a_pObj, a_Prop, a_szMachine, a_szHuman) \
     do \
@@ -564 +581 @@
     SHOW_ULONG_PROP(       machine, CPUExecutionCap,            "cpuexecutioncap",      "CPU exec cap",     "%%");
     SHOW_BOOLEAN_PROP(     machine, HPETEnabled,                "hpet",                 "HPET");
+    SHOW_STRING_PROP_MAJ(  machine, CPUProfile,                 "cpu-profile",          "CPUProfile",       "host", 6);
 
     ChipsetType_T chipsetType;

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

@@ -72 +72 @@
     MODIFYVM_CPUS,
     MODIFYVM_CPUHOTPLUG,
+    MODIFYVM_CPU_PROFILE,
     MODIFYVM_PLUGCPU,
     MODIFYVM_UNPLUGCPU,
@@ -217 +218 @@
 static const RTGETOPTDEF g_aModifyVMOptions[] =
 {
+/** @todo Convert to dash separated names like --triple-fault-reset! Please
+ *        do that for all new options as we don't need more character soups
+ *        around VirtualBox - typedefs more than covers that demand! */
     { "--name",                     MODIFYVM_NAME,                      RTGETOPT_REQ_STRING },
     { "--groups",                   MODIFYVM_GROUPS,                    RTGETOPT_REQ_STRING },
@@ -244 +248 @@
     { "--cpus",                     MODIFYVM_CPUS,                      RTGETOPT_REQ_UINT32 },
     { "--cpuhotplug",               MODIFYVM_CPUHOTPLUG,                RTGETOPT_REQ_BOOL_ONOFF },
+    { "--cpu-profile",              MODIFYVM_CPU_PROFILE,               RTGETOPT_REQ_STRING },
     { "--plugcpu",                  MODIFYVM_PLUGCPU,                   RTGETOPT_REQ_UINT32 },
     { "--unplugcpu",                MODIFYVM_UNPLUGCPU,                 RTGETOPT_REQ_UINT32 },
@@ -774 +779 @@
             }
 
+            case MODIFYVM_CPU_PROFILE:
+            {
+                CHECK_ERROR(sessionMachine, COMSETTER(CPUProfile)(Bstr(ValueUnion.psz).raw()));
+                break;
+            }
+
             case MODIFYVM_PLUGCPU:
             {