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

Timestamp:

Feb 27, 2018 1:17:36 PM (7 years ago)

Author:

vboxsync

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

121023

Message:

SUPDrv,VMM/NEM/win: Abstracted kernel I/O control work in SUPDrv, currently only implemented & needed on windows. Made first I/O control call to VID from ring-0. bugref:9044

File:

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

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

@@ -1269 +1269 @@
     pVM->nem.s.fCreatedEmts = true;
 
-    LogRel(("NEM: Successfully set up partition (device handle %p, partition ID %#llx)\n", hPartitionDevice, idHvPartition));
-    return VINF_SUCCESS;
+    /*
+     * Do some more ring-0 initialization now that we've got the partition handle.
+     */
+    int rc = VMMR3CallR0Emt(pVM, &pVM->aCpus[0], VMMR0_DO_NEM_INIT_VM_PART_2, 0, NULL);
+    if (RT_SUCCESS(rc))
+    {
+        LogRel(("NEM: Successfully set up partition (device handle %p, partition ID %#llx)\n", hPartitionDevice, idHvPartition));
+        return VINF_SUCCESS;
+    }
+    return VMSetError(pVM, VERR_NEM_VM_CREATE_FAILED, RT_SRC_POS, "Call to NEMR0InitVMPart2 failed: %Rrc", rc);
 }
 
@@ -1342 +1350 @@
     }
 }
-
 
 #ifdef NEM_WIN_USE_HYPERCALLS_FOR_PAGES
@@ -2295 +2302 @@
                 /* ACK the stop message. */
                 fWait = g_pfnVidMessageSlotHandleAndGetNext(pVM->nem.s.hPartitionDevice, pVCpu->idCpu,
-                                                                 VID_MSHAGN_F_HANDLE_MESSAGE, 5000);
+                                                            VID_MSHAGN_F_HANDLE_MESSAGE, 5000);
                 AssertLogRelMsg(fWait, ("dwErr=%u (%#x) rcNt=%#x\n", RTNtLastErrorValue(), RTNtLastErrorValue(), RTNtLastStatusValue()));