Changeset 16087 in vbox

Timestamp:

Jan 20, 2009 3:17:15 PM (16 years ago)

Author:

vboxsync

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

41794

Message:

FE/Qt4: 3392: Create nested paging checkbox.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• src/VBoxGlobal.cpp (modified) (4 diffs)
• src/VBoxVMInformationDlg.cpp (modified) (2 diffs)
• src/VBoxVMSettingsGeneral.cpp (modified) (4 diffs)
• ui/VBoxVMSettingsGeneral.ui (modified) (1 diff)

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

@@ -2126 +2126 @@
             + QString (sSectionItemTpl2).arg (tr ("IO APIC", "details report"), "%7")
             + QString (sSectionItemTpl2).arg (tr ("VT-x/AMD-V", "details report"), "%8")
-            + QString (sSectionItemTpl2).arg (tr ("PAE/NX", "details report"), "%9")
-            + QString (sSectionItemTpl2).arg (tr ("3D Acceleration", "details report"), "%10");
+            + QString (sSectionItemTpl2).arg (tr ("Nested Paging", "details report"), "%9")
+            + QString (sSectionItemTpl2).arg (tr ("PAE/NX", "details report"), "%10")
+            + QString (sSectionItemTpl2).arg (tr ("3D Acceleration", "details report"), "%11");
 
         sGeneralFullHrefTpl = QString (sSectionHrefTpl)
-            .arg (2 + 10) /* rows */
+            .arg (2 + 11) /* rows */
             .arg (":/machine_16px.png", /* icon */
                   "#general", /* link */
@@ -2136 +2137 @@
                   generalItems); /* items */
         sGeneralFullBoldTpl = QString (sSectionBoldTpl)
-            .arg (2 + 10) /* rows */
+            .arg (2 + 11) /* rows */
             .arg (":/machine_16px.png", /* icon */
                   "#general", /* link */
@@ -2242 +2243 @@
                        tr ("Disabled", "details report (VT-x/AMD-V)");
 
+        /* Nested Paging */
+        QString nested = aMachine.GetHWVirtExNestedPagingEnabled()
+            ? tr ("Enabled", "details report (Nested Paging)")
+            : tr ("Disabled", "details report (Nested Paging)");
+
         /* PAE/NX */
         QString pae = aMachine.GetPAEEnabled()
@@ -2263 +2269 @@
                 .arg (ioapic)
                 .arg (virt)
+                .arg (nested)
                 .arg (pae)
                 .arg (acc3d)

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxVMInformationDlg.cpp

@@ -429 +429 @@
             VBoxGlobal::tr ("Disabled", "details report (VT-x/AMD-V)");
         QString nested = console.GetDebugger().GetHWVirtExNestedPagingEnabled() ?
-            tr ("Enabled", "nested paging") : tr ("Disabled", "nested paging");
+            VBoxGlobal::tr ("Enabled", "details report (Nested Paging)") :
+            VBoxGlobal::tr ("Disabled", "details report (Nested Paging)");
         QString addInfo = console.GetGuest().GetAdditionsVersion();
         uint addVersion = addInfo.toUInt();
@@ -453 +454 @@
         result += formatValue (tr ("Screen Resolution"), resolution, maxLength);
         result += formatValue (VBoxGlobal::tr ("VT-x/AMD-V", "details report"), virtualization, maxLength);
-        result += formatValue (tr ("Nested Paging"), nested, maxLength);
+        result += formatValue (VBoxGlobal::tr ("Nested Paging", "details report"), nested, maxLength);
         result += formatValue (tr ("Guest Additions"), addVerisonStr, maxLength);
         result += formatValue (tr ("Guest OS Type"), osType, maxLength);

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxVMSettingsGeneral.cpp

@@ -207 +207 @@
         mCbVirt->setCheckState (Qt::Unchecked);
 
+    /* Nested Paging */
+    mCbNestedPaging->setEnabled (fVTxAMDVSupported);
+    mCbNestedPaging->setChecked (aMachine.GetHWVirtExNestedPagingEnabled());
+
     /* PAE/NX */
     bool fPAESupported = vboxGlobal().virtualBox().GetHost()
@@ -286 +290 @@
         mCbVirt->checkState() == Qt::Checked ? KTSBool_True : KTSBool_False);
 
+    /* Nested Paging */
+    mMachine.SetHWVirtExNestedPagingEnabled (mCbNestedPaging->isChecked());
+
     /* PAE/NX */
     mMachine.SetPAEEnabled (mCbPae->isChecked());
@@ -362 +369 @@
     setTabOrder (mLeRam, mSlVideo);
     setTabOrder (mSlVideo, mLeVideo);
-
-    setTabOrder (mLeVideo, mTwBootOrder);
+    setTabOrder (mLeVideo, mCb3D);
+
+    setTabOrder (mCb3D, mTwBootOrder);
     setTabOrder (mTwBootOrder, mTbBootItemUp);
     setTabOrder (mTbBootItemUp, mTbBootItemDown);
@@ -369 +377 @@
     setTabOrder (mCbAcpi, mCbApic);
     setTabOrder (mCbApic, mCbVirt);
-    setTabOrder (mCbVirt, mCbPae);
-    setTabOrder (mCbPae, mCb3D);
-    setTabOrder (mCb3D, mCbClipboard);
+    setTabOrder (mCbVirt, mCbNestedPaging);
+    setTabOrder (mCbNestedPaging, mCbPae);
+    setTabOrder (mCbPae, mCbClipboard);
     setTabOrder (mCbClipboard, mCbIDEController);
     setTabOrder (mCbIDEController, mPsSnapshot);

trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMSettingsGeneral.ui

@@ -699 +699 @@
          </item>
          <item>
+          <widget class="QCheckBox" name="mCbNestedPaging" >
+           <property name="sizePolicy" >
+            <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="whatsThis" >
+            <string>When checked, the virtual machine will try to make use of the nested paging extension of Intel VT-x and AMD-V.</string>
+           </property>
+           <property name="text" >
+            <string>Enable Nested Pa&amp;ging</string>
+           </property>
+          </widget>
+         </item>
+         <item>
           <widget class="QCheckBox" name="mCbPae" >
            <property name="sizePolicy" >