Changeset 43706 in vbox

Timestamp:

Oct 22, 2012 4:40:31 PM (13 years ago)

Author:

vboxsync

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

81568

Message:

VMM/HM: bits.

Location:

trunk

Files:

• include/VBox/vmm/hm_vmx.h (modified) (8 diffs)
• src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (3 diffs)

trunk/include/VBox/vmm/hm_vmx.h

@@ -1341 +1341 @@
  * @param   pVMXOn      Physical address of VMXON structure
  */
-#if RT_INLINE_ASM_EXTERNAL || HC_ARCH_BITS == 64 || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
+#if RT_INLINE_ASM_EXTERNAL || HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
 DECLASM(int) VMXEnable(RTHCPHYS pVMXOn);
 #else
@@ -1395 +1395 @@
  * Executes VMXOFF
  */
-#if RT_INLINE_ASM_EXTERNAL || HC_ARCH_BITS == 64 || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
+#if RT_INLINE_ASM_EXTERNAL || HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
 DECLASM(void) VMXDisable(void);
 #else
@@ -1422 +1422 @@
  * @param   pVMCS       Physical address of VM control structure
  */
-#if RT_INLINE_ASM_EXTERNAL || HC_ARCH_BITS == 64 || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
+#if RT_INLINE_ASM_EXTERNAL || HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
 DECLASM(int) VMXClearVMCS(RTHCPHYS pVMCS);
 #else
@@ -1470 +1470 @@
  * @param   pVMCS       Physical address of VMCS structure
  */
-#if RT_INLINE_ASM_EXTERNAL || HC_ARCH_BITS == 64 || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
+#if RT_INLINE_ASM_EXTERNAL || HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
 DECLASM(int) VMXActivateVMCS(RTHCPHYS pVMCS);
 #else
@@ -1525 +1525 @@
  * @param   u32Val          32 bits value
  */
-#if RT_INLINE_ASM_EXTERNAL || HC_ARCH_BITS == 64 || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
+#if RT_INLINE_ASM_EXTERNAL || HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
 DECLASM(int) VMXWriteVMCS32(uint32_t idxField, uint32_t u32Val);
 #else
@@ -1577 +1577 @@
  * @param   u64Val          16, 32 or 64 bits value
  */
-#if HC_ARCH_BITS == 64 || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
+#if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
 DECLASM(int) VMXWriteVMCS64(uint32_t idxField, uint64_t u64Val);
 #else
@@ -1615 +1615 @@
  * @param   pData           Ptr to store VM field value
  */
-#if RT_INLINE_ASM_EXTERNAL || HC_ARCH_BITS == 64 || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
+#if RT_INLINE_ASM_EXTERNAL || HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
 DECLASM(int) VMXReadVMCS32(uint32_t idxField, uint32_t *pData);
 #else
@@ -1670 +1670 @@
  * @param   pData           Ptr to store VM field value
  */
-#if HC_ARCH_BITS == 64 || defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
+#if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
 DECLASM(int) VMXReadVMCS64(uint32_t idxField, uint64_t *pData);
 #else

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

@@ -5559 +5559 @@
 
 
-#if HC_ARCH_BITS == 32 && !defined(VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0)
+#if HC_ARCH_BITS == 32 && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
 /**
  * Executes VMWRITE.
@@ -5630 +5630 @@
 
 /**
- * Cache VMCS writes for performance reasons (Darwin) and for running 64 bits guests on 32 bits hosts.
+ * Cache VMCS writes for running 64 bits guests on 32 bits hosts.
  *
  * @param   pVCpu       Pointer to the VMCPU.
@@ -5659 +5659 @@
 }
 
-#endif /* HC_ARCH_BITS == 32 && !VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 */
-
+#endif /* HC_ARCH_BITS == 32 && !VBOX_WITH_HYBRID_32BIT_KERNEL */
+