Changeset 14902 in vbox for trunk/src

Timestamp:

Dec 2, 2008 2:24:03 PM (16 years ago)

Author:

vboxsync

Message:

HWACCM: Overlooked one fallback from VT-x to rawmode (darwin).

File:

• trunk/src/VBox/VMM/HWACCM.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/HWACCM.cpp

@@ -297 +297 @@
         LogRel(("HWACCM: No VMX or SVM CPU extension found. Reason %Rrc\n", pVM->hwaccm.s.lLastError));
         LogRel(("HWACCM: VMX MSR_IA32_FEATURE_CONTROL=%RX64\n", pVM->hwaccm.s.vmx.msr.feature_ctrl));
+#ifdef RT_OS_DARWIN
+        if (VMMIsHwVirtExtForced(pVM))
+            return VM_SET_ERROR(pVM, VERR_VMX_NO_VMX, "VT-x is not available.");
+#endif
         return VINF_SUCCESS;
     }
@@ -323 +327 @@
         if (VMMIsHwVirtExtForced(pVM))
             VM_SET_ERROR(pVM, rc, "An active VM already uses software virtualization. It is not allowed to "
-                         "simultaneously use VT-x.\n");
+                         "simultaneously use VT-x.");
         else
             VM_SET_ERROR(pVM, rc, "An active VM already uses Intel VT-x hardware acceleration. It is not "
-                         "allowed to simultaneously use software virtualization.\n");
+                         "allowed to simultaneously use software virtualization.");
         return rc;