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

Timestamp:

Dec 17, 2015 12:35:04 PM (9 years ago)

Author:

vboxsync

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

104777

Message:

FE/Qt: ​bugref:6478: Runtime UI: Indicators-pool: Session-Information window: Using cached CPU hardware virtualization flag.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• UIVMInfoDialog.cpp (modified) (1 diff)
• runtime/UIIndicatorsPool.cpp (modified) (3 diffs)

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

@@ -663 +663 @@
         /* Deterine virtualization attributes: */
         CMachineDebugger debugger = console.GetDebugger();
-        QString strVirtualization = debugger.GetHWVirtExEnabled() ?
-            VBoxGlobal::tr("Active", "details report (VT-x/AMD-V)") :
-            VBoxGlobal::tr("Inactive", "details report (VT-x/AMD-V)");
-        QString strNestedPaging = debugger.GetHWVirtExNestedPagingEnabled() ?
-            VBoxGlobal::tr("Active", "details report (Nested Paging)") :
-            VBoxGlobal::tr("Inactive", "details report (Nested Paging)");
-        QString strUnrestrictedExecution = debugger.GetHWVirtExUXEnabled() ?
-            VBoxGlobal::tr("Active", "details report (Unrestricted Execution)") :
-            VBoxGlobal::tr("Inactive", "details report (Unrestricted Execution)");
-        QString strParavirtProvider = gpConverter->toString(m.GetEffectiveParavirtProvider());
+        const QString strVirtualization = m_pMachineWindow->uisession()->isHWVirtExEnabled() ?
+                                          VBoxGlobal::tr("Active", "details report (VT-x/AMD-V)") :
+                                          VBoxGlobal::tr("Inactive", "details report (VT-x/AMD-V)");
+        const QString strNestedPaging = debugger.GetHWVirtExNestedPagingEnabled() ?
+                                        VBoxGlobal::tr("Active", "details report (Nested Paging)") :
+                                        VBoxGlobal::tr("Inactive", "details report (Nested Paging)");
+        const QString strUnrestrictedExecution = debugger.GetHWVirtExUXEnabled() ?
+                                                 VBoxGlobal::tr("Active", "details report (Unrestricted Execution)") :
+                                                 VBoxGlobal::tr("Inactive", "details report (Unrestricted Execution)");
+        const QString strParavirtProvider = gpConverter->toString(m.GetEffectiveParavirtProvider());
 
         /* Guest information: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp

@@ -832 +832 @@
 
         /* VT-x/AMD-V feature: */
-        bool bVirtEnabled = debugger.GetHWVirtExEnabled();
-        QString virtualization = bVirtEnabled ?
-            VBoxGlobal::tr("Active", "details report (VT-x/AMD-V)") :
-            VBoxGlobal::tr("Inactive", "details report (VT-x/AMD-V)");
+        const QString strVirtualization = m_pSession->isHWVirtExEnabled() ?
+                                          VBoxGlobal::tr("Active", "details report (VT-x/AMD-V)") :
+                                          VBoxGlobal::tr("Inactive", "details report (VT-x/AMD-V)");
 
         /* Nested Paging feature: */
         bool bNestEnabled = debugger.GetHWVirtExNestedPagingEnabled();
-        QString nestedPaging = bNestEnabled ?
-            VBoxGlobal::tr("Active", "details report (Nested Paging)") :
-            VBoxGlobal::tr("Inactive", "details report (Nested Paging)");
+        const QString strNestedPaging = bNestEnabled ?
+                                        VBoxGlobal::tr("Active", "details report (Nested Paging)") :
+                                        VBoxGlobal::tr("Inactive", "details report (Nested Paging)");
 
         /* Unrestricted Execution feature: */
         bool bUXEnabled = debugger.GetHWVirtExUXEnabled();
-        QString unrestrictExec = bUXEnabled ?
-            VBoxGlobal::tr("Active", "details report (Unrestricted Execution)") :
-            VBoxGlobal::tr("Inactive", "details report (Unrestricted Execution)");
+        const QString strUnrestrictExec = bUXEnabled ?
+                                          VBoxGlobal::tr("Active", "details report (Unrestricted Execution)") :
+                                          VBoxGlobal::tr("Inactive", "details report (Unrestricted Execution)");
 
         /* CPU Execution Cap feature: */
@@ -863 +862 @@
                                             "<br><nobr><b>%7:</b>&nbsp;%8%</nobr>",
                                             "Virtualization Stuff LED")
-                    .arg(VBoxGlobal::tr("VT-x/AMD-V", "details report"), virtualization)
-                    .arg(VBoxGlobal::tr("Nested Paging"), nestedPaging)
-                    .arg(VBoxGlobal::tr("Unrestricted Execution"), unrestrictExec)
+                    .arg(VBoxGlobal::tr("VT-x/AMD-V", "details report"), strVirtualization)
+                    .arg(VBoxGlobal::tr("Nested Paging"), strNestedPaging)
+                    .arg(VBoxGlobal::tr("Unrestricted Execution"), strUnrestrictExec)
                     .arg(VBoxGlobal::tr("Execution Cap", "details report"), strCPUExecCap));
 
@@ -883 +882 @@
         setToolTip(tip);
         /* Update indicator state: */
-        setState(bVirtEnabled);
+        setState(m_pSession->isHWVirtExEnabled());
     }
 };