Changeset 26457 in vbox

Timestamp:

Feb 12, 2010 10:55:03 AM (15 years ago)

Author:

vboxsync

Message:

Do not show misleading warnings when VT-x/AMD-V support is not present.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxConsoleWnd.cpp (modified) (1 diff)
• globals/VBoxProblemReporter.cpp (modified) (1 diff)
• globals/VBoxProblemReporter.h (modified) (1 diff)

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

@@ -2898 +2898 @@
     {
         bool ret;
+        bool fVTxAMDVSupported = vboxGlobal().virtualBox().GetHost()
+                                 .GetProcessorFeature (KProcessorFeature_HWVirtEx);
 
         vmPause (true);
 
         if (is64BitsGuest)
-            ret = vboxProblem().warnAboutVirtNotEnabled64BitsGuest();
+            ret = vboxProblem().warnAboutVirtNotEnabled64BitsGuest(fVTxAMDVSupported);
         else
-            ret = vboxProblem().warnAboutVirtNotEnabledGuestRequired();
+            ret = vboxProblem().warnAboutVirtNotEnabledGuestRequired(fVTxAMDVSupported);
 
         if (ret == true)

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

@@ -794 +794 @@
 }
 
-bool VBoxProblemReporter::warnAboutVirtNotEnabled64BitsGuest()
-{
-    return messageOkCancel (mainWindowShown(), Error,
-        tr ("<p>VT-x/AMD-V hardware acceleration has been enabled, but is "
-            "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>"),
-        0 /* aAutoConfirmId */,
-        tr ("Close VM"), tr ("Continue"));
+bool VBoxProblemReporter::warnAboutVirtNotEnabled64BitsGuest(bool fHWVirtExSupported)
+{
+    if (fHWVirtExSupported)
+        return messageOkCancel (mainWindowShown(), Error,
+            tr ("<p>VT-x/AMD-V hardware acceleration has been enabled, but is "
+                "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"));
+    else
+        return messageOkCancel (mainWindowShown(), Error,
+            tr ("<p>VT-x/AMD-V hardware acceleration is not available on your system. "
+                "Your 64-bit guest will fail to detect a 64-bit CPU and will "
+                "not be able to boot."),
+            0 /* aAutoConfirmId */,
+            tr ("Close VM"), tr ("Continue"));
+}
+
+bool VBoxProblemReporter::warnAboutVirtNotEnabledGuestRequired(bool fHWVirtExSupported)
+{
+    if (fHWVirtExSupported)
+        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>"),
+            0 /* aAutoConfirmId */,
+            tr ("Close VM"), tr ("Continue"));
+    else
+        return messageOkCancel (mainWindowShown(), Error,
+            tr ("<p>VT-x/AMD-V hardware acceleration is not available on your system. "
+                "Certain guests (e.g. OS/2 and QNX) require this feature and will "
+                "fail to boot without it.</p>"),
+            0 /* aAutoConfirmId */,
+            tr ("Close VM"), tr ("Continue"));
 }
 

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

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