Changeset 16408 in vbox for trunk/src/VBox/VMM/PGMMap.cpp

Timestamp:

Jan 30, 2009 12:14:26 PM (16 years ago)

Author:

vboxsync

Message:

Fixed disabling of hypervisor mappings in VT-x/AMD-V mode.

File:

• trunk/src/VBox/VMM/PGMMap.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/PGMMap.cpp

@@ -640 +640 @@
 }
 
+/**
+ * Disable the hypervisor mappings in the shadow page tables (doesn't touch the intermediate table!)
+ *
+ * @returns VBox status code.
+ * @param   pVM         The VM.
+ */
+VMMR3DECL(int) PGMR3MappingsDisable(PVM pVM)
+{
+    uint32_t cb;
+    int rc = PGMR3MappingsSize(pVM, &cb);
+    AssertRCReturn(rc, rc);
+
+    rc = PGMMapDeactivateAll(pVM);
+    AssertRCReturn(rc, rc);
+
+    /*
+     * Mark the mappings as fixed (using fake values) and disabled. 
+     */
+    pVM->pgm.s.fDisableMappings  = true;
+    pVM->pgm.s.fMappingsFixed    = true;
+    pVM->pgm.s.GCPtrMappingFixed = MM_HYPER_AREA_ADDRESS;
+    pVM->pgm.s.cbMappingFixed    = cb;
+    pVM->pgm.s.fSyncFlags       &= ~PGM_SYNC_MONITOR_CR3;
+    VM_FF_SET(pVM, VM_FF_PGM_SYNC_CR3);
+    return VINF_SUCCESS;
+}
+
 
 /**
@@ -968 +995 @@
          */
 #ifndef VBOX_WITH_PGMPOOL_PAGING_ONLY
+        Assert(!pPGM->pShw32BitPdR3->a[iNewPDE].n.u1Present || pgmMapAreMappingsEnabled(&pVM->pgm.s));
         if (    pgmMapAreMappingsEnabled(&pVM->pgm.s)
             &&  pPGM->pShw32BitPdR3->a[iNewPDE].n.u1Present)
@@ -989 +1017 @@
         unsigned iPDE = iNewPDE * 2 % 512;
 #ifndef VBOX_WITH_PGMPOOL_PAGING_ONLY
+        Assert(!pPGM->apShwPaePDsR3[iPD]->a[iPDE].n.u1Present || pgmMapAreMappingsEnabled(&pVM->pgm.s));
         if (   pgmMapAreMappingsEnabled(&pVM->pgm.s)
             && pPGM->apShwPaePDsR3[iPD]->a[iPDE].n.u1Present)
@@ -1006 +1035 @@
         AssertFatal(iPDE < 512);
 #ifndef VBOX_WITH_PGMPOOL_PAGING_ONLY
+        Assert(!pPGM->apShwPaePDsR3[iPD]->a[iPDE].n.u1Present || pgmMapAreMappingsEnabled(&pVM->pgm.s));
         if (   pgmMapAreMappingsEnabled(&pVM->pgm.s)
             && pPGM->apShwPaePDsR3[iPD]->a[iPDE].n.u1Present)