Changeset 23750 in vbox for trunk/src/VBox/Frontends

Timestamp:

Oct 14, 2009 9:26:48 AM (16 years ago)

Author:

vboxsync

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

53476

Message:

Introduced the Synthetic CPU attribute and a get/set method for CPU properties.

Location:

trunk/src/VBox/Frontends

Files:

• VBoxManage/VBoxManageInfo.cpp (modified) (4 diffs)
• VBoxManage/VBoxManageModifyVM.cpp (modified) (6 diffs)
• VirtualBox/src/VBoxGlobal.cpp (modified) (2 diffs)
• VirtualBox/src/VBoxVMSettingsSystem.cpp (modified) (4 diffs)

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

@@ -228 +228 @@
         RTPrintf("Number of CPUs:  %u\n", numCpus);
 
+    BOOL fSyntheticCpu;
+    machine->GetCpuProperty(CpuPropertyType_Synthetic, &fSyntheticCpu);
+    if (details == VMINFO_MACHINEREADABLE)
+        RTPrintf("synthcpu=\"%s\"\n", fSyntheticCpu ? "on" : "off");
+    else
+        RTPrintf("Synthetic Cpu:   %s\n", fSyntheticCpu ? "on" : "off");
+
     ComPtr <IBIOSSettings> biosSettings;
     machine->COMGETTER(BIOSSettings)(biosSettings.asOutParam());
@@ -330 +337 @@
 
     BOOL PAEEnabled;
-    machine->COMGETTER(PAEEnabled)(&PAEEnabled);
+    machine->GetCpuProperty(CpuPropertyType_PAE, &PAEEnabled);
     if (details == VMINFO_MACHINEREADABLE)
         RTPrintf("pae=\"%s\"\n", PAEEnabled ? "on" : "off");
@@ -358 +365 @@
 
     BOOL HWVirtExNestedPagingEnabled;
-    machine->GetHWVirtExProperty(HWVirtExPropertyType_NestedPagingEnabled, &HWVirtExNestedPagingEnabled);
+    machine->GetHWVirtExProperty(HWVirtExPropertyType_NestedPaging, &HWVirtExNestedPagingEnabled);
     if (details == VMINFO_MACHINEREADABLE)
         RTPrintf("nestedpaging=\"%s\"\n", HWVirtExNestedPagingEnabled ? "on" : "off");
@@ -365 +372 @@
 
     BOOL HWVirtExVPIDEnabled;
-    machine->GetHWVirtExProperty(HWVirtExPropertyType_VPIDEnabled, &HWVirtExVPIDEnabled);
+    machine->GetHWVirtExProperty(HWVirtExPropertyType_VPID, &HWVirtExVPIDEnabled);
     if (details == VMINFO_MACHINEREADABLE)
         RTPrintf("vtxvpid=\"%s\"\n", HWVirtExVPIDEnabled ? "on" : "off");

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

@@ -65 +65 @@
     MODIFYVMIOAPIC,
     MODIFYVMPAE,
+    MODIFYVMSYNTHCPU,
     MODIFYVMHWVIRTEX,
     MODIFYVMHWVIRTEXEXCLUSIVE,
@@ -137 +138 @@
     { "--ioapic",                  MODIFYVMIOAPIC,                  RTGETOPT_REQ_STRING },
     { "--pae",                     MODIFYVMPAE,                     RTGETOPT_REQ_STRING },
+    { "--synthcpu",                MODIFYVMSYNTHCPU,                RTGETOPT_REQ_STRING },
     { "--hwvirtex",                MODIFYVMHWVIRTEX,                RTGETOPT_REQ_STRING },
     { "--hwvirtexexcl",            MODIFYVMHWVIRTEXEXCLUSIVE,       RTGETOPT_REQ_STRING },
@@ -363 +365 @@
                     if (!strcmp(pValueUnion.psz, "on"))
                     {
-                        CHECK_ERROR (machine, COMSETTER(PAEEnabled)(true));
+                        CHECK_ERROR (machine, SetCpuProperty(CpuPropertyType_PAE, true));
                     }
                     else if (!strcmp(pValueUnion.psz, "off"))
                     {
-                        CHECK_ERROR (machine, COMSETTER(PAEEnabled)(false));
+                        CHECK_ERROR (machine, SetCpuProperty(CpuPropertyType_PAE, false));
                     }
                     else
@@ -378 +380 @@
             }
 
+            case MODIFYVMSYNTHCPU:
+            {
+                if (pValueUnion.psz)
+                {
+                    if (!strcmp(pValueUnion.psz, "on"))
+                    {
+                        CHECK_ERROR (machine, SetCpuProperty(CpuPropertyType_Synthetic, true));
+                    }
+                    else if (!strcmp(pValueUnion.psz, "off"))
+                    {
+                        CHECK_ERROR (machine, SetCpuProperty(CpuPropertyType_Synthetic, false));
+                    }
+                    else
+                    {
+                        errorArgument("Invalid --synthcpu argument '%s'", pValueUnion.psz);
+                        rc = E_FAIL;
+                    }
+                }
+                break;
+            }
+
             case MODIFYVMHWVIRTEX:
             {
@@ -426 +449 @@
                     if (!strcmp(pValueUnion.psz, "on"))
                     {
-                        CHECK_ERROR (machine, SetHWVirtExProperty(HWVirtExPropertyType_NestedPagingEnabled, TRUE));
+                        CHECK_ERROR (machine, SetHWVirtExProperty(HWVirtExPropertyType_NestedPaging, TRUE));
                     }
                     else if (!strcmp(pValueUnion.psz, "off"))
                     {
-                        CHECK_ERROR (machine, SetHWVirtExProperty(HWVirtExPropertyType_NestedPagingEnabled, FALSE));
+                        CHECK_ERROR (machine, SetHWVirtExProperty(HWVirtExPropertyType_NestedPaging, FALSE));
                     }
                     else
@@ -447 +470 @@
                     if (!strcmp(pValueUnion.psz, "on"))
                     {
-                        CHECK_ERROR (machine, SetHWVirtExProperty(HWVirtExPropertyType_VPIDEnabled, TRUE));
+                        CHECK_ERROR (machine, SetHWVirtExProperty(HWVirtExPropertyType_VPID, TRUE));
                     }
                     else if (!strcmp(pValueUnion.psz, "off"))
                     {
-                        CHECK_ERROR (machine, SetHWVirtExProperty(HWVirtExPropertyType_VPIDEnabled, FALSE));
+                        CHECK_ERROR (machine, SetHWVirtExProperty(HWVirtExPropertyType_VPID, FALSE));
                     }
                     else

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

@@ -1617 +1617 @@
 
         /* PAE/NX */
-        QString pae = aMachine.GetPAEEnabled()
+        QString pae = aMachine.GetCpuProperty(KCpuPropertyType_PAE)
             ? tr ("Enabled", "details report (PAE/NX)")
             : tr ("Disabled", "details report (PAE/NX)");
@@ -1628 +1628 @@
 
         /* Nested Paging */
-        QString nested = aMachine.GetHWVirtExProperty(KHWVirtExPropertyType_NestedPagingEnabled)
+        QString nested = aMachine.GetHWVirtExProperty(KHWVirtExPropertyType_NestedPaging)
             ? tr ("Enabled", "details report (Nested Paging)")
             : tr ("Disabled", "details report (Nested Paging)");

trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsSystem.cpp

@@ -174 +174 @@
                          .GetProcessorFeature (KProcessorFeature_PAE);
     mCbPae->setEnabled (fPAESupported);
-    mCbPae->setChecked (aMachine.GetPAEEnabled());
+    mCbPae->setChecked (aMachine.GetCpuProperty(KCpuPropertyType_PAE));
 
     /* VT-x/AMD-V */
@@ -183 +183 @@
     mCbNestedPaging->setEnabled (fVTxAMDVSupported &&
                                  aMachine.GetHWVirtExProperty(KHWVirtExPropertyType_Enabled));
-    mCbNestedPaging->setChecked (aMachine.GetHWVirtExProperty(KHWVirtExPropertyType_NestedPagingEnabled));
+    mCbNestedPaging->setChecked (aMachine.GetHWVirtExProperty(KHWVirtExPropertyType_NestedPaging));
 
     if (mValidator)
@@ -228 +228 @@
 
     /* PAE/NX */
-    mMachine.SetPAEEnabled (mCbPae->isChecked());
+    mMachine.SetCpuProperty(KCpuPropertyType_PAE, mCbPae->isChecked());
 
     /* VT-x/AMD-V */
@@ -235 +235 @@
 
     /* Nested Paging */
-    mMachine.SetHWVirtExProperty(KHWVirtExPropertyType_NestedPagingEnabled, mCbNestedPaging->isChecked());
+    mMachine.SetHWVirtExProperty(KHWVirtExPropertyType_NestedPaging, mCbNestedPaging->isChecked());
 }