Changeset 75972 in vbox for trunk/src

Timestamp:

Dec 5, 2018 1:35:24 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9323: It's probably easier to keep in-page fixes (opposing to cross-page fixes) within own page.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings

Files:

• UISettingsDialogSpecific.cpp (modified) (1 diff)
• machine/UIMachineSettingsSystem.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp

@@ -464 +464 @@
             pGeneralPage->is64BitOSTypeSelected() && !pSystemPage->isHWVirtExEnabled())
             m_machine.SetHWVirtExProperty(KHWVirtExPropertyType_Enabled, true);
-
-        /* System page fixes: */
-        if (pSystemPage)
-        {
-            /* Nested Paging || Nested HW Virt Ex: */
-            if (   pSystemPage->isNestedPagingEnabled()
-                || pSystemPage->isNestedHWVirtExEnabled())
-            {
-                /* Enable HW Virt Ex if supported: */
-                if (   pSystemPage->isHWVirtExSupported()
-                    && !pSystemPage->isHWVirtExEnabled())
-                    m_machine.SetHWVirtExProperty(KHWVirtExPropertyType_Enabled, true);
-            }
-
-            /* Nested HW Virt Ex: */
-            if (pSystemPage->isNestedHWVirtExEnabled())
-            {
-                /* Enable Nested Paging if supported: */
-                if (   pSystemPage->isHWVirtExSupported()
-                    && !pSystemPage->isNestedPagingEnabled())
-                    m_machine.SetHWVirtExProperty(KHWVirtExPropertyType_NestedPaging, true);
-            }
-        }
 
 #ifdef VBOX_WITH_VIDEOHWACCEL

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp

@@ -404 +404 @@
     /* Gather 'Acceleration' data: */
     newSystemData.m_paravirtProvider = (KParavirtProvider)m_pComboParavirtProvider->itemData(m_pComboParavirtProvider->currentIndex()).toInt();
-    newSystemData.m_fEnabledHwVirtEx = isHWVirtExEnabled() || m_pSliderCPUCount->value() > 1;
-    newSystemData.m_fEnabledNestedPaging = isNestedPagingEnabled();
+    /* Enable HW Virt Ex automatically if it's supported and
+     * 1. multiple CPUs, 2. Nested Paging or 3. Nested HW Virt Ex is requested. */
+    newSystemData.m_fEnabledHwVirtEx =    isHWVirtExEnabled()
+                                       || (   isHWVirtExSupported()
+                                           && (   m_pSliderCPUCount->value() > 1
+                                               || isNestedPagingEnabled()
+                                               || isNestedHWVirtExEnabled()));
+    /* Enable Nested Paging automatically if it's supported and
+     * Nested HW Virt Ex is requested. */
+    newSystemData.m_fEnabledNestedPaging =    isNestedPagingEnabled()
+                                           || (   isNestedPagingSupported()
+                                               && isNestedHWVirtExEnabled());
 
     /* Cache new system data: */