Changeset 97082 in vbox

Timestamp:

Oct 10, 2022 9:18:54 PM (2 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Darwin build fixes.

File:

• trunk/src/VBox/VMM/VMMAll/VMXAllTemplate.cpp.h (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/VMXAllTemplate.cpp.h

@@ -3832 +3832 @@
 static int vmxHCImportGuestStateInner(PVMCPUCC pVCpu, PVMXVMCSINFO pVmcsInfo, uint32_t fEFlags)
 {
-    AssertCompile(a_fWhat != 0);
+    Assert(a_fWhat != 0); /* No AssertCompile as the assertion probably kicks in before the compiler (clang) discards it. */
     AssertCompile(!(a_fWhat & ~HMVMX_CPUMCTX_EXTRN_ALL));
     Assert(   (pVCpu->cpum.GstCtx.fExtrn & a_fWhat) == a_fWhat
@@ -4190 +4190 @@
         :           !VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_HM_UPDATE_CR3) )
         return VINF_SUCCESS;
+    RT_NOREF_PV(fEFlags);
 #endif
 
@@ -4259 +4260 @@
         if (RT_LIKELY(   (   fWhatToDo ==   (a_fWhat & HMVMX_CPUMCTX_EXTRN_ALL & ~(a_fDoneLocal | a_fDonePostExit))
                           || fWhatToDo == (  a_fWhat & HMVMX_CPUMCTX_EXTRN_ALL & ~(a_fDoneLocal | a_fDonePostExit)
-                                           & ~(CPUMCTX_EXTRN_RIP | CPUMCTX_EXTRN_RFLAGS)) /* fetch with INHIBIT_INT/NMI */)
-                      && fWhatToDo != 0 /*possible when CPUMCTX_EXTRN_ALL is used post-exit*/))
+                                           & ~(CPUMCTX_EXTRN_RIP | CPUMCTX_EXTRN_RFLAGS)) /* fetch with INHIBIT_INT/NMI */))
+            && (a_fWhat & HMVMX_CPUMCTX_EXTRN_ALL & ~(a_fDoneLocal | a_fDonePostExit)) != 0 /* just in case */)
         {
             int const rc = vmxHCImportGuestStateInner<  a_fWhat