Changeset 24321 in vbox

Timestamp:

Nov 4, 2009 12:18:09 PM (15 years ago)

Author:

vboxsync

Message:

--cpuidset/remove/removall

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageHelp.cpp (modified) (1 diff)
• VBoxManageModifyVM.cpp (modified) (4 diffs)

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

@@ -136 +136 @@
                  "                            [--nestedpaging on|off]\n"
                  "                            [--vtxvpid on|off]\n"
-                 "                            [--cpuid <leaf> <eax> <ebx> <ecx> <edx>]\n"
+                 "                            [--cpuidset <leaf> <eax> <ebx> <ecx> <edx>]\n"
+                 "                            [--cpuidremove <leaf>]\n"
+                 "                            [--cpuidremoveall]\n"
                  "                            [--cpus <number>]\n"
                  "                            [--monitorcount <number>]\n"

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

@@ -71 +71 @@
     MODIFYVM_VTXVPID,
     MODIFYVM_CPUS,
-    MODIFYVM_CPUID,
+    MODIFYVM_SETCPUID,
+    MODIFYVM_DELCPUID,
+    MODIFYVM_DELALLCPUID,
     MODIFYVM_MONITORCOUNT,
     MODIFYVM_ACCELERATE3D,
@@ -146 +148 @@
     { "--nestedpaging",             MODIFYVM_NESTEDPAGING,              RTGETOPT_REQ_BOOL_ONOFF },
     { "--vtxvpid",                  MODIFYVM_VTXVPID,                   RTGETOPT_REQ_BOOL_ONOFF },
-    { "--cpuid",                    MODIFYVM_CPUID,                     RTGETOPT_REQ_UINT32 | RTGETOPT_FLAG_HEX},
+    { "--cpuidset",                 MODIFYVM_SETCPUID,                  RTGETOPT_REQ_UINT32 | RTGETOPT_FLAG_HEX},
+    { "--cpuidremove",              MODIFYVM_DELCPUID,                  RTGETOPT_REQ_UINT32 | RTGETOPT_FLAG_HEX},
+    { "--cpuidremoveall",           MODIFYVM_DELALLCPUID,               RTGETOPT_REQ_NOTHING},
     { "--cpus",                     MODIFYVM_CPUS,                      RTGETOPT_REQ_UINT32 },
     { "--monitorcount",             MODIFYVM_MONITORCOUNT,              RTGETOPT_REQ_UINT32 },
@@ -350 +354 @@
             }
 
-            case MODIFYVM_CPUID:
+            case MODIFYVM_SETCPUID:
             {
                 uint32_t id = ValueUnion.u32;
@@ -365 +369 @@
                 }
                 CHECK_ERROR(machine, SetCpuIdLeaf(id, aValue[0], aValue[1], aValue[2], aValue[3]));
+                break;
+            }
+
+            case MODIFYVM_DELCPUID:
+            {
+                CHECK_ERROR(machine, RemoveCpuIdLeaf(ValueUnion.u32));
+                break;
+            }
+
+            case MODIFYVM_DELALLCPUID:
+            {
+                CHECK_ERROR(machine, RemoveAllCpuIdLeafs());
                 break;
             }