Changeset 76204 in vbox for trunk/src/VBox

Timestamp:

Dec 13, 2018 11:08:24 AM (6 years ago)

Author:

vboxsync

Message:

DevVGA: Fixed vgaMMIORead to correctly return VINF_IOM_R3_MMIO_READ (better fix)

File:

• trunk/src/VBox/Devices/Graphics/DevVGA.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -1246 +1246 @@
 #endif
 
+#ifdef VMSVGA_WITH_VGA_FB_BACKUP_AND_IN_RZ
+    /* VMSVGA keeps the VGA and SVGA framebuffers separate unlike this boch-based
+       VGA implementation, so we fake it by going to ring-3 and using a heap buffer.  */
+    if (!pThis->svga.fEnabled)
+    { /*likely*/ }
+    else
+    {
+        *prc = VINF_IOM_R3_MMIO_READ;
+        return 0;
+    }
+#endif
+
     addr &= 0x1ffff;
     switch(memory_map_mode) {
@@ -3430 +3442 @@
     Assert(PDMCritSectIsOwner(pDevIns->CTX_SUFF(pCritSectRo)));
     NOREF(pvUser);
-
-#ifdef VMSVGA_WITH_VGA_FB_BACKUP_AND_IN_RZ
-    /* VMSVGA keeps the VGA and SVGA framebuffers separate unlike this boch-based
-       VGA implementation, so we fake it by going to ring-3 and using a heap buffer.  */
-    if (!pThis->svga.fEnabled) { /*likely*/ }
-    else                       return VINF_IOM_R3_MMIO_READ;
-#endif
 
     int rc = VINF_SUCCESS;