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

Timestamp:

Mar 23, 2010 11:17:46 AM (15 years ago)

Author:

vboxsync

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

59173

Message:

FE/Qt4: new core: Move the VT-x check after the console is turned on. Otherwise the check will fail.

Location:

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

Files:

• UIMachineLogic.cpp (modified) (1 diff)
• UISession.cpp (modified) (1 diff)

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

@@ -364 +364 @@
 bool UIMachineLogic::checkAvailability()
 {
-    /* Get current console: */
-    CConsole console = session().GetConsole();
-
-    /* Check if the required virtualization features are active: */
-    bool fIs64BitsGuest = vboxGlobal().virtualBox().GetGuestOSType(console.GetGuest().GetOSTypeId()).GetIs64Bit();
-    bool fRecommendVirtEx = vboxGlobal().virtualBox().GetGuestOSType(console.GetGuest().GetOSTypeId()).GetRecommendedVirtEx();
-    AssertMsg(!fIs64BitsGuest || fRecommendVirtEx, ("Virtualization support missed for 64bit guest!\n"));
-    bool fIsVirtEnabled = console.GetDebugger().GetHWVirtExEnabled();
-    if (fRecommendVirtEx && !fIsVirtEnabled)
-    {
-        bool fShouldWeClose;
-
-        bool fVTxAMDVSupported = vboxGlobal().virtualBox().GetHost().GetProcessorFeature(KProcessorFeature_HWVirtEx);
-
-        if (fIs64BitsGuest)
-            fShouldWeClose = vboxProblem().warnAboutVirtNotEnabled64BitsGuest(fVTxAMDVSupported);
-        else
-            fShouldWeClose = vboxProblem().warnAboutVirtNotEnabledGuestRequired(fVTxAMDVSupported);
-
-        return !fShouldWeClose;
-    }
-
-    /* True to confirm success: */
     return true;
 }

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

@@ -646 +646 @@
     }
 
+    /* Check if the required virtualization features are active. We get this
+     * info only when the session is active. */
+    bool fIs64BitsGuest = vboxGlobal().virtualBox().GetGuestOSType(console.GetGuest().GetOSTypeId()).GetIs64Bit();
+    bool fRecommendVirtEx = vboxGlobal().virtualBox().GetGuestOSType(console.GetGuest().GetOSTypeId()).GetRecommendedVirtEx();
+    AssertMsg(!fIs64BitsGuest || fRecommendVirtEx, ("Virtualization support missed for 64bit guest!\n"));
+//    bool fIsVirtEnabled = console.GetDebugger().GetHWVirtExEnabled();
+    bool fIsVirtEnabled = false;
+    if (fRecommendVirtEx && !fIsVirtEnabled)
+    {
+        bool fShouldWeClose;
+
+        bool fVTxAMDVSupported = vboxGlobal().virtualBox().GetHost().GetProcessorFeature(KProcessorFeature_HWVirtEx);
+
+        QApplication::processEvents();
+        setPause(true);
+
+        if (fIs64BitsGuest)
+            fShouldWeClose = vboxProblem().warnAboutVirtNotEnabled64BitsGuest(fVTxAMDVSupported);
+        else
+            fShouldWeClose = vboxProblem().warnAboutVirtNotEnabledGuestRequired(fVTxAMDVSupported);
+
+        if (fShouldWeClose)
+        {
+            /* At this point the console is powered up. So we have to close
+             * this session again. */
+            CProgress progress = console.PowerDown();
+            if (console.isOk())
+            {
+                /* Guard progressbar warnings from auto-closing: */
+                if (uimachine()->machineLogic())
+                    uimachine()->machineLogic()->setPreventAutoClose(true);
+                /* Show the power down progress dialog */
+                vboxProblem().showModalProgressDialog(progress, machine.GetName(), mainMachineWindow());
+                if (progress.GetResultCode() != 0)
+                    vboxProblem().cannotStopMachine(progress);
+                /* Allow further auto-closing: */
+                if (uimachine()->machineLogic())
+                    uimachine()->machineLogic()->setPreventAutoClose(false);
+            }
+            else
+                vboxProblem().cannotStopMachine(console);
+            /* Now signal the destruction of the rest. */
+            QTimer::singleShot(0, this, SLOT(sltCloseVirtualSession()));
+            return;
+        }
+        else
+            setPause(false);
+    }
+
 #if 0 // TODO: Rework debugger logic!
 # ifdef VBOX_WITH_DEBUGGER_GUI