Changeset 83474 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Mar 28, 2020 4:48:23 PM (5 years ago)

Author:

vboxsync

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

136713

Message:

VMM/NEM: Added more VERR_NEM_MISSING_KERNEL_API status codes so we can better tell what does wrong.

File:

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

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

@@ -179 +179 @@
     {
         rc = RTR0DbgKrnlInfoQuerySymbol(hKrnlInfo, NULL, "HvlInvokeHypercall", (void **)&g_pfnHvlInvokeHypercall);
+        if (RT_FAILURE(rc))
+            rc = VERR_NEM_MISSING_KERNEL_API_1;
         if (RT_SUCCESS(rc))
+        {
             rc = RTR0DbgKrnlInfoQuerySymbol(hKrnlInfo, "winhvr.sys", "WinHvDepositMemory", (void **)&g_pfnWinHvDepositMemory);
+            if (RT_FAILURE(rc))
+                rc = rc == VERR_MODULE_NOT_FOUND ? VERR_NEM_MISSING_KERNEL_API_2 : VERR_NEM_MISSING_KERNEL_API_3;
+        }
         RTR0DbgKrnlInfoRelease(hKrnlInfo);
         if (RT_SUCCESS(rc))
@@ -223 +229 @@
             }
         }
-        else
-            rc = VERR_NEM_MISSING_KERNEL_API;
     }
 
@@ -427 +431 @@
      * Validate.
      */
-    AssertReturn(g_pfnHvlInvokeHypercall, VERR_NEM_MISSING_KERNEL_API);
+    AssertReturn(g_pfnHvlInvokeHypercall, VERR_NEM_MISSING_KERNEL_API_1);
 
     AssertReturn(cPages > 0, VERR_OUT_OF_RANGE);
@@ -534 +538 @@
      * Validate input.
      */
-    AssertReturn(g_pfnHvlInvokeHypercall, VERR_NEM_MISSING_KERNEL_API);
+    AssertReturn(g_pfnHvlInvokeHypercall, VERR_NEM_MISSING_KERNEL_API_1);
 
     AssertReturn(cPages > 0, VERR_OUT_OF_RANGE);
@@ -617 +621 @@
     HV_INPUT_SET_VP_REGISTERS *pInput = (HV_INPUT_SET_VP_REGISTERS *)pGVCpu->nemr0.s.HypercallData.pbPage;
     AssertPtrReturn(pInput, VERR_INTERNAL_ERROR_3);
-    AssertReturn(g_pfnHvlInvokeHypercall, VERR_NEM_MISSING_KERNEL_API);
+    AssertReturn(g_pfnHvlInvokeHypercall, VERR_NEM_MISSING_KERNEL_API_1);
 
     pInput->PartitionId = pGVM->nemr0.s.idHvPartition;
@@ -1301 +1305 @@
     {
         PGVMCPU pGVCpu = &pGVM->aCpus[idCpu];
-        AssertReturn(g_pfnHvlInvokeHypercall, VERR_NEM_MISSING_KERNEL_API);
+        AssertReturn(g_pfnHvlInvokeHypercall, VERR_NEM_MISSING_KERNEL_API_1);
 
         /*
@@ -1333 +1337 @@
     HV_INPUT_GET_VP_REGISTERS *pInput = (HV_INPUT_GET_VP_REGISTERS *)pGVCpu->nemr0.s.HypercallData.pbPage;
     AssertPtrReturn(pInput, VERR_INTERNAL_ERROR_3);
-    AssertReturn(g_pfnHvlInvokeHypercall, VERR_NEM_MISSING_KERNEL_API);
+    AssertReturn(g_pfnHvlInvokeHypercall, VERR_NEM_MISSING_KERNEL_API_1);
     Assert(pCtx == &pGVCpu->cpum.GstCtx);
 
@@ -2218 +2222 @@
     {
         PGVMCPU pGVCpu = &pGVM->aCpus[idCpu];
-        AssertReturn(g_pfnHvlInvokeHypercall, VERR_NEM_MISSING_KERNEL_API);
+        AssertReturn(g_pfnHvlInvokeHypercall, VERR_NEM_MISSING_KERNEL_API_1);
 
         /*
@@ -2250 +2254 @@
     HV_INPUT_GET_VP_REGISTERS *pInput = (HV_INPUT_GET_VP_REGISTERS *)pGVCpu->nemr0.s.HypercallData.pbPage;
     AssertPtrReturn(pInput, VERR_INTERNAL_ERROR_3);
-    AssertReturn(g_pfnHvlInvokeHypercall, VERR_NEM_MISSING_KERNEL_API);
+    AssertReturn(g_pfnHvlInvokeHypercall, VERR_NEM_MISSING_KERNEL_API_1);
 
     pInput->PartitionId = pGVM->nemr0.s.idHvPartition;
@@ -2300 +2304 @@
     {
         PGVMCPU pGVCpu = &pGVM->aCpus[idCpu];
-        AssertReturn(g_pfnHvlInvokeHypercall, VERR_NEM_MISSING_KERNEL_API);
+        AssertReturn(g_pfnHvlInvokeHypercall, VERR_NEM_MISSING_KERNEL_API_1);
 
         /*
@@ -2329 +2333 @@
 NEM_TMPL_STATIC int nemR0WinResumeCpuTickOnAll(PGVM pGVM, PGVMCPU pGVCpu, uint64_t uPausedTscValue)
 {
-    AssertReturn(g_pfnHvlInvokeHypercall, VERR_NEM_MISSING_KERNEL_API);
+    AssertReturn(g_pfnHvlInvokeHypercall, VERR_NEM_MISSING_KERNEL_API_1);
 
     /*
@@ -2408 +2412 @@
     {
         PGVMCPU pGVCpu = &pGVM->aCpus[idCpu];
-        AssertReturn(g_pfnHvlInvokeHypercall, VERR_NEM_MISSING_KERNEL_API);
+        AssertReturn(g_pfnHvlInvokeHypercall, VERR_NEM_MISSING_KERNEL_API_1);
 
         /*
@@ -2458 +2462 @@
     if (RT_SUCCESS(rc))
     {
-        AssertReturn(g_pfnHvlInvokeHypercall, VERR_NEM_MISSING_KERNEL_API);
+        AssertReturn(g_pfnHvlInvokeHypercall, VERR_NEM_MISSING_KERNEL_API_1);
 
         PNEMR0HYPERCALLDATA pHypercallData = idCpu != NIL_VMCPUID
@@ -2526 +2530 @@
     if (RT_SUCCESS(rc))
     {
-        AssertReturn(g_pfnHvlInvokeHypercall, VERR_NEM_MISSING_KERNEL_API);
+        AssertReturn(g_pfnHvlInvokeHypercall, VERR_NEM_MISSING_KERNEL_API_1);
 
         PGVMCPU pGVCpu = &pGVM->aCpus[idCpu];