Changeset 27591 in vbox

Timestamp:

Mar 22, 2010 1:56:29 PM (15 years ago)

Author:

vboxsync

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

59121

Message:

FE/Qt4: 4691: Hide hardware acceleration options when none are available.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (5 diffs)
• settings/vm/VBoxVMSettingsSystem.cpp (modified) (1 diff)
• settings/vm/VBoxVMSettingsSystem.ui (modified) (2 diffs)

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

@@ -1922 +1922 @@
         CBIOSSettings biosSettings = aMachine.GetBIOSSettings();
 
+        /* System details row count: */
+        int iRowCount = 2; /* Memory & CPU details rows initially. */
+
         /* Boot order */
         QString bootOrder;
@@ -1936 +1939 @@
             bootOrder = toString (KDeviceType_Null);
 
+        iRowCount += 1; /* Boot-order row. */
+
 #ifdef VBOX_WITH_FULL_DETAILS_REPORT
         /* ACPI */
@@ -1951 +1956 @@
             ? tr ("Enabled", "details report (PAE/NX)")
             : tr ("Disabled", "details report (PAE/NX)");
+
+        iRowCount += 3; /* Full report rows. */
 #endif /* VBOX_WITH_FULL_DETAILS_REPORT */
 
@@ -1962 +1969 @@
             ? tr ("Enabled", "details report (Nested Paging)")
             : tr ("Disabled", "details report (Nested Paging)");
+
+        /* VT-x/AMD-V availability: */
+        bool fVTxAMDVSupported = virtualBox().GetHost().GetProcessorFeature(KProcessorFeature_HWVirtEx);
+
+        if (fVTxAMDVSupported)
+            iRowCount += 2; /* VT-x/AMD-V items. */
 
         QString item = QString (sSectionItemTpl2).arg (tr ("Base Memory", "details report"),
@@ -1975 +1988 @@
                      + QString (sSectionItemTpl2).arg (tr ("PAE/NX", "details report"), pae)
 #endif /* VBOX_WITH_FULL_DETAILS_REPORT */
-                     + QString (sSectionItemTpl2).arg (tr ("VT-x/AMD-V", "details report"), virt)
-                     + QString (sSectionItemTpl2).arg (tr ("Nested Paging", "details report"), nested)
                      ;
 
+        if (fVTxAMDVSupported)
+                item += QString (sSectionItemTpl2).arg (tr ("VT-x/AMD-V", "details report"), virt)
+                     +  QString (sSectionItemTpl2).arg (tr ("Nested Paging", "details report"), nested);
+
         report += sectionTpl
-#ifdef VBOX_WITH_FULL_DETAILS_REPORT
-                  .arg (2 + 8) /* rows */
-#else
-                  .arg (2 + 5) /* rows */
-#endif /* VBOX_WITH_FULL_DETAILS_REPORT */
+                  .arg (2 + iRowCount) /* rows */
                   .arg (":/chipset_16px.png", /* icon */
                         "#system", /* link */

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

@@ -188 +188 @@
     mCbPae->setChecked (aMachine.GetCPUProperty(KCPUPropertyType_PAE));
 
+    /* VT-x/AMD-V page */
+    if (!fVTxAMDVSupported)
+        mTwSystem->removeTab(2);
+
     /* VT-x/AMD-V */
     mCbVirt->setEnabled (fVTxAMDVSupported);

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsSystem.ui

@@ -406 +406 @@
           <widget class="QIAdvancedSlider" name="mSlCPU">
            <property name="whatsThis">
-            <string>Controls the number of virtual CPUs in the virtual machine.</string>
+            <string>Controls the number of virtual CPUs in the virtual machine. You need hardware virtualization support on your host system to use more than one virtual CPU.</string>
            </property>
            <property name="maximum">
@@ -479 +479 @@
          </property>
          <property name="whatsThis">
-          <string>Controls the number of virtual CPUs in the virtual machine.</string>
+          <string>Controls the number of virtual CPUs in the virtual machine. You need hardware virtualization support on your host system to use more than one virtual CPU.</string>
          </property>
         </widget>