Changeset 14914 in vbox for trunk/src/VBox

Timestamp:

Dec 2, 2008 3:33:26 PM (16 years ago)

Author:

vboxsync

Message:

SUPDrv-darwin.c: disabled host_vmxon/off as it doesn't work with VBoxNetFlt dependency. :/

File:

• trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp (modified) (4 diffs)

trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp

@@ -665 +665 @@
  * host_vmxon & host_vmxoff in Tiger.
  */
-static int g_fWeakHostVmxOnOff = false;
-
+#if 0
 __BEGIN_DECLS
+#if 1
+#pragma weak host_vmxon
+int host_vmxon(int exclusive) __attribute__((weak_import));
+#pragma weak host_vmxoff
+void host_vmxoff(void) __attribute__((weak_import));
+#else
 int host_vmxon(int exclusive) __attribute__((weak));
 void host_vmxoff(void) __attribute__((weak));
+#endif
 __END_DECLS
 
+static int g_fWeakHostVmxOnOff = false;
+#if 0
 /* weak version for Tiger. */
 int host_vmxon(int exclusive)
@@ -685 +693 @@
     g_fWeakHostVmxOnOff = true;
 }
+#endif
+#endif
 
 
@@ -695 +705 @@
 int VBOXCALL supdrvOSEnableVTx(bool fEnable)
 {
+#if 0
+    if (host_vmxon == NULL || host_vmxoff == NULL)
+        g_fWeakHostVmxOnOff = true;
     if (g_fWeakHostVmxOnOff)
         return VERR_NOT_SUPPORTED;
@@ -724 +737 @@
     }
     return rc;
+#else
+    return VERR_NOT_SUPPORTED;
+#endif
 }