Changeset 91694 in vbox for trunk/src/VBox/VMM/VMMR0/NEMR0Native-win.cpp

Timestamp:

Oct 12, 2021 2:12:37 PM (3 years ago)

Author:

vboxsync

Message:

VMM/NEM: Made it build without NEM_WIN_USE_HYPERCALLS_FOR_PAGES again. #ifdef'ed a lot more based on NEM_WIN_USE_HYPERCALLS_FOR_PAGES (basically ring-0 ends up as a stub if it's not defined). [fixes] bugref:10118

File:

• trunk/src/VBox/VMM/VMMR0/NEMR0Native-win.cpp (modified) (7 diffs)

trunk/src/VBox/VMM/VMMR0/NEMR0Native-win.cpp

@@ -81 +81 @@
  */
 static NTSTATUS (*g_pfnWinHvDepositMemory)(uintptr_t idPartition, size_t cPages, uintptr_t IdealNode, size_t *pcActuallyAdded);
+#endif
 
 RT_C_DECLS_BEGIN
@@ -92 +93 @@
 decltype(WinHvGetPartitionProperty) *g_pfnWinHvGetPartitionProperty;
 RT_C_DECLS_END
-#endif
 
 /** @name VID.SYS image details.
@@ -158 +158 @@
 VMMR0_INT_DECL(int)  NEMR0Init(void)
 {
+#ifdef NEM_WIN_USE_HYPERCALLS_FOR_PAGES
     return RTCritSectInit(&g_VidSysCritSect);
+#else
+    return VINF_SUCCESS;
+#endif
 }
 
@@ -167 +171 @@
 VMMR0_INT_DECL(void) NEMR0Term(void)
 {
+#ifdef NEM_WIN_USE_HYPERCALLS_FOR_PAGES
     RTCritSectDelete(&g_VidSysCritSect);
+#endif
 }
 
+#ifdef NEM_WIN_USE_HYPERCALLS_FOR_PAGES
 
 /**
@@ -243 +250 @@
     uintptr_t const            offEndNtHdrs  = (uintptr_t)(pNtHdrs + 1) - (uintptr_t)pbImage;
 
-#define CHECK_LOG_RET(a_Expr, a_LogRel) do { \
+# define CHECK_LOG_RET(a_Expr, a_LogRel) do { \
             if (RT_LIKELY(a_Expr)) { /* likely */ } \
             else \
@@ -337 +344 @@
     //    return;
     //}
-#undef CHECK_LOG_RET
+# undef CHECK_LOG_RET
 }
 
@@ -379 +386 @@
         LogRel(("NEMR0: Failed to find vid.sys!__ImageBase (%Rrc)\n", rc));
 }
+
+#endif /* NEM_WIN_USE_HYPERCALLS_FOR_PAGES */