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

Timestamp:

Sep 28, 2018 11:24:47 AM (6 years ago)

Author:

vboxsync

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

125382

Message:

NEM/win: Updates for new builds. bugref:9044

File:

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

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

@@ -855 +855 @@
     AssertLogRelMsgReturn(RT_VALID_PTR(pIos), ("pIos=%p\n", pIos), STATUS_INVALID_PARAMETER_5);
 
-    AssertLogRelMsgReturn(cbInput == sizeof(VID_IOCTL_INPUT_MESSAGE_SLOT_HANDLE_AND_GET_NEXT), ("cbInput=%#x\n", cbInput),
-                          STATUS_INVALID_PARAMETER_8);
-    AssertLogRelMsgReturn(RT_VALID_PTR(pvInput), ("pvInput=%p\n", pvInput), STATUS_INVALID_PARAMETER_9);
-    PCVID_IOCTL_INPUT_MESSAGE_SLOT_HANDLE_AND_GET_NEXT pVidIn = (PCVID_IOCTL_INPUT_MESSAGE_SLOT_HANDLE_AND_GET_NEXT)pvInput;
-    AssertLogRelMsgReturn(   pVidIn->iCpu == NEM_WIN_IOCTL_DETECTOR_FAKE_VP_INDEX
-                          && pVidIn->fFlags == VID_MSHAGN_F_HANDLE_MESSAGE
-                          && pVidIn->cMillies == NEM_WIN_IOCTL_DETECTOR_FAKE_TIMEOUT,
-                          ("iCpu=%u fFlags=%#x cMillies=%#x\n", pVidIn->iCpu, pVidIn->fFlags, pVidIn->cMillies),
-                          STATUS_INVALID_PARAMETER_9);
-    AssertLogRelMsgReturn(cbOutput == 0, ("cbInput=%#x\n", cbInput), STATUS_INVALID_PARAMETER_10);
-    RT_NOREF(pvOutput);
+    if (g_uBuildNo >= 17758)
+    {
+        /* No timeout since about build 17758, it's now always an infinite wait.  So, a somewhat compatible change.  */
+        AssertLogRelMsgReturn(cbInput == RT_UOFFSETOF(VID_IOCTL_INPUT_MESSAGE_SLOT_HANDLE_AND_GET_NEXT, cMillies),
+                              ("cbInput=%#x\n", cbInput),
+                              STATUS_INVALID_PARAMETER_8);
+        AssertLogRelMsgReturn(RT_VALID_PTR(pvInput), ("pvInput=%p\n", pvInput), STATUS_INVALID_PARAMETER_9);
+        PCVID_IOCTL_INPUT_MESSAGE_SLOT_HANDLE_AND_GET_NEXT pVidIn = (PCVID_IOCTL_INPUT_MESSAGE_SLOT_HANDLE_AND_GET_NEXT)pvInput;
+        AssertLogRelMsgReturn(   pVidIn->iCpu == NEM_WIN_IOCTL_DETECTOR_FAKE_VP_INDEX
+                              && pVidIn->fFlags == VID_MSHAGN_F_HANDLE_MESSAGE,
+                              ("iCpu=%u fFlags=%#x cMillies=%#x\n", pVidIn->iCpu, pVidIn->fFlags, pVidIn->cMillies),
+                              STATUS_INVALID_PARAMETER_9);
+        AssertLogRelMsgReturn(cbOutput == 0, ("cbInput=%#x\n", cbInput), STATUS_INVALID_PARAMETER_10);
+    }
+    else
+    {
+        AssertLogRelMsgReturn(cbInput == sizeof(VID_IOCTL_INPUT_MESSAGE_SLOT_HANDLE_AND_GET_NEXT), ("cbInput=%#x\n", cbInput),
+                              STATUS_INVALID_PARAMETER_8);
+        AssertLogRelMsgReturn(RT_VALID_PTR(pvInput), ("pvInput=%p\n", pvInput), STATUS_INVALID_PARAMETER_9);
+        PCVID_IOCTL_INPUT_MESSAGE_SLOT_HANDLE_AND_GET_NEXT pVidIn = (PCVID_IOCTL_INPUT_MESSAGE_SLOT_HANDLE_AND_GET_NEXT)pvInput;
+        AssertLogRelMsgReturn(   pVidIn->iCpu == NEM_WIN_IOCTL_DETECTOR_FAKE_VP_INDEX
+                              && pVidIn->fFlags == VID_MSHAGN_F_HANDLE_MESSAGE
+                              && pVidIn->cMillies == NEM_WIN_IOCTL_DETECTOR_FAKE_TIMEOUT,
+                              ("iCpu=%u fFlags=%#x cMillies=%#x\n", pVidIn->iCpu, pVidIn->fFlags, pVidIn->cMillies),
+                              STATUS_INVALID_PARAMETER_9);
+        AssertLogRelMsgReturn(cbOutput == 0, ("cbInput=%#x\n", cbInput), STATUS_INVALID_PARAMETER_10);
+        RT_NOREF(pvOutput);
+    }
 
     g_IoCtlMessageSlotHandleAndGetNext.cbInput   = cbInput;
@@ -918 +935 @@
     decltype(NtDeviceIoControlFile) * const pfnOrg = *g_ppfnVidNtDeviceIoControlFile;
 
-    /* VidGetHvPartitionId */
+    /* VidGetHvPartitionId - must work due to memory. */
     *g_ppfnVidNtDeviceIoControlFile = nemR3WinIoctlDetector_GetHvPartitionId;
     HV_PARTITION_ID idHvPartition = HV_PARTITION_ID_INVALID;
@@ -930 +947 @@
             g_IoCtlGetHvPartitionId.uFunction, g_IoCtlGetHvPartitionId.cbInput, g_IoCtlGetHvPartitionId.cbOutput));
 
+    int rcRet = VINF_SUCCESS;
     /* VidStartVirtualProcessor */
     *g_ppfnVidNtDeviceIoControlFile = nemR3WinIoctlDetector_StartVirtualProcessor;
     fRet = g_pfnVidStartVirtualProcessor(NEM_WIN_IOCTL_DETECTOR_FAKE_HANDLE, NEM_WIN_IOCTL_DETECTOR_FAKE_VP_INDEX);
     *g_ppfnVidNtDeviceIoControlFile = pfnOrg;
-    AssertReturn(fRet && g_IoCtlStartVirtualProcessor.uFunction != 0,
-                 RTErrInfoSetF(pErrInfo, VERR_NEM_INIT_FAILED,
-                               "Problem figuring out VidStartVirtualProcessor: fRet=%u dwErr=%u",
-                               fRet, GetLastError()) );
+    AssertStmt(fRet && g_IoCtlStartVirtualProcessor.uFunction != 0,
+               rcRet = RTERRINFO_LOG_REL_SET_F(pErrInfo, VERR_NEM_RING3_ONLY,
+                                               "Problem figuring out VidStartVirtualProcessor: fRet=%u dwErr=%u",
+                                               fRet, GetLastError()) );
     LogRel(("NEM: VidStartVirtualProcessor       -> fun:%#x in:%#x out:%#x\n", g_IoCtlStartVirtualProcessor.uFunction,
             g_IoCtlStartVirtualProcessor.cbInput, g_IoCtlStartVirtualProcessor.cbOutput));
@@ -945 +963 @@
     fRet = g_pfnVidStopVirtualProcessor(NEM_WIN_IOCTL_DETECTOR_FAKE_HANDLE, NEM_WIN_IOCTL_DETECTOR_FAKE_VP_INDEX);
     *g_ppfnVidNtDeviceIoControlFile = pfnOrg;
-    AssertReturn(fRet && g_IoCtlStopVirtualProcessor.uFunction != 0,
-                 RTErrInfoSetF(pErrInfo, VERR_NEM_INIT_FAILED,
-                               "Problem figuring out VidStopVirtualProcessor: fRet=%u dwErr=%u",
-                               fRet, GetLastError()) );
+    AssertStmt(fRet && g_IoCtlStopVirtualProcessor.uFunction != 0,
+               rcRet = RTERRINFO_LOG_REL_SET_F(pErrInfo, VERR_NEM_RING3_ONLY,
+                                               "Problem figuring out VidStopVirtualProcessor: fRet=%u dwErr=%u",
+                                               fRet, GetLastError()) );
     LogRel(("NEM: VidStopVirtualProcessor        -> fun:%#x in:%#x out:%#x\n", g_IoCtlStopVirtualProcessor.uFunction,
             g_IoCtlStopVirtualProcessor.cbInput, g_IoCtlStopVirtualProcessor.cbOutput));
@@ -958 +976 @@
                                                NEM_WIN_IOCTL_DETECTOR_FAKE_TIMEOUT);
     *g_ppfnVidNtDeviceIoControlFile = pfnOrg;
-    AssertReturn(fRet && g_IoCtlMessageSlotHandleAndGetNext.uFunction != 0,
-                 RTErrInfoSetF(pErrInfo, VERR_NEM_INIT_FAILED,
-                               "Problem figuring out VidMessageSlotHandleAndGetNext: fRet=%u dwErr=%u",
-                               fRet, GetLastError()) );
+    AssertStmt(fRet && g_IoCtlMessageSlotHandleAndGetNext.uFunction != 0,
+               rcRet = RTERRINFO_LOG_REL_SET_F(pErrInfo, VERR_NEM_RING3_ONLY,
+                                               "Problem figuring out VidMessageSlotHandleAndGetNext: fRet=%u dwErr=%u",
+                                               fRet, GetLastError()) );
     LogRel(("NEM: VidMessageSlotHandleAndGetNext -> fun:%#x in:%#x out:%#x\n",
             g_IoCtlMessageSlotHandleAndGetNext.uFunction, g_IoCtlMessageSlotHandleAndGetNext.cbInput,
@@ -1014 +1032 @@
     pVM->nem.s.IoCtlStopVirtualProcessor        = g_IoCtlStopVirtualProcessor;
     pVM->nem.s.IoCtlMessageSlotHandleAndGetNext = g_IoCtlMessageSlotHandleAndGetNext;
-    return VINF_SUCCESS;
+    return rcRet;
 }
 
@@ -1198 +1216 @@
              */
             rc = nemR3WinInitDiscoverIoControlProperties(pVM, pErrInfo);
+            if (rc == VERR_NEM_RING3_ONLY)
+            {
+                if (pVM->nem.s.fUseRing0Runloop)
+                {
+                    LogRel(("NEM: Disabling UseRing0Runloop.\n"));
+                    pVM->nem.s.fUseRing0Runloop = false;
+                }
+                rc = VINF_SUCCESS;
+            }
             if (RT_SUCCESS(rc))
             {