vbox的更動 52318 路徑 trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp

時間撮記:

2014-8-8 上午09:44:09 (10 年 以前)

作者:

vboxsync

訊息:

VMM/PGM: Fix.

檔案:

• trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp (修改) (2 筆差異)

trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp

@@ -3315 +3315 @@
         /* copy */
         size_t cbRead = PAGE_SIZE - ((RTGCUINTPTR)GCPtrSrc & PAGE_OFFSET_MASK);
-        rc = PGMPhysRead(pVM, GCPhys, pvDst, cbRead);
-        if (cbRead >= cb || RT_FAILURE(rc))
-            return rc;
+        if (cbRead < cb)
+        {
+            rc = PGMPhysRead(pVM, GCPhys, pvDst, cbRead);
+            if (RT_FAILURE(rc))
+                return rc;
+        }
+        else    /* Last page (cbRead is PAGE_SIZE, we only need cb!) */
+            return PGMPhysRead(pVM, GCPhys, pvDst, cb);
 
         /* next */
+        Assert(cb > cbRead);
         cb         -= cbRead;
         pvDst       = (uint8_t *)pvDst + cbRead;
@@ -3405 +3411 @@
         /* copy */
         size_t cbWrite = PAGE_SIZE - ((RTGCUINTPTR)GCPtrDst & PAGE_OFFSET_MASK);
-        rc = PGMPhysWrite(pVM, GCPhys, pvSrc, cbWrite);
-        if (cbWrite >= cb || RT_FAILURE(rc))
-            return rc;
+        if (cbWrite < cb)
+        {
+            rc = PGMPhysWrite(pVM, GCPhys, pvSrc, cbWrite);
+            if (RT_FAILURE(rc))
+                return rc;
+        }
+        else    /* Last page (cbWrite is PAGE_SIZE, we only need cb!) */
+            rc = PGMPhysWrite(pVM, GCPhys, pvSrc, cb);
 
         /* next */
+        Assert(cb > cbWrite);
         cb         -= cbWrite;
         pvSrc       = (uint8_t *)pvSrc + cbWrite;