Changeset 16184 in vbox

Timestamp:

Jan 22, 2009 5:33:01 PM (16 years ago)

Author:

vboxsync

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

41934

Message:

VMM: VERR_PGM_MAPPING_CONFLICT fix: always relocate after ring-3 init.

File:

• trunk/src/VBox/VMM/VM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VM.cpp

@@ -560 +560 @@
             {
                 /*
-                 * Init the Ring-3 components and do a round of relocations with 0 delta.
+                 * Init the ring-3 components and ring-3 per cpu data, finishing it off
+                 * by a relocation round (intermediate context finalization will do this).
                  */
                 rc = vmR3InitRing3(pVM, pUVM);
                 if (RT_SUCCESS(rc))
                 {
-                    VMR3Relocate(pVM, 0);
-                    LogFlow(("Ring-3 init succeeded\n"));
-
-                    /* Initialize the VMCPU components. */
                     rc = vmR3InitVMCpu(pVM);
                     if (RT_SUCCESS(rc))
+                        rc = PGMR3FinalizeMappings(pVM);
+                    if (RT_SUCCESS(rc))
                     {
+
+                        LogFlow(("Ring-3 init succeeded\n"));
+
                         /*
                          * Init the Ring-0 components.