Changeset 92363 in vbox

Timestamp:

Nov 11, 2021 11:25:18 AM (3 years ago)

Author:

vboxsync

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

148214

Message:

VMM/include/HMVMXCommon.h: Use IN_NEM_DARWIN instead of IN_RING0 so tstStructVMSize doesn't fail to compile, bugref:10136

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/NEMR3Native-darwin.cpp (modified) (1 diff)
• include/HMVMXCommon.h (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR3/NEMR3Native-darwin.cpp

@@ -1253 +1253 @@
  * Instantiate the code we share with ring-0.
  */
+#define IN_NEM_DARWIN
 //#define HMVMX_ALWAYS_TRAP_ALL_XCPTS
 #define HMVMX_ALWAYS_SYNC_FULL_GUEST_STATE

trunk/src/VBox/VMM/include/HMVMXCommon.h

@@ -328 +328 @@
     /** CR4 guest/host mask. */
     uint64_t                    u64Cr4Mask;
-#ifdef IN_RING0
+#ifndef IN_NEM_DARWIN
     /** Current VMX_VMCS_HOST_RIP value (only used in HMR0A.asm). */
     uint64_t                    uHostRip;
@@ -354 +354 @@
     /** @} */
 
-#ifdef IN_RING0
+#ifndef IN_NEM_DARWIN
     /** @name Host-physical address of VMCS and related data structures.
      *  @{ */
@@ -394 +394 @@
 AssertCompileMemberAlignment(VMXVMCSINFO, pvGuestMsrStore, 8);
 AssertCompileMemberAlignment(VMXVMCSINFO, pvHostMsrLoad,   8);
-#ifdef IN_RING0
+#ifndef IN_NEM_DARWIN
 AssertCompileMemberAlignment(VMXVMCSINFO, HCPhysVmcs,      8);
 AssertCompileMemberAlignment(VMXVMCSINFO, hMemObj,         8);