Changeset 91692 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Oct 12, 2021 1:31:34 PM (3 years ago)

Author:

vboxsync

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

147421

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). bugref:10118

File:

• trunk/src/VBox/VMM/VMMR3/NEMR3Native-win.cpp (modified) (8 diffs)

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

@@ -174 +174 @@
 /** Pointer to the NtDeviceIoControlFile import table entry. */
 static decltype(NtDeviceIoControlFile) **g_ppfnVidNtDeviceIoControlFile;
+#if defined(NEM_WIN_USE_HYPERCALLS_FOR_PAGES) || defined(LOG_ENABLED)
 /** Info about the VidGetHvPartitionId I/O control interface. */
 static NEMWINIOCTL g_IoCtlGetHvPartitionId;
 /** Info about the VidGetPartitionProperty I/O control interface. */
 static NEMWINIOCTL g_IoCtlGetPartitionProperty;
+#endif
 #if defined(NEM_WIN_WITH_RING0_RUNLOOP) || defined(LOG_ENABLED)
 /** Info about the VidStartVirtualProcessor I/O control interface. */
@@ -241 +243 @@
 *   Internal Functions                                                                                                           *
 *********************************************************************************************************************************/
+DECLINLINE(int) nemR3NativeGCPhys2R3PtrReadOnly(PVM pVM, RTGCPHYS GCPhys, const void **ppv);
+DECLINLINE(int) nemR3NativeGCPhys2R3PtrWriteable(PVM pVM, RTGCPHYS GCPhys, void **ppv);
 
 /*
@@ -791 +795 @@
 }
 
+#if defined(NEM_WIN_USE_HYPERCALLS_FOR_PAGES) || defined(LOG_ENABLED)
 
 /**
@@ -845 +850 @@
 }
 
+#endif /* defined(NEM_WIN_USE_HYPERCALLS_FOR_PAGES) || defined(LOG_ENABLED) */
 #if defined(NEM_WIN_WITH_RING0_RUNLOOP) || defined(LOG_ENABLED)
 
@@ -985 +991 @@
 static int nemR3WinInitDiscoverIoControlProperties(PVM pVM, PRTERRINFO pErrInfo)
 {
+    RT_NOREF(pVM, pErrInfo);
+
     /*
      * Probe the I/O control information for select VID APIs so we can use
@@ -990 +998 @@
      *
      */
+#if defined(NEM_WIN_USE_HYPERCALLS_FOR_PAGES) || defined(LOG_ENABLED)
     decltype(NtDeviceIoControlFile) * const pfnOrg = *g_ppfnVidNtDeviceIoControlFile;
 
@@ -1019 +1028 @@
             g_IoCtlGetPartitionProperty.uFunction, g_IoCtlGetPartitionProperty.cbInput, g_IoCtlGetPartitionProperty.cbOutput));
 
+#endif
     int rcRet = VINF_SUCCESS;
 #if defined(NEM_WIN_WITH_RING0_RUNLOOP) || defined(LOG_ENABLED)
@@ -1103 +1113 @@
 
     /* Done. */
+#ifdef NEM_WIN_USE_HYPERCALLS_FOR_PAGES
     pVM->nem.s.IoCtlGetHvPartitionId            = g_IoCtlGetHvPartitionId;
     pVM->nem.s.IoCtlGetPartitionProperty        = g_IoCtlGetPartitionProperty;
+#endif
 #ifdef NEM_WIN_WITH_RING0_RUNLOOP
     pVM->nem.s.IoCtlStartVirtualProcessor       = g_IoCtlStartVirtualProcessor;