Changeset 45091 in vbox for trunk/include/VBox/vmm

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

84380

Message:

VMM/VMMR0: HM old-code segregation.

Location:

trunk/include/VBox/vmm

Files:

• hm_vmx.h (modified) (2 diffs)
• vmm.h (modified) (2 diffs)

trunk/include/VBox/vmm/hm_vmx.h

@@ -1629 +1629 @@
 #endif
 
-#if HC_ARCH_BITS == 64
-#define VMXWriteVmcs VMXWriteVmcs64
-#else
-#define VMXWriteVmcs VMXWriteVmcs32
-#endif /* HC_ARCH_BITS == 64 */
+#ifdef VBOX_WITH_OLD_VTX_CODE
+# if HC_ARCH_BITS == 64
+# define VMXWriteVmcs VMXWriteVmcs64
+# else
+# define VMXWriteVmcs VMXWriteVmcs32
+# endif
+#else /* !VBOX_WITH_OLD_VTX_CODE */
+# if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
+# define VMXWriteVmcsHstN VMXWriteVmcs64
+# else
+# define VMXWriteVmcsHstN VMXWriteVmcs32
+# endif
+# define VMXWriteVmcsGstN VMXWriteVmcs64
+#endif
 
 
@@ -1731 +1740 @@
 
 # if HC_ARCH_BITS == 64
-#  define VMXReadVmcs VMXReadVmcs64
+#  define VMXReadVmcsField VMXReadVmcs64
 # else
-#  define VMXReadVmcs VMXReadVmcs32
+#  define VMXReadVmcsField VMXReadVmcs32
 # endif
 

trunk/include/VBox/vmm/vmm.h

@@ -111 +111 @@
     VMMCALLRING3_32BIT_HACK = 0x7fffffff
 } VMMCALLRING3;
+
+/**
+ * VMMRZCallRing3 notification callback.
+ *
+ * @param   pVCpu           Pointer to the VMCPU.
+ * @param   enmOperation    The operation causing the ring-3 jump.
+ * @param   pvUser          The user argument.
+ */
+typedef DECLCALLBACK(void) FNVMMR0CALLRING3NOTIFICATION(PVMCPU pVCpu, VMMCALLRING3 enmOperation, void *pvUser);
+/** Pointer to a FNRTMPNOTIFICATION(). */
+typedef FNVMMR0CALLRING3NOTIFICATION *PFNVMMR0CALLRING3NOTIFICATION;
 
 /**
@@ -504 +515 @@
 VMMRZDECL(void)     VMMRZCallRing3Enable(PVMCPU pVCpu);
 VMMRZDECL(bool)     VMMRZCallRing3IsEnabled(PVMCPU pVCpu);
+VMMRZDECL(int)      VMMRZCallRing3SetNotification(PVMCPU pVCpu, PFNVMMR0CALLRING3NOTIFICATION pfnCallback, void *pvUser);
+VMMRZDECL(void)     VMMRZCallRing3RemoveNotification(PVMCPU pVCpu);
 /** @} */
 #endif