Changeset 42821 in vbox for trunk/src/VBox/VMM/include

Timestamp:

Aug 15, 2012 11:11:03 AM (12 years ago)

Author:

vboxsync

Message:

Workaround to fix 64bit guests on OS X Snow Leopard (#6313)

Location:

trunk/src/VBox/VMM/include

Files:

• HWACCMInternal.h (modified) (2 diffs)
• HWACCMInternal.mac (modified) (1 diff)

trunk/src/VBox/VMM/include/HWACCMInternal.h

@@ -41 +41 @@
 #define HWACCM_VMX_EMULATE_REALMODE
 
-
+/** @todo: Broken on OS X Snow Leopard @bugref{6313}. */
+#if !defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
 /* The MSR auto load/store does not work for KERNEL_GS_BASE MSR, thus we
  * handle this MSR manually. See @bugref{6208}. This is clearly visible while
@@ -48 +49 @@
  * Note: don't forget to update the assembly files while modifying this!
  */
-#define VBOX_WITH_AUTO_MSR_LOAD_RESTORE
+# define VBOX_WITH_AUTO_MSR_LOAD_RESTORE
+#endif
 
 RT_C_DECLS_BEGIN

trunk/src/VBox/VMM/include/HWACCMInternal.mac

@@ -16 +16 @@
 
 %define VMX_USE_CACHED_VMCS_ACCESSES
+
+/** @todo: Broken on OS X Snow Leopard @bugref{6313}. */
+%ifndef VBOX_WITH_HYBRID_32BIT_KERNEL
 %define VBOX_WITH_AUTO_MSR_LOAD_RESTORE
+%endif
 
 ;Maximum number of cached entries.