Changeset 19854 in vbox

Timestamp:

May 20, 2009 10:55:17 AM (16 years ago)

Author:

vboxsync

Message:

Show warning about non-functional VT-x/AMD-V for guest that require it

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxProblemReporter.h (modified) (1 diff)
• src/VBoxConsoleWnd.cpp (modified) (1 diff)
• src/VBoxProblemReporter.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxProblemReporter.h

@@ -202 +202 @@
 
     void cannotSendACPIToMachine();
-    bool warnAboutVirtNotEnabled();
+    bool warnAboutVirtNotEnabled64BitsGuest();
+    bool warnAboutVirtNotEnabledGuestRequired();
 
     void cannotSetSnapshotFolder (const CMachine &aMachine, const QString &aPath);

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -2152 +2152 @@
     CConsole cconsole = console->console();
 
-    /* Check if virtualization feature enabled for 64 bits guest */
-    bool is64BitsGuest = vboxGlobal().virtualBox().GetGuestOSType (
-                         cconsole.GetGuest().GetOSTypeId()).GetIs64Bit();
-    bool isVirtEnabled = cconsole.GetDebugger().GetHWVirtExEnabled();
-    if (is64BitsGuest && !isVirtEnabled)
-    {
+    /* Check if the virtualization feature is required. */
+    bool is64BitsGuest    = vboxGlobal().virtualBox().GetGuestOSType (
+                            cconsole.GetGuest().GetOSTypeId()).GetIs64Bit();
+    bool fRecommendVirtEx = vboxGlobal().virtualBox().GetGuestOSType (
+                            cconsole.GetGuest().GetOSTypeId()).GetRecommendedVirtEx();
+    Assert(!is64BitsGuest || fRecommendVirtEx);
+    bool isVirtEnabled    = cconsole.GetDebugger().GetHWVirtExEnabled();
+    if (fRecommendVirtEx && !isVirtEnabled)
+    {
+        bool ret;
+
         vmPause (true);
-        if (vboxProblem().warnAboutVirtNotEnabled())
+
+        if (is64BitsGuest)
+            ret = vboxProblem().warnAboutVirtNotEnabled64BitsGuest();
+        else
+            ret = vboxProblem().warnAboutVirtNotEnabledGuestRequired();
+
+        if (ret == true)
             close();
         else

trunk/src/VBox/Frontends/VirtualBox/src/VBoxProblemReporter.cpp

@@ -748 +748 @@
 }
 
-bool VBoxProblemReporter::warnAboutVirtNotEnabled()
+bool VBoxProblemReporter::warnAboutVirtNotEnabled64BitsGuest()
 {
     return messageOkCancel (mainWindowShown(), Error,
@@ -754 +754 @@
             "not operational. Your 64-bit guest will fail to detect a "
             "64-bit CPU and will not be able to boot.</p><p>Please ensure "
+            "that you have enabled VT-x/AMD-V properly in the BIOS of your "
+            "host computer.</p>"),
+        0 /* aAutoConfirmId */,
+        tr ("Close VM"), tr ("Continue"));
+}
+
+bool VBoxProblemReporter::warnAboutVirtNotEnabledGuestRequired()
+{
+    return messageOkCancel (mainWindowShown(), Error,
+        tr ("<p>VT-x/AMD-V hardware acceleration has been enabled, but is "
+            "not operational. Certain guests (e.g. OS/2 and QNX) require "
+            "this feature.</p><p>Please ensure "
             "that you have enabled VT-x/AMD-V properly in the BIOS of your "
             "host computer.</p>"),