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

Timestamp:

Oct 26, 2022 4:07:46 PM (2 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9647: VM settings: Removing toggling, validating and correlating GUI logic related to possibility of hardware virtualization turned off; It's not a valid case anymore.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIDetailsGenerator.cpp (modified) (1 diff)
• settings/UISettingsDialogSpecific.cpp (modified) (3 diffs)
• settings/editors/UIAccelerationFeaturesEditor.cpp (modified) (3 diffs)
• settings/editors/UIAccelerationFeaturesEditor.h (modified) (4 diffs)
• settings/machine/UIMachineSettingsGeneral.cpp (modified) (3 diffs)
• settings/machine/UIMachineSettingsGeneral.h (modified) (2 diffs)
• settings/machine/UIMachineSettingsSystem.cpp (modified) (13 diffs)
• settings/machine/UIMachineSettingsSystem.h (modified) (2 diffs)

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

@@ -363 +363 @@
         if (uiCommon().virtualBox().GetHost().GetProcessorFeature(KProcessorFeature_HWVirtEx))
         {
-            /* VT-x/AMD-V: */
-            if (comMachine.GetHWVirtExProperty(KHWVirtExPropertyType_Enabled))
-            {
-                acceleration << QApplication::translate("UIDetails", "VT-x/AMD-V", "details (system)");
-                /* Nested Paging (only when hw virt is enabled): */
-                if (comMachine.GetHWVirtExProperty(KHWVirtExPropertyType_NestedPaging))
-                    acceleration << QApplication::translate("UIDetails", "Nested Paging", "details (system)");
-            }
+            /* Nested Paging: */
+            if (comMachine.GetHWVirtExProperty(KHWVirtExPropertyType_NestedPaging))
+                acceleration << QApplication::translate("UIDetails", "Nested Paging", "details (system)");
         }
         /* PAE/NX: */

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

@@ -462 +462 @@
     if (m_machine.isOk())
     {
-        UIMachineSettingsGeneral *pGeneralPage =
-            qobject_cast<UIMachineSettingsGeneral*>(m_pSelector->idToPage(MachineSettingsPageType_General));
         UIMachineSettingsSystem *pSystemPage =
             qobject_cast<UIMachineSettingsSystem*>(m_pSelector->idToPage(MachineSettingsPageType_System));
@@ -470 +468 @@
             qobject_cast<UIMachineSettingsDisplay*>(m_pSelector->idToPage(MachineSettingsPageType_Display));
 #endif /* VBOX_WITH_3D_ACCELERATION */
-
-        /* Guest OS type & VT-x/AMD-V option correlation auto-fix: */
-        if (pGeneralPage && pSystemPage &&
-            pGeneralPage->is64BitOSTypeSelected() && !pSystemPage->isHWVirtExEnabled())
-            m_machine.SetHWVirtExProperty(KHWVirtExPropertyType_Enabled, true);
 
 #ifdef VBOX_WITH_3D_ACCELERATION
@@ -538 +531 @@
             /* Make changes on 'system' page influent 'general' and 'storage' page: */
             UIMachineSettingsSystem *pSystemPage = qobject_cast<UIMachineSettingsSystem*>(pSettingsPage);
-            UIMachineSettingsGeneral *pGeneralPage = qobject_cast<UIMachineSettingsGeneral*>(m_pSelector->idToPage(MachineSettingsPageType_General));
             UIMachineSettingsStorage *pStoragePage = qobject_cast<UIMachineSettingsStorage*>(m_pSelector->idToPage(MachineSettingsPageType_Storage));
-            if (pSystemPage)
-            {
-                if (pGeneralPage)
-                    pGeneralPage->setHWVirtExEnabled(pSystemPage->isHWVirtExEnabled());
-                if (pStoragePage)
-                    pStoragePage->setChipsetType(pSystemPage->chipsetType());
-            }
+            if (pSystemPage && pStoragePage)
+                pStoragePage->setChipsetType(pSystemPage->chipsetType());
             break;
         }

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAccelerationFeaturesEditor.cpp

@@ -38 +38 @@
 UIAccelerationFeaturesEditor::UIAccelerationFeaturesEditor(QWidget *pParent /* = 0 */)
     : QIWithRetranslateUI<QWidget>(pParent)
-    , m_fEnableVirtualization(false)
     , m_fEnableNestedPaging(false)
     , m_pLabel(0)
-    , m_pCheckBoxEnableVirtualization(0)
     , m_pCheckBoxEnableNestedPaging(0)
 {
     prepare();
-}
-
-void UIAccelerationFeaturesEditor::setEnableVirtualization(bool fOn)
-{
-    /* Update cached value and
-     * check-box if value has changed: */
-    if (m_fEnableVirtualization != fOn)
-    {
-        m_fEnableVirtualization = fOn;
-        if (m_pCheckBoxEnableVirtualization)
-            m_pCheckBoxEnableVirtualization->setCheckState(m_fEnableVirtualization ? Qt::Checked : Qt::Unchecked);
-    }
-}
-
-bool UIAccelerationFeaturesEditor::isEnabledVirtualization() const
-{
-    return   m_pCheckBoxEnableVirtualization
-           ? m_pCheckBoxEnableVirtualization->checkState() == Qt::Checked
-           : m_fEnableVirtualization;
-}
-
-void UIAccelerationFeaturesEditor::setEnableVirtualizationAvailable(bool fAvailable)
-{
-    m_pCheckBoxEnableVirtualization->setEnabled(fAvailable);
 }
 
@@ -110 +84 @@
     if (m_pLabel)
         m_pLabel->setText(tr("Hardware Virtualization:"));
-    if (m_pCheckBoxEnableVirtualization)
-    {
-        m_pCheckBoxEnableVirtualization->setText(tr("Enable &VT-x/AMD-V"));
-        m_pCheckBoxEnableVirtualization->setToolTip(tr("When checked, the virtual machine will try to make use of the host "
-                                                       "CPU's hardware virtualization extensions such as Intel VT-x and AMD-V."));
-    }
     if (m_pCheckBoxEnableNestedPaging)
     {
@@ -133 +101 @@
         m_pLayout->setColumnStretch(1, 1);
 
-        /* Prepare label layout: */
-        QVBoxLayout *pLayoutLabel = new QVBoxLayout;
-        if (pLayoutLabel)
+        /* Prepare virtualization label: */
+        m_pLabel = new QLabel(this);
+        if (m_pLabel)
         {
-            /* Prepare virtualization label: */
-            m_pLabel = new QLabel(this);
-            if (m_pLabel)
-            {
-                m_pLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-                pLayoutLabel->addWidget(m_pLabel);
-            }
-            /* Prepare placeholder: */
-            QWidget *pWidgetPlaceholder = new QWidget(this);
-            if (pWidgetPlaceholder)
-            {
-#ifndef VBOX_WITH_RAW_MODE
-                /* Hide placeholder when raw-mode is not supported: */
-                pWidgetPlaceholder->setVisible(false);
-#endif
-                pLayoutLabel->addWidget(pWidgetPlaceholder);
-            }
-
-            m_pLayout->addLayout(pLayoutLabel, 0, 0);
+            m_pLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+            m_pLayout->addWidget(m_pLabel, 0, 0);
         }
 
-        /* Prepare widget layout: */
-        QVBoxLayout *pLayoutWidget = new QVBoxLayout;
-        if (pLayoutWidget)
+        /* Prepare 'enable nested virtualization' check-box: */
+        m_pCheckBoxEnableNestedPaging = new QCheckBox(this);
+        if (m_pCheckBoxEnableNestedPaging)
         {
-            /* Prepare 'enable PAE' check-box: */
-            m_pCheckBoxEnableVirtualization = new QCheckBox(this);
-            if (m_pCheckBoxEnableVirtualization)
-            {
-#ifndef VBOX_WITH_RAW_MODE
-                /* Hide check-box when raw-mode is not supported: */
-                m_pCheckBoxEnableVirtualization->setVisible(false);
-#endif
-                connect(m_pCheckBoxEnableVirtualization, &QCheckBox::stateChanged,
-                        this, &UIAccelerationFeaturesEditor::sigChangedVirtualization);
-                pLayoutWidget->addWidget(m_pCheckBoxEnableVirtualization);
-            }
-            /* Prepare 'enable nested virtualization' check-box: */
-            m_pCheckBoxEnableNestedPaging = new QCheckBox(this);
-            if (m_pCheckBoxEnableNestedPaging)
-            {
-                connect(m_pCheckBoxEnableNestedPaging, &QCheckBox::stateChanged,
-                        this, &UIAccelerationFeaturesEditor::sigChangedNestedPaging);
-                pLayoutWidget->addWidget(m_pCheckBoxEnableNestedPaging);
-            }
-
-            m_pLayout->addLayout(pLayoutWidget, 0, 1);
+            connect(m_pCheckBoxEnableNestedPaging, &QCheckBox::stateChanged,
+                    this, &UIAccelerationFeaturesEditor::sigChangedNestedPaging);
+            m_pLayout->addWidget(m_pCheckBoxEnableNestedPaging, 0, 1);
         }
     }

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAccelerationFeaturesEditor.h

@@ -47 +47 @@
 signals:
 
-    /** Notifies listeners about virtualization change. */
-    void sigChangedVirtualization();
     /** Notifies listeners about nested paging change. */
     void sigChangedNestedPaging();
@@ -56 +54 @@
     /** Constructs editor passing @a pParent to the base-class. */
     UIAccelerationFeaturesEditor(QWidget *pParent = 0);
-
-    /** Defines whether 'enable virtualization' feature in @a fOn. */
-    void setEnableVirtualization(bool fOn);
-    /** Returns 'enable virtualization' feature value. */
-    bool isEnabledVirtualization() const;
-    /** Defines whether 'enable virtualization' option @a fAvailable. */
-    void setEnableVirtualizationAvailable(bool fAvailable);
 
     /** Defines whether 'enable nested paging' feature in @a fOn. */
@@ -88 +79 @@
     /** @name Values
      * @{ */
-        /** Holds the 'enable virtualization' feature value. */
-        bool  m_fEnableVirtualization;
         /** Holds the 'enable nested paging' feature value. */
         bool  m_fEnableNestedPaging;
@@ -100 +89 @@
         /** Holds the label instance. */
         QLabel      *m_pLabel;
-        /** Holds the 'enable virtualization' check-box instance. */
-        QCheckBox   *m_pCheckBoxEnableVirtualization;
         /** Holds the 'enable nested paging' check-box instance. */
         QCheckBox   *m_pCheckBoxEnableNestedPaging;

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

@@ -130 +130 @@
 
 UIMachineSettingsGeneral::UIMachineSettingsGeneral()
-    : m_fHWVirtExEnabled(false)
-    , m_fEncryptionCipherChanged(false)
+    : m_fEncryptionCipherChanged(false)
     , m_fEncryptionPasswordChanged(false)
     , m_pCache(0)
@@ -158 +157 @@
     AssertPtrReturn(m_pEditorNameAndSystem, CGuestOSType());
     return m_pEditorNameAndSystem->type();
-}
-
-bool UIMachineSettingsGeneral::is64BitOSTypeSelected() const
-{
-    AssertPtrReturn(m_pEditorNameAndSystem, false);
-    return   m_pEditorNameAndSystem->type().isNotNull()
-           ? m_pEditorNameAndSystem->type().GetIs64Bit()
-           : false;
-}
-
-void UIMachineSettingsGeneral::setHWVirtExEnabled(bool fEnabled)
-{
-    /* Make sure hardware virtualization extension has changed: */
-    if (m_fHWVirtExEnabled == fEnabled)
-        return;
-
-    /* Update hardware virtualization extension value: */
-    m_fHWVirtExEnabled = fEnabled;
-
-    /* Revalidate: */
-    revalidate();
 }
 
@@ -401 +379 @@
         message.second << tr("No name specified for the virtual machine.");
         fPass = false;
-    }
-
-    /* OS type & VT-x/AMD-v correlation: */
-    if (is64BitOSTypeSelected() && !m_fHWVirtExEnabled)
-    {
-        message.second << tr("The virtual machine operating system hint is set to a 64-bit type. "
-                             "64-bit guest systems require hardware virtualization, "
-                             "so this will be enabled automatically if you confirm the changes.");
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.h

@@ -60 +60 @@
     /** Returns the VM OS type ID. */
     CGuestOSType guestOSType() const;
-    /** Returns whether 64bit OS type ID is selected. */
-    bool is64BitOSTypeSelected() const;
-
-    /** Defines whether HW virtualization extension is enabled. */
-    void setHWVirtExEnabled(bool fEnabled);
 
 protected:
@@ -134 +129 @@
     bool saveEncryptionData();
 
-    /** Holds whether HW virtualization extension is enabled. */
-    bool  m_fHWVirtExEnabled;
-
     /** Holds whether the encryption cipher was changed.
       * We are holding that argument here because we do not know

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

@@ -83 +83 @@
         /* Acceleration data: */
         , m_paravirtProvider(KParavirtProvider_None)
-        , m_fEnabledHwVirtEx(false)
         , m_fEnabledNestedPaging(false)
     {}
@@ -115 +114 @@
                /* Acceleration data: */
                && (m_paravirtProvider == other.m_paravirtProvider)
-               && (m_fEnabledHwVirtEx == other.m_fEnabledHwVirtEx)
                && (m_fEnabledNestedPaging == other.m_fEnabledNestedPaging)
                ;
@@ -168 +166 @@
     /** Holds the paravirtualization provider. */
     KParavirtProvider  m_paravirtProvider;
-    /** Holds whether the HW Virt Ex is enabled. */
-    bool               m_fEnabledHwVirtEx;
     /** Holds whether the Nested Paging is enabled. */
     bool               m_fEnabledNestedPaging;
@@ -208 +204 @@
 }
 
-bool UIMachineSettingsSystem::isHWVirtExEnabled() const
-{
-    return m_pEditorAccelerationFeatures->isEnabledVirtualization();
-}
-
 bool UIMachineSettingsSystem::isNestedPagingSupported() const
 {
@@ -309 +300 @@
     /* Gather old 'Acceleration' data: */
     oldSystemData.m_paravirtProvider = m_machine.GetParavirtProvider();
-    oldSystemData.m_fEnabledHwVirtEx = m_machine.GetHWVirtExProperty(KHWVirtExPropertyType_Enabled);
     oldSystemData.m_fEnabledNestedPaging = m_machine.GetHWVirtExProperty(KHWVirtExPropertyType_NestedPaging);
 
@@ -362 +352 @@
         m_pEditorParavirtProvider->setValue(oldSystemData.m_paravirtProvider);
     if (m_pEditorAccelerationFeatures)
-    {
-        m_pEditorAccelerationFeatures->setEnableVirtualization(oldSystemData.m_fEnabledHwVirtEx);
         m_pEditorAccelerationFeatures->setEnableNestedPaging(oldSystemData.m_fEnabledNestedPaging);
-    }
 
     /* Polish page finally: */
@@ -429 +416 @@
     if (m_pEditorParavirtProvider)
         newSystemData.m_paravirtProvider = m_pEditorParavirtProvider->value();
-    /* Enable HW Virt Ex automatically if it's supported and
-     * 1. multiple CPUs, 2. Nested Paging or 3. Nested HW Virt Ex is requested. */
-    if (m_pEditorVCPU)
-        newSystemData.m_fEnabledHwVirtEx =    isHWVirtExEnabled()
-                                           || (   isHWVirtExSupported()
-                                               && (   m_pEditorVCPU->value() > 1
-                                                   || isNestedPagingEnabled()
-                                                   || isNestedHWVirtExEnabled()));
     /* Enable Nested Paging automatically if it's supported and
      * Nested HW Virt Ex is requested. */
@@ -544 +523 @@
                 "This is needed to support more than one virtual processor. "
                 "It will be enabled automatically if you confirm your changes.");
-        }
-
-        /* VCPU: */
-        if (m_pEditorVCPU->value() > 1)
-        {
-            /* HW Virt Ex test: */
-            if (isHWVirtExSupported() && !isHWVirtExEnabled())
-            {
-                message.second << tr(
-                    "The hardware virtualization is not currently enabled in the Acceleration section of the System page. "
-                    "This is needed to support more than one virtual processor. "
-                    "It will be enabled automatically if you confirm your changes.");
-            }
         }
 
@@ -582 +548 @@
         if (isNestedHWVirtExEnabled())
         {
-            /* HW Virt Ex test: */
-            if (isHWVirtExSupported() && !isHWVirtExEnabled())
-            {
-                message.second << tr(
-                    "The hardware virtualization is not currently enabled in the Acceleration section of the System page. "
-                    "This is needed to support nested hardware virtualization. "
-                    "It will be enabled automatically if you confirm your changes.");
-            }
-
             /* Nested Paging test: */
             if (isHWVirtExSupported() && isNestedPagingSupported() && !isNestedPagingEnabled())
@@ -604 +561 @@
         if (!message.second.isEmpty())
             messages << message;
-    }
-
-    /* Acceleration tab: */
-    {
-        /* Prepare message: */
-        UIValidationMessage message;
-        message.first = UITranslator::removeAccelMark(m_pTabWidget->tabText(2));
-
-        /* Nested Paging: */
-        if (isNestedPagingEnabled())
-        {
-            /* HW Virt Ex test: */
-            if (isHWVirtExSupported() && !isHWVirtExEnabled())
-            {
-                message.second << tr(
-                    "The hardware virtualization is not currently enabled in the Acceleration section of the System page. "
-                    "This is needed for nested paging support. "
-                    "It will be enabled automatically if you confirm your changes.");
-            }
-        }
-
-        /* Serialize message: */
-        if (!message.second.isEmpty())
-            messages << message;
-
     }
 
@@ -714 +646 @@
     m_pEditorParavirtProvider->setEnabled(isMachineOffline());
     m_pEditorAccelerationFeatures->setEnabled(isMachineOffline());
-    m_pEditorAccelerationFeatures->setEnableVirtualizationAvailable(   (systemData.m_fSupportedHwVirtEx && isMachineOffline())
-                                                                    || (systemData.m_fEnabledHwVirtEx && isMachineOffline()));
-    m_pEditorAccelerationFeatures->setEnableNestedPagingAvailable(   m_pEditorAccelerationFeatures->isEnabledVirtualization()
-                                                                  && (   (systemData.m_fSupportedNestedPaging && isMachineOffline())
-                                                                      || (systemData.m_fEnabledNestedPaging && isMachineOffline())));
-}
-
-void UIMachineSettingsSystem::sltHandleHwVirtExToggle()
-{
-    /* Update Nested Paging checkbox: */
-    AssertPtrReturnVoid(m_pCache);
-    m_pEditorAccelerationFeatures->setEnableNestedPagingAvailable(   m_pEditorAccelerationFeatures->isEnabledVirtualization()
-                                                                  && (   (m_pCache->base().m_fSupportedNestedPaging && isMachineOffline())
-                                                                      || (m_pCache->base().m_fEnabledNestedPaging && isMachineOffline())));
-
-    /* Revalidate: */
-    revalidate();
+    m_pEditorAccelerationFeatures->setEnableNestedPagingAvailable(   (systemData.m_fSupportedNestedPaging && isMachineOffline())
+                                                                  || (systemData.m_fEnabledNestedPaging && isMachineOffline()));
 }
 
@@ -899 +816 @@
 
     /* Configure 'Acceleration' connections: */
-    connect(m_pEditorAccelerationFeatures, &UIAccelerationFeaturesEditor::sigChangedVirtualization,
-            this, &UIMachineSettingsSystem::sltHandleHwVirtExToggle);
     connect(m_pEditorAccelerationFeatures, &UIAccelerationFeaturesEditor::sigChangedNestedPaging,
             this, &UIMachineSettingsSystem::revalidate);
@@ -1120 +1035 @@
             fSuccess = m_machine.isOk();
         }
-        /* Save whether the hardware virtualization extension is enabled: */
-        if (fSuccess && isMachineOffline() && newSystemData.m_fEnabledHwVirtEx != oldSystemData.m_fEnabledHwVirtEx)
-        {
-            m_machine.SetHWVirtExProperty(KHWVirtExPropertyType_Enabled, newSystemData.m_fEnabledHwVirtEx);
-            fSuccess = m_machine.isOk();
-        }
         /* Save whether the nested paging is enabled: */
         if (fSuccess && isMachineOffline() && newSystemData.m_fEnabledNestedPaging != oldSystemData.m_fEnabledNestedPaging)

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

@@ -65 +65 @@
     /** Returns whether the HW Virt Ex is supported. */
     bool isHWVirtExSupported() const;
-    /** Returns whether the HW Virt Ex is enabled. */
-    bool isHWVirtExEnabled() const;
 
     /** Returns whether the Nested Paging is supported. */
@@ -117 +115 @@
     /** Performs final page polishing. */
     virtual void polishPage() RT_OVERRIDE;
-
-private slots:
-
-    /** Handles HW Virt Ex check-box toggling. */
-    void sltHandleHwVirtExToggle();
 
 private: