Changeset 56411 in vbox

Timestamp:

Jun 14, 2015 3:41:43 AM (10 years ago)

Author:

vboxsync

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

101013

Message:

Move internal/pgm.h bits to VBox/vmm/pgm.h.

Location:

trunk

Files:

• include/VBox/vmm/pgm.h (modified) (3 diffs)
• src/VBox/VMM/include/internal/pgm.h (modified) (1 diff)

trunk/include/VBox/vmm/pgm.h

@@ -368 +368 @@
 
 
-
 VMMDECL(bool)           PGMIsLockOwner(PVM pVM);
 
@@ -466 +465 @@
 VMM_INT_DECL(bool)     PGMHandlerVirtualIsRegistered(PVM pVM, RTGCPTR GCPtr);
 #endif
+
+
+/**
+ * Page type.
+ *
+ * @remarks This enum has to fit in a 3-bit field (see PGMPAGE::u3Type).
+ * @remarks This is used in the saved state, so changes to it requires bumping
+ *          the saved state version.
+ * @todo    So, convert to \#defines!
+ */
+typedef enum PGMPAGETYPE
+{
+    /** The usual invalid zero entry. */
+    PGMPAGETYPE_INVALID = 0,
+    /** RAM page. (RWX) */
+    PGMPAGETYPE_RAM,
+    /** MMIO2 page. (RWX) */
+    PGMPAGETYPE_MMIO2,
+    /** MMIO2 page aliased over an MMIO page. (RWX)
+     * See PGMHandlerPhysicalPageAlias(). */
+    PGMPAGETYPE_MMIO2_ALIAS_MMIO,
+    /** Special page aliased over an MMIO page. (RWX)
+     * See PGMHandlerPhysicalPageAliasHC(), but this is generally only used for
+     * VT-x's APIC access page at the moment.  Treated as MMIO by everyone except
+     * the shadow paging code. */
+    PGMPAGETYPE_SPECIAL_ALIAS_MMIO,
+    /** Shadowed ROM. (RWX) */
+    PGMPAGETYPE_ROM_SHADOW,
+    /** ROM page. (R-X) */
+    PGMPAGETYPE_ROM,
+    /** MMIO page. (---) */
+    PGMPAGETYPE_MMIO,
+    /** End of valid entries. */
+    PGMPAGETYPE_END
+} PGMPAGETYPE;
+AssertCompile(PGMPAGETYPE_END == 8);
+
+VMM_INT_DECL(PGMPAGETYPE) PGMPhysGetPageType(PVM pVM, RTGCPHYS GCPhys);
+
+VMM_INT_DECL(int)   PGMPhysGCPhys2HCPhys(PVM pVM, RTGCPHYS GCPhys, PRTHCPHYS pHCPhys);
+VMM_INT_DECL(int)   PGMPhysGCPtr2HCPhys(PVMCPU pVCpu, RTGCPTR GCPtr, PRTHCPHYS pHCPhys);
+VMM_INT_DECL(int)   PGMPhysGCPhys2CCPtr(PVM pVM, RTGCPHYS GCPhys, void **ppv, PPGMPAGEMAPLOCK pLock);
+VMM_INT_DECL(int)   PGMPhysGCPhys2CCPtrReadOnly(PVM pVM, RTGCPHYS GCPhys, void const **ppv, PPGMPAGEMAPLOCK pLock);
+VMM_INT_DECL(int)   PGMPhysGCPtr2CCPtr(PVMCPU pVCpu, RTGCPTR GCPtr, void **ppv, PPGMPAGEMAPLOCK pLock);
+VMM_INT_DECL(int)   PGMPhysGCPtr2CCPtrReadOnly(PVMCPU pVCpu, RTGCPTR GCPtr, void const **ppv, PPGMPAGEMAPLOCK pLock);
 
 VMMDECL(bool)       PGMPhysIsA20Enabled(PVMCPU pVCpu);
@@ -634 +678 @@
 VMMR3DECL(void)     PGMR3ResetCpu(PVM pVM, PVMCPU pVCpu);
 VMMR3_INT_DECL(void)    PGMR3Reset(PVM pVM);
+VMMR3_INT_DECL(void)    PGMR3ResetNoMorePhysWritesFlag(PVM pVM);
 VMMR3_INT_DECL(void)    PGMR3MemSetup(PVM pVM, bool fReset);
 VMMR3DECL(int)      PGMR3Term(PVM pVM);

trunk/src/VBox/VMM/include/internal/pgm.h

@@ -21 +21 @@
 #include <VBox/vmm/pgm.h>
 
-/** @defgroup grp_pgm_int   Internals
- * @ingroup grp_pgm
- * @internal
- * @{
- */
-
-/**
- * Page type.
- *
- * @remarks This enum has to fit in a 3-bit field (see PGMPAGE::u3Type).
- * @remarks This is used in the saved state, so changes to it requires bumping
- *          the saved state version.
- * @todo    So, convert to \#defines!
- */
-typedef enum PGMPAGETYPE
-{
-    /** The usual invalid zero entry. */
-    PGMPAGETYPE_INVALID = 0,
-    /** RAM page. (RWX) */
-    PGMPAGETYPE_RAM,
-    /** MMIO2 page. (RWX) */
-    PGMPAGETYPE_MMIO2,
-    /** MMIO2 page aliased over an MMIO page. (RWX)
-     * See PGMHandlerPhysicalPageAlias(). */
-    PGMPAGETYPE_MMIO2_ALIAS_MMIO,
-    /** Special page aliased over an MMIO page. (RWX)
-     * See PGMHandlerPhysicalPageAliasHC(), but this is generally only used for
-     * VT-x's APIC access page at the moment.  Treated as MMIO by everyone except
-     * the shadow paging code. */
-    PGMPAGETYPE_SPECIAL_ALIAS_MMIO,
-    /** Shadowed ROM. (RWX) */
-    PGMPAGETYPE_ROM_SHADOW,
-    /** ROM page. (R-X) */
-    PGMPAGETYPE_ROM,
-    /** MMIO page. (---) */
-    PGMPAGETYPE_MMIO,
-    /** End of valid entries. */
-    PGMPAGETYPE_END
-} PGMPAGETYPE;
-AssertCompile(PGMPAGETYPE_END == 8);
-
-VMMDECL(PGMPAGETYPE) PGMPhysGetPageType(PVM pVM, RTGCPHYS GCPhys);
-
-VMMDECL(int)        PGMPhysGCPhys2HCPhys(PVM pVM, RTGCPHYS GCPhys, PRTHCPHYS pHCPhys);
-VMMDECL(int)        PGMPhysGCPtr2HCPhys(PVMCPU pVCpu, RTGCPTR GCPtr, PRTHCPHYS pHCPhys);
-VMMDECL(int)        PGMPhysGCPhys2CCPtr(PVM pVM, RTGCPHYS GCPhys, void **ppv, PPGMPAGEMAPLOCK pLock);
-VMMDECL(int)        PGMPhysGCPhys2CCPtrReadOnly(PVM pVM, RTGCPHYS GCPhys, void const **ppv, PPGMPAGEMAPLOCK pLock);
-VMMDECL(int)        PGMPhysGCPtr2CCPtr(PVMCPU pVCpu, RTGCPTR GCPtr, void **ppv, PPGMPAGEMAPLOCK pLock);
-VMMDECL(int)        PGMPhysGCPtr2CCPtrReadOnly(PVMCPU pVCpu, RTGCPTR GCPtr, void const **ppv, PPGMPAGEMAPLOCK pLock);
-VMMR3DECL(void)     PGMR3ResetNoMorePhysWritesFlag(PVM pVM);
-
-/** @} */
 #endif