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

Timestamp:

Apr 25, 2013 7:44:05 PM (12 years ago)

Author:

vboxsync

Message:

VMM: First part of HMIsEnabled() and PGMMap*.

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• HM.cpp (modified) (1 diff)
• PGM.cpp (modified) (1 diff)
• PGMMap.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/VMMR3/HM.cpp

@@ -837 +837 @@
 static void hmR3DisableRawMode(PVM pVM)
 {
-    /* Disable mapping of the hypervisor into the shadow page table. */
-    PGMR3MappingsDisable(pVM);
-
     /* Reinit the paging mode to force the new shadow mode. */
     for (VMCPUID i = 0; i < pVM->cCpus; i++)

trunk/src/VBox/VMM/VMMR3/PGM.cpp

@@ -1226 +1226 @@
      * Init the structure.
      */
-#ifdef PGM_WITHOUT_MAPPINGS
-    pVM->pgm.s.fMappingsDisabled = true;
-#endif
     pVM->pgm.s.offVM       = RT_OFFSETOF(VM, pgm.s);
     pVM->pgm.s.offVCpuPGM  = RT_OFFSETOF(VMCPU, pgm.s);

trunk/src/VBox/VMM/VMMR3/PGMMap.cpp

@@ -514 +514 @@
 VMMR3DECL(int) PGMR3MappingsFix(PVM pVM, RTGCPTR GCPtrBase, uint32_t cb)
 {
-    Log(("PGMR3MappingsFix: GCPtrBase=%RGv cb=%#x (fMappingsFixed=%RTbool fMappingsDisabled=%RTbool)\n",
-         GCPtrBase, cb, pVM->pgm.s.fMappingsFixed, pVM->pgm.s.fMappingsDisabled));
+    Log(("PGMR3MappingsFix: GCPtrBase=%RGv cb=%#x (fMappingsFixed=%RTbool MappingEnabled=%RTbool)\n",
+         GCPtrBase, cb, pVM->pgm.s.fMappingsFixed, pgmMapAreMappingsEnabled(pVM)));
 
 #ifndef PGM_WITHOUT_MAPPINGS
@@ -684 +684 @@
 
 
-
-/**
- * Interface for disabling the guest mappings when switching to HM mode
- * during VM creation and VM reset.
- *
- * (This doesn't touch the intermediate table!)
- *
- * @returns VBox status code.
- * @param   pVM         Pointer to the VM.
- */
-VMMR3DECL(int) PGMR3MappingsDisable(PVM pVM)
-{
-    AssertReturn(!pVM->pgm.s.fMappingsFixed,            VERR_PGM_MAPPINGS_FIXED);
-    AssertReturn(!pVM->pgm.s.fMappingsFixedRestored,    VERR_PGM_MAPPINGS_FIXED);
-    if (pVM->pgm.s.fMappingsDisabled)
-        return VINF_SUCCESS;
-
-#ifdef VBOX_WITH_RAW_MODE
-    /*
-     * Deactivate (only applies to Virtual CPU #0).
-     */
-    if (pVM->aCpus[0].pgm.s.pShwPageCR3R3)
-    {
-        pgmLock(pVM);                           /* to avoid assertions */
-        int rc = pgmMapDeactivateCR3(pVM, pVM->aCpus[0].pgm.s.pShwPageCR3R3);
-        pgmUnlock(pVM);
-        AssertRCReturn(rc, rc);
-    }
-#endif /* VBOX_WITH_RAW_MODE */
-
-    /*
-     * Mark the mappings as disabled and trigger a CR3 re-sync.
-     */
-    pVM->pgm.s.fMappingsDisabled = true;
-    for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
-    {
-        pVM->aCpus[idCpu].pgm.s.fSyncFlags &= ~PGM_SYNC_MONITOR_CR3;
-        VMCPU_FF_SET(&pVM->aCpus[idCpu], VMCPU_FF_PGM_SYNC_CR3);
-    }
-    return VINF_SUCCESS;
-}
-
-
 /**
  * Unfixes the mappings.
@@ -739 +696 @@
 VMMR3DECL(int) PGMR3MappingsUnfix(PVM pVM)
 {
-    Log(("PGMR3MappingsUnfix: fMappingsFixed=%RTbool fMappingsDisabled=%RTbool\n", pVM->pgm.s.fMappingsFixed, pVM->pgm.s.fMappingsDisabled));
+    Log(("PGMR3MappingsUnfix: fMappingsFixed=%RTbool MappingsEnabled=%RTbool\n", pVM->pgm.s.fMappingsFixed, pgmMapAreMappingsEnabled(pVM)));
     if (   pgmMapAreMappingsEnabled(pVM)
         && (    pVM->pgm.s.fMappingsFixed
@@ -1057 +1014 @@
         Pde.u = PGM_PDFLAGS_MAPPING | X86_PDE_P | X86_PDE_A | X86_PDE_RW | X86_PDE_US | (uint32_t)pMap->aPTs[i].HCPhysPT;
         pPGM->pInterPD->a[iNewPDE]        = Pde;
+
         /*
          * PAE.
@@ -1458 +1416 @@
 {
     NOREF(pszArgs);
-    if (pVM->pgm.s.fMappingsDisabled)
+    if (!pgmMapAreMappingsEnabled(pVM))
         pHlp->pfnPrintf(pHlp, "\nThe mappings are DISABLED.\n");
     else if (pVM->pgm.s.fMappingsFixed)