vbox的更動 93944 路徑 trunk/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp

時間撮記:

2022-2-24 下午09:15:14 (3 年 以前)

作者:

vboxsync

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

150173

訊息:

Devices: Must not use PAGE_SIZE, PAGE_SHIFT, PAGE_OFFSET_MASK, PAGE_ADDRESS or PHYS_PAGE_ADDRESS here either. bugref:9898

檔案:

• trunk/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp (修改) (9 筆差異)

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

@@ -681 +681 @@
     if (pPtr->cPages == 1)
         return true;
-    RTGCPHYS64 Phys = pPtr->paPages[0] + PAGE_SIZE;
+    RTGCPHYS64 Phys = pPtr->paPages[0] + GUEST_PAGE_SIZE;
     if (Phys != pPtr->paPages[1])
         return false;
@@ -689 +689 @@
         do
         {
-            Phys += PAGE_SIZE;
+            Phys += GUEST_PAGE_SIZE;
             if (Phys != pPtr->paPages[iPage])
                 return false;
@@ -724 +724 @@
     for (uint32_t iPage = 0; iPage < pPtr->cPages && cbRemaining > 0; ++iPage)
     {
-        uint32_t cbToRead = PAGE_SIZE - offPage;
+        uint32_t cbToRead = GUEST_PAGE_SIZE - offPage;
         if (cbToRead > cbRemaining)
             cbToRead = cbRemaining;
@@ -763 +763 @@
     for (iPage = 0; iPage < pPtr->cPages && cbRemaining > 0; ++iPage)
     {
-        uint32_t cbToWrite = PAGE_SIZE - offPage;
+        uint32_t cbToWrite = GUEST_PAGE_SIZE - offPage;
         if (cbToWrite > cbRemaining)
             cbToWrite = cbRemaining;
@@ -1088 +1088 @@
                 ASSERT_GUEST_RETURN(cbData <= VMMDEV_MAX_HGCM_DATA_SIZE, VERR_INVALID_PARAMETER);
 
-                const uint32_t offFirstPage = cbData > 0 ? GCPtr & PAGE_OFFSET_MASK : 0;
-                const uint32_t cPages       = cbData > 0 ? (offFirstPage + cbData + PAGE_SIZE - 1) / PAGE_SIZE : 0;
+                const uint32_t offFirstPage = cbData > 0 ? GCPtr & GUEST_PAGE_OFFSET_MASK : 0;
+                const uint32_t cPages       = cbData > 0 ? (offFirstPage + cbData + GUEST_PAGE_SIZE - 1) / GUEST_PAGE_SIZE : 0;
 
                 pGuestParm->u.ptr.cbData        = cbData;
@@ -1124 +1124 @@
 
                         pGuestParm->u.ptr.paPages[iPage] = GCPhys;
-                        GCPtr += PAGE_SIZE;
+                        GCPtr += GUEST_PAGE_SIZE;
                     }
                 }
@@ -1169 +1169 @@
                                         ("%#x\n", pPageListInfo->flags), VERR_INVALID_FLAGS);
                 /* First page offset. */
-                ASSERT_GUEST_MSG_RETURN(pPageListInfo->offFirstPage < PAGE_SIZE,
+                ASSERT_GUEST_MSG_RETURN(pPageListInfo->offFirstPage < GUEST_PAGE_SIZE,
                                         ("%#x\n", pPageListInfo->offFirstPage), VERR_INVALID_PARAMETER);
 
@@ -1177 +1177 @@
                 ASSERT_GUEST_MSG_RETURN(      pPageListInfo->cPages
                                            == (pGuestParm->enmType == VMMDevHGCMParmType_ContiguousPageList ? 1
-                                               : RT_ALIGN_32(pPageListInfo->offFirstPage + cbData, PAGE_SIZE) >> PAGE_SHIFT)
+                                               :    RT_ALIGN_32(pPageListInfo->offFirstPage + cbData, GUEST_PAGE_SIZE)
+                                                 >> GUEST_PAGE_SHIFT)
                                         || pGuestParm->enmType == VMMDevHGCMParmType_PageList,
                                         ("offFirstPage=%#x cbData=%#x cPages=%#x enmType=%d\n",
@@ -1192 +1193 @@
                 {
                     /* Validate page offsets */
-                    ASSERT_GUEST_MSG_RETURN(   !(pPageListInfo->aPages[0] & PAGE_OFFSET_MASK)
-                                            || (pPageListInfo->aPages[0] & PAGE_OFFSET_MASK) == pPageListInfo->offFirstPage,
+                    ASSERT_GUEST_MSG_RETURN(   !(pPageListInfo->aPages[0] & GUEST_PAGE_OFFSET_MASK)
+                                            || (pPageListInfo->aPages[0] & GUEST_PAGE_OFFSET_MASK) == pPageListInfo->offFirstPage,
                                             ("%#RX64 offFirstPage=%#x\n", pPageListInfo->aPages[0], pPageListInfo->offFirstPage),
                                             VERR_INVALID_POINTER);
                     uint32_t const cPages = pPageListInfo->cPages;
                     for (uint32_t iPage = 1; iPage < cPages; iPage++)
-                        ASSERT_GUEST_MSG_RETURN(!(pPageListInfo->aPages[iPage] & PAGE_OFFSET_MASK),
+                        ASSERT_GUEST_MSG_RETURN(!(pPageListInfo->aPages[iPage] & GUEST_PAGE_OFFSET_MASK),
                                                 ("[%#zx]=%#RX64\n", iPage, pPageListInfo->aPages[iPage]), VERR_INVALID_POINTER);
                     RT_UNTRUSTED_VALIDATED_FENCE();