Changeset 80174 in vbox for trunk/src

Timestamp:

Aug 7, 2019 9:41:39 AM (5 years ago)

Author:

vboxsync

Message:

VMM: Kicking out raw-mode - More virt handler leftovers. bugref:9517

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/PGMPhys.cpp (modified) (2 diffs)
• include/PGMInternal.h (modified) (1 diff)

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

@@ -1889 +1889 @@
          * Note! The sizes used here will influence the saved state.
          */
-        uint32_t cbChunk;
-        uint32_t cPagesPerChunk;
-        if (!VM_IS_RAW_MODE_ENABLED(pVM))
-        {
-            cbChunk = 16U*_1M;
-            cPagesPerChunk = 1048048; /* max ~1048059 */
-            AssertCompile(sizeof(PGMRAMRANGE) + sizeof(PGMPAGE) * 1048048 < 16U*_1M - PAGE_SIZE * 2);
-        }
-        else
-        {
-            cbChunk = 4U*_1M;
-            cPagesPerChunk = 261616; /* max ~261627 */
-            AssertCompile(sizeof(PGMRAMRANGE) + sizeof(PGMPAGE) * 261616  <  4U*_1M - PAGE_SIZE * 2);
-        }
+        uint32_t cbChunk = 16U*_1M;
+        uint32_t cPagesPerChunk = 1048048; /* max ~1048059 */
+        AssertCompile(sizeof(PGMRAMRANGE) + sizeof(PGMPAGE) * 1048048 < 16U*_1M - PAGE_SIZE * 2);
         AssertRelease(RT_UOFFSETOF_DYN(PGMRAMRANGE, aPages[cPagesPerChunk]) + PAGE_SIZE * 2 <= cbChunk);
 
@@ -2715 +2704 @@
      *       us with an absolute maximum of 16777215 pages per chunk (close to 64 GB).
      */
-    uint32_t cbChunk;
-    uint32_t cPagesPerChunk;
-    if (!VM_IS_RAW_MODE_ENABLED(pVM))
-    {
-        cbChunk = 16U*_1M;
-        cPagesPerChunk = 1048048; /* max ~1048059 */
-        AssertCompile(sizeof(PGMREGMMIORANGE) + sizeof(PGMPAGE) * 1048048 < 16U*_1M - PAGE_SIZE * 2);
-    }
-    else
-    {
-        cbChunk = 4U*_1M;
-        cPagesPerChunk = 261616; /* max ~261627 */
-        AssertCompile(sizeof(PGMREGMMIORANGE) + sizeof(PGMPAGE) * 261616  <  4U*_1M - PAGE_SIZE * 2);
-    }
+    uint32_t cbChunk = 16U*_1M;
+    uint32_t cPagesPerChunk = 1048048; /* max ~1048059 */
+    AssertCompile(sizeof(PGMREGMMIORANGE) + sizeof(PGMPAGE) * 1048048 < 16U*_1M - PAGE_SIZE * 2);
     AssertRelease(cPagesPerChunk <= PGM_MMIO2_MAX_PAGE_COUNT); /* See above note. */
     AssertRelease(RT_UOFFSETOF_DYN(PGMREGMMIORANGE, RamRange.aPages[cPagesPerChunk]) + PAGE_SIZE * 2 <= cbChunk);

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

@@ -1116 +1116 @@
 #define PGM_PAGE_HAS_ACTIVE_PHYSICAL_HANDLERS(a_pPage) \
     ( PGM_PAGE_GET_HNDL_PHYS_STATE(a_pPage) >= PGM_PAGE_HNDL_PHYS_STATE_WRITE )
-
-
-/** @name Virtual Access Handler State values (PGMPAGE::u2HandlerVirtStateY).
- *
- * @remarks The values are assigned in order of priority, so we can calculate
- *          the correct state for a page with different handlers installed.
- * @{ */
-/** No handler installed. */
-#define PGM_PAGE_HNDL_VIRT_STATE_NONE           0
-/* 1 is reserved so the lineup is identical with the physical ones. */
-/** Write access is monitored. */
-#define PGM_PAGE_HNDL_VIRT_STATE_WRITE          2
-/** All access is monitored. */
-#define PGM_PAGE_HNDL_VIRT_STATE_ALL            3
-/** @} */
-
-/**
- * Gets the virtual access handler state of a page.
- * @returns PGM_PAGE_HNDL_VIRT_STATE_* value.
- * @param   a_pPage     Pointer to the physical guest page tracking structure.
- */
-#define PGM_PAGE_GET_HNDL_VIRT_STATE(a_pPage)   ( (a_pPage)->s.u2HandlerVirtStateY )
-
-/**
- * Sets the virtual access handler state of a page.
- * @param   a_pPage     Pointer to the physical guest page tracking structure.
- * @param   a_uState    The new state value.
- */
-#define PGM_PAGE_SET_HNDL_VIRT_STATE(a_pPage, a_uState) \
-    do { (a_pPage)->s.u2HandlerVirtStateY = (a_uState); } while (0)
-
-/**
- * Same as PGM_PAGE_HAS_ANY_VIRTUAL_HANDLERS - can't disable pages in
- * virtual handlers.
- * @returns true/false
- * @param   a_pPage     Pointer to the physical guest page tracking structure.
- */
-#define PGM_PAGE_HAS_ACTIVE_VIRTUAL_HANDLERS(a_pPage) \
-    PGM_PAGE_HAS_ANY_VIRTUAL_HANDLERS(a_pPage)