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

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/include

Files:

• PGMInline.h (modified) (2 diffs)
• PGMInternal.h (modified) (2 diffs)

trunk/src/VBox/VMM/include/PGMInline.h

@@ -1485 +1485 @@
 #ifdef PGM_WITHOUT_MAPPINGS
     /* There are no mappings in VT-x and AMD-V mode. */
-    Assert(pVM->pgm.s.fMappingsDisabled);
+    Assert(HMIsEnabled(pVM));
     return false;
 #else
-    return !pVM->pgm.s.fMappingsDisabled;
+    Assert(pVM->cCpus == 1);
+    return !HMIsEnabled(pVM);
 #endif
 }
@@ -1503 +1504 @@
 #ifdef PGM_WITHOUT_MAPPINGS
     /* There are no mappings in VT-x and AMD-V mode. */
-    Assert(pVM->pgm.s.fMappingsDisabled);
+    Assert(HMIsEnabled(pVM));
     return false;
 #else
-    return !pVM->pgm.s.fMappingsDisabled
-        && !pVM->pgm.s.fMappingsFixed;
+    return !pVM->pgm.s.fMappingsFixed
+        && pgmMapAreMappingsEnabled(pVM);
 #endif
 }

trunk/src/VBox/VMM/include/PGMInternal.h

@@ -3028 +3028 @@
     bool                            fPciPassthrough;
     /** Alignment padding that makes the next member start on a 8 byte boundary. */
-    bool                            afAlignment1[2];
+    bool                            afAlignment1[3];
 
     /** Indicates that PGMR3FinalizeMappings has been called and that further
@@ -3038 +3038 @@
      *  location because of room or address incompatibilities. */
     bool                            fMappingsFixedRestored;
-    /** If set, then no mappings are put into the shadow page table.
-     * Use pgmMapAreMappingsEnabled() instead of direct access. */
-    bool                            fMappingsDisabled;
     /** Size of fixed mapping.
      * This is valid if either fMappingsFixed or fMappingsFixedRestored is set. */