Changeset 26893 in vbox for trunk/src

Timestamp:

Feb 28, 2010 5:43:39 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: New running VM core: bug fix in handling required features.

Location:

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

Files:

• UIMachineLogic.cpp (modified) (3 diffs)
• UIMachineLogic.h (modified) (2 diffs)
• normal/UIMachineLogicNormal.cpp (modified) (1 diff)

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

@@ -26 +26 @@
 #include <QFileInfo>
 #include <QDesktopWidget>
+#include <QTimer>
 
 /* Local includes */
@@ -373 +374 @@
     , m_pRunningActions(0)
     , m_pRunningOrPausedActions(0)
+    , m_fIsPreventAutoStart(false)
     , m_fIsPreventAutoClose(false)
 {
@@ -540 +542 @@
     CConsole console = session().GetConsole();
 
-    /* Check if the virtualization feature is required. */
-    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 fResult;
-
-        uisession()->pause();
-
-        bool fVTxAMDVSupported = vboxGlobal().virtualBox().GetHost().GetProcessorFeature(KProcessorFeature_HWVirtEx);
-
-        if (fIs64BitsGuest)
-            fResult = vboxProblem().warnAboutVirtNotEnabled64BitsGuest(fVTxAMDVSupported);
-        else
-            fResult = vboxProblem().warnAboutVirtNotEnabledGuestRequired(fVTxAMDVSupported);
-
-        if (fResult == true)
-            sltClose();
-        else
-            uisession()->unpause();
+    /* Check if the required virtualization features are ready: */
+    if (!isPreventAutoStart())
+    {
+        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);
+
+            if (fShouldWeClose == true)
+                setPreventAutoStart(true);
+        }
     }
 
 #ifdef Q_WS_MAC
 # ifdef VBOX_WITH_ICHAT_THEATER
-    initSharedAVManager();
+    /* Init shared AV manager: */
+    if (!isPreventAutoStart())
+        initSharedAVManager();
 # endif
 #endif
+
+    /* Close request in case of features are not ready and user wish to close: */
+    if (isPreventAutoStart())
+        QTimer::singleShot(0, uisession(), SLOT(sltCloseVirtualSession()));
 }
 

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

@@ -65 +65 @@
 
     /* Maintenance getters/setters: */
+    bool isPreventAutoStart() const { return m_fIsPreventAutoStart; }
     bool isPreventAutoClose() const { return m_fIsPreventAutoClose; }
+    void setPreventAutoStart(bool fIsPreventAutoStart) { m_fIsPreventAutoStart = fIsPreventAutoStart; }
     void setPreventAutoClose(bool fIsPreventAutoClose) { m_fIsPreventAutoClose = fIsPreventAutoClose; }
 
@@ -155 +157 @@
     QActionGroup *m_pRunningOrPausedActions;
 
+    bool m_fIsPreventAutoStart : 1;
     bool m_fIsPreventAutoClose : 1;
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp

@@ -44 +44 @@
     : UIMachineLogic(pParent, pSession, pActionsPool, UIVisualStateType_Normal)
 {
-    /* Prepare console connections: */
-    prepareConsoleConnections();
-
-    /* Prepare action groups: */
-    prepareActionGroups();
-
-    /* Prepare action connections: */
-    prepareActionConnections();
-
     /* Check the status of required features: */
     prepareRequiredFeatures();
 
-    /* Prepare normal machine window: */
-    prepareMachineWindow();
-
-    /* Initialization: */
-    sltMachineStateChanged();
-    sltAdditionsStateChanged();
-    sltMouseCapabilityChanged();
+    /* If required features are ready: */
+    if (!isPreventAutoStart())
+    {
+        /* Prepare console connections: */
+        prepareConsoleConnections();
+
+        /* Prepare action groups: */
+        prepareActionGroups();
+
+        /* Prepare action connections: */
+        prepareActionConnections();
+
+        /* Prepare normal machine window: */
+        prepareMachineWindow();
+
+        /* Initialization: */
+        sltMachineStateChanged();
+        sltAdditionsStateChanged();
+        sltMouseCapabilityChanged();
+    }
 }