Changeset 57429 in vbox for trunk/src/VBox/VMM/VMMR0/HMVMXR0.h

Timestamp:

Aug 18, 2015 1:35:18 PM (9 years ago)

Author:

vboxsync

Message:

VMM/HM: Start removing VBOX_WITH_HYBRID_32BIT_KERNEL code.

File:

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

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

@@ -45 +45 @@
 
 
-# if HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
+# if HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS)
 DECLASM(int)    VMXR0SwitcherStartVM64(RTHCUINT fResume, PCPUMCTX pCtx, PVMCSCACHE pCache, PVM pVM, PVMCPU pVCpu);
 VMMR0DECL(int)  VMXR0Execute64BitsHandler(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx, HM64ON32OP enmOp, uint32_t cbParam,
@@ -63 +63 @@
 # endif
 
-# ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
-/* Don't use fAllow64BitGuests for VMXReadVmcsGstN() even though it looks right, as it can be forced to 'true'.
-   HMVMX_IS_64BIT_HOST_MODE() is what we need. */
-#  define VMXReadVmcsHstN(idxField, p64Val)               HMVMX_IS_64BIT_HOST_MODE() ?                      \
-                                                            VMXReadVmcs64(idxField, p64Val)                 \
-                                                          : (*(p64Val) &= UINT64_C(0xffffffff),             \
-                                                             VMXReadVmcs32(idxField, (uint32_t *)(p64Val)))
-#  define VMXReadVmcsGstN                                 VMXReadVmcsHstN
-#  define VMXReadVmcsGstNByIdxVal                         VMXReadVmcsGstN
-# elif HC_ARCH_BITS == 32
+# if HC_ARCH_BITS == 32
 #  define VMXReadVmcsHstN                                 VMXReadVmcs32
 #  define VMXReadVmcsGstN(idxField, pVal)                 VMXReadCachedVmcsEx(pVCpu, idxField##_CACHE_IDX, pVal)