Changeset 45091 in vbox for trunk/src/VBox/VMM/VMMR0/HWVMXR0.h

Timestamp:

Mar 19, 2013 4:01:32 PM (12 years ago)

Author:

vboxsync

Message:

VMM/VMMR0: HM old-code segregation.

File:

• trunk/src/VBox/VMM/VMMR0/HWVMXR0.h (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR0/HWVMXR0.h

@@ -135 +135 @@
 
 /**
+ * Does Ring-0 global VT-x initialization.
+ *
+ * @returns VBox status code.
+ * @param   pVM         Pointer to the VM.
+ */
+VMMR0DECL(int) VMXR0GlobalInit(void);
+
+/**
+ * Does Ring-0 global VT-x termination.
+ *
+ * @returns VBox status code.
+ * @param   pVM         Pointer to the VM.
+ */
+VMMR0DECL(void) VMXR0GlobalTerm(void);
+
+/**
  * Does Ring-0 per VM VT-x initialization.
  *
@@ -299 +315 @@
 #endif
 
-/**
- * Return value of cached VMCS read for performance reasons (Darwin) and for
- * running 64 bits guests on 32-bit hosts.
- *
- * @param   idxField    VMCS field index.
- * @param   pVal        Value pointer (out).
- */
-#ifdef VMX_USE_CACHED_VMCS_ACCESSES
-# define VMXReadCachedVmcs(idxField, pVal)              VMXReadCachedVmcsEx(pVCpu, idxField##_CACHE_IDX, pVal)
+#ifdef VBOX_WITH_OLD_VTX_CODE
+# ifdef VMX_USE_CACHED_VMCS_ACCESSES
+#  define VMXReadCachedVmcs(idxField, pVal)              VMXReadCachedVmcsEx(pVCpu, idxField##_CACHE_IDX, pVal)
+# else
+#  define VMXReadCachedVmcs                              VMXReadVmcsField
+# endif
+#  define VMXReadVmcs                                    VMXReadVmcsField
 #else
-# define VMXReadCachedVmcs(idxField, pVal)              VMXReadVmcs(idxField, pVal)
+# if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
+# define VMXReadVmcsHstN                                 VMXReadVmcs64
+# define VMXReadVmcsGstN                                 VMXReadVmcs64
+# else
+# define VMXReadVmcsHstN                                 VMXReadVmcs32
+# define VMXReadVmcsGstN(idxField, pVal)                 VMXReadCachedVmcsEx(pVCpu, idxField##_CACHE_IDX, pVal)
+# endif
 #endif