Changeset 72330 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

May 24, 2018 8:17:03 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9044: Only complain about no HwVirt when in raw-mode, not in NEM mode.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UISession.cpp (modified) (3 diffs)
• UISession.h (modified) (2 diffs)

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

@@ -958 +958 @@
     , m_enmVMExecutionEngine(KVMExecutionEngine_NotSet)
     /* CPU hardware virtualization features for VM: */
-    , m_fIsHWVirtExEnabled(false)
     , m_fIsHWVirtExNestedPagingEnabled(false)
     , m_fIsHWVirtExUXEnabled(false)
@@ -2005 +2004 @@
     const bool fRecommendVirtEx = vboxGlobal().virtualBox().GetGuestOSType(guest().GetOSTypeId()).GetRecommendedVirtEx();
     AssertMsg(!fIs64BitsGuest || fRecommendVirtEx, ("Virtualization support missed for 64bit guest!\n"));
-    const bool fIsVirtActive = debugger().GetHWVirtExEnabled();
-    if (fRecommendVirtEx && !fIsVirtActive)
+    const KVMExecutionEngine enmEngine = debugger().GetExecutionEngine();
+    if (fRecommendVirtEx && enmEngine == KVMExecutionEngine_RawMode)
     {
         /* Check whether vt-x / amd-v supported: */
@@ -2124 +2123 @@
     /* Cache IMachine::ExecutionEngine value. */
     m_enmVMExecutionEngine = m_debugger.GetExecutionEngine();
-    /* Load CPU hardware virtualization extension: */
-    m_fIsHWVirtExEnabled = m_debugger.GetHWVirtExEnabled();
     /* Load nested-paging CPU hardware virtualization extension: */
     m_fIsHWVirtExNestedPagingEnabled = m_debugger.GetHWVirtExNestedPagingEnabled();

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h

@@ -268 +268 @@
     /** Returns whether CPU hardware virtualization extension is enabled. */
     KVMExecutionEngine getVMExecutionEngine() const { return m_enmVMExecutionEngine; }
-    /** Returns whether CPU hardware virtualization extension is enabled. */
-    bool isHWVirtExEnabled() const { return m_fIsHWVirtExEnabled; }
     /** Returns whether nested-paging CPU hardware virtualization extension is enabled. */
     bool isHWVirtExNestedPagingEnabled() const { return m_fIsHWVirtExNestedPagingEnabled; }
@@ -550 +548 @@
     /** @name CPU hardware virtualization features for VM.
      ** @{ */
-    /** Holds whether CPU hardware virtualization extension is enabled. */
-    bool m_fIsHWVirtExEnabled;
     /** Holds whether nested-paging CPU hardware virtualization extension is enabled. */
     bool m_fIsHWVirtExNestedPagingEnabled;