Changeset 80338 in vbox for trunk/include

Timestamp:

Aug 17, 2019 8:51:25 AM (6 years ago)

Author:

vboxsync

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

132798

Message:

/include: Eliminating the VBOX_BUGREF_9217 preprocessor macro - missed two. bugref:9217

Location:

trunk/include/VBox

Files:

• VBoxTpG.h (modified) (1 diff)
• vmm/vmapi.h (modified) (1 diff)

trunk/include/VBox/VBoxTpG.h

@@ -432 +432 @@
 # define VTG_VMCPU_TO_R0(a_pVCpu)                (a_pVCpu)
 # define VTG_CPUMCTX_TO_R0(a_pVCpu, a_pCtx)      (a_pCtx)
-#elif defined(VBOX_BUGREF_9217)
+#else
 # define VTG_VM_TO_R0(a_pVM)                     ((a_pVM)   ? (a_pVM)->pVMR0ForCall  : NIL_RTR0PTR)
 # define VTG_VMCPU_TO_R0(a_pVCpu)                ((a_pVCpu) ? (a_pVCpu)->pVCpuR0ForVtg : NIL_RTR0PTR)
 # define VTG_CPUMCTX_TO_R0(a_pVCpu, a_pCtx)      ((a_pVCpu) ? (a_pVCpu)->pVCpuR0ForVtg + ((uintptr_t)(a_pCtx) - (uintptr_t)(a_pVCpu)) : NIL_RTR0PTR)
-#else
-# define VTG_VM_TO_R0(a_pVM)                     ((a_pVM)   ? (a_pVM)->pVMR0                                : NIL_RTR0PTR)
-# define VTG_VMCPU_TO_R0(a_pVCpu)                ((a_pVCpu) ? VM_R0_ADDR((a_pVCpu)->CTX_SUFF(pVM), a_pVCpu) : NIL_RTR0PTR)
-# define VTG_CPUMCTX_TO_R0(a_pVCpu, a_pCtx)      ((a_pVCpu) ? VM_R0_ADDR((a_pVCpu)->CTX_SUFF(pVM), a_pCtx)  : NIL_RTR0PTR)
 #endif
 /** @} */

trunk/include/VBox/vmm/vmapi.h

@@ -55 +55 @@
 #define VM_EXEC_ENGINE_NATIVE_API           UINT8_C(3)
 /** @} */
-
-
-#ifndef VBOX_BUGREF_9217
-/** @def VM_R0_ADDR
- * Converts a current context address of data within the VM structure to the equivalent
- * ring-0 host address.
- *
- * @returns host virtual address.
- * @param   pVM     The cross context VM structure.
- * @param   pvInVM  CC pointer within the VM.
- */
-#ifdef IN_RC
-# define VM_R0_ADDR(pVM, pvInVM)       ( (RTR0PTR)((RTR0UINTPTR)pVM->pVMR0 + (uint32_t)((uintptr_t)(pvInVM) - (uintptr_t)pVM->pVMRC)) )
-#elif defined(IN_RING3)
-# define VM_R0_ADDR(pVM, pvInVM)       ( (RTR0PTR)((RTR0UINTPTR)pVM->pVMR0 + (uint32_t)((uintptr_t)(pvInVM) - (uintptr_t)pVM->pVMR3)) )
-#else
-# define VM_R0_ADDR(pVM, pvInVM)       ( (RTR0PTR)(pvInVM) )
-#endif
-#endif