Changeset 30061 in vbox

Timestamp:

Jun 7, 2010 9:34:15 AM (15 years ago)

Author:

vboxsync

Message:

Page fusion test api change

Location:

trunk

Files:

• include/VBox/VBoxGuestLib.h (modified) (1 diff)
• include/VBox/VMMDev.h (modified) (1 diff)
• include/VBox/pgm.h (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibModule.cpp (modified) (2 diffs)
• src/VBox/Devices/VMMDev/VMMDev.cpp (modified) (1 diff)
• src/VBox/VMM/PGMSharedPage.cpp (modified) (3 diffs)

trunk/include/VBox/VBoxGuestLib.h

@@ -560 +560 @@
 VBGLR3DECL(int)     VbglR3CheckSharedModules(void);
 VBGLR3DECL(bool)    VbglR3PageSharingIsEnabled(void);
-VBGLR3DECL(int)     VbglR3PageIsShared(RTGCPTR pPage, bool *pfShared, bool *pfReadWrite);
+VBGLR3DECL(int)     VbglR3PageIsShared(RTGCPTR pPage, bool *pfShared, uint64_t *puPageFlags);
 /** @} */
 

trunk/include/VBox/VMMDev.h

@@ -1197 +1197 @@
     /** Page address. */
     RTGCPTR                     GCPtrPage;
+    /** Page flags. */
+    uint64_t                    uPageFlags;
     /** Shared flag (out) */
     bool                        fShared;
-    /** Read/write flag (out) */
-    bool                        fReadWrite;
     /** Alignment */
-    bool                        fAlignment[2];
+    bool                        fAlignment[3];
 } VMMDevPageIsSharedRequest;
 

trunk/include/VBox/pgm.h

@@ -570 +570 @@
 VMMR3DECL(int)     PGMR3SharedModuleUnregister(PVM pVM, char *pszModuleName, char *pszVersion, RTGCPTR GCBaseAddr, uint32_t cbModule);
 VMMR3DECL(int)     PGMR3SharedModuleCheckAll(PVM pVM);
-VMMR3DECL(int)     PGMR3SharedModuleGetPageState(PVM pVM, RTGCPTR GCPtrPage, bool *pfShared, bool *pfReadWrite);
+VMMR3DECL(int)     PGMR3SharedModuleGetPageState(PVM pVM, RTGCPTR GCPtrPage, bool *pfShared, uint64_t *puPageFlags);
 /** @} */
 

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibModule.cpp

@@ -149 +149 @@
  * @returns true/false enabled/disabled
  */
-VBGLR3DECL(int) VbglR3PageIsShared(RTGCPTR pPage, bool *pfShared, bool *pfReadWrite)
+VBGLR3DECL(int) VbglR3PageIsShared(RTGCPTR pPage, bool *pfShared, uint64_t *puPageFlags)
 {
 #ifdef DEBUG
@@ -160 +160 @@
     {
         *pfShared    = Req.fShared;
-        *pfReadWrite = Req.fReadWrite;
+        *puPageFlags = Req.uPageFlags;
     }
     return rc;

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -1847 +1847 @@
 
             if (pRequestHeader->size != sizeof(VMMDevPageIsSharedRequest))
-                pRequestHeader->rc = VERR_INVALID_PARAMETER;
-            else
-                pRequestHeader->rc = PGMR3SharedModuleGetPageState(PDMDevHlpGetVM(pDevIns), pReq->GCPtrPage, &pReq->fShared, &pReq->fReadWrite);
+            {
+                pRequestHeader->rc = VERR_INVALID_PARAMETER;
+            }
+            else
+            {
+                pRequestHeader->rc = PGMR3SharedModuleGetPageState(PDMDevHlpGetVM(pDevIns), pReq->GCPtrPage, &pReq->fShared, &pReq->uPageFlags);
+            }
 # else
             pRequestHeader->rc = VERR_NOT_IMPLEMENTED;

trunk/src/VBox/VMM/PGMSharedPage.cpp

@@ -184 +184 @@
  * @param   GCPtrPage           Page address
  * @param   pfShared            Shared status (out)
- * @param   pfReadWrite         Read/write status (out)
- */
-VMMR3DECL(int) PGMR3SharedModuleGetPageState(PVM pVM, RTGCPTR GCPtrPage, bool *pfShared, bool *pfReadWrite)
+ * @param   puPageFlags         Page flags (out)
+ */
+VMMR3DECL(int) PGMR3SharedModuleGetPageState(PVM pVM, RTGCPTR GCPtrPage, bool *pfShared, uint64_t *puPageFlags)
 {
 #if defined(VBOX_WITH_PAGE_SHARING) && defined(DEBUG)
@@ -196 +196 @@
 
     int rc = PGMGstGetPage(VMMGetCpu(pVM), GCPtrPage, &fFlags, &GCPhys);
-    if (rc == VINF_SUCCESS)
+    switch (rc)
+    {
+    case VINF_SUCCESS:
     {
         PPGMPAGE pPage = pgmPhysGetPage(&pVM->pgm.s, GCPhys);
@@ -202 +204 @@
         {
             *pfShared    = PGM_PAGE_IS_SHARED(pPage);
-            *pfReadWrite = !!(fFlags & X86_PTE_RW);
+            *puPageFlags = fFlags;
         }
         else
             rc = VERR_PGM_INVALID_GC_PHYSICAL_ADDRESS;
+        break;
+    }
+    case VERR_PAGE_NOT_PRESENT:
+    case VERR_PAGE_TABLE_NOT_PRESENT:
+    case VERR_PAGE_MAP_LEVEL4_NOT_PRESENT:
+    case VERR_PAGE_DIRECTORY_PTR_NOT_PRESENT:
+        *pfShared = false;
+        *puPageFlags = 0;
+        rc = VINF_SUCCESS;
+        break;
+
+    default:
+        break;
     }