Changeset 14606 in vbox for trunk/src/VBox/VMM

Timestamp:

Nov 25, 2008 10:08:39 PM (16 years ago)

Author:

vboxsync

Message:

HWACCMR0.cpp: partly enabled the code on the mac.

File:

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

trunk/src/VBox/VMM/VMMR0/HWACCMR0.cpp

@@ -161 +161 @@
     HWACCMR0Globals.pfnSetupVM          = HWACCMR0DummySetupVM;
 
-#ifndef VBOX_WITH_HYBIRD_32BIT_KERNEL /* paranoia */
-
     /*
      * Check for VT-x and AMD-V capabilities
      */
+#ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
+    if (    ASMHasCpuId()
+        &&  SUPR0GetPagingMode() < SUPPAGINGMODE_AMD64) /* VMON -> #UD in compatability mode; temporary hack. */
+#else
     if (ASMHasCpuId())
+#endif
     {
         uint32_t u32FeaturesECX;
@@ -352 +355 @@
     else
         HWACCMR0Globals.lLastError = VERR_HWACCM_NO_CPUID;
-
-#endif /* !VBOX_WITH_HYBIRD_32BIT_KERNEL */
 
     if (HWACCMR0Globals.vmx.fSupported)