Changeset 24288 in vbox

Timestamp:

Nov 3, 2009 12:53:17 PM (15 years ago)

Author:

vboxsync

Message:

VGA: more critical section protection required

File:

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

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

@@ -4971 +4971 @@
     pInterface->pfnUpdateDisplayAll(pInterface);
 
+    int rc = PDMCritSectEnter(&pThis->lock, VERR_SEM_BUSY);
+    AssertRC(rc);
+
     /*
      * Validate the buffer size.
@@ -4978 +4981 @@
     {
         Log(("vgaPortSnapshot: %d bytes are required, a buffer of %d bytes is profiled.\n", cbRequired, cbData));
+        PDMCritSectLeave(&pThis->lock);
         return VERR_BUFFER_OVERFLOW;
     }
@@ -5006 +5010 @@
      * That is if display is blanked, we expect a black screen in the external buffer.
      */
-    int rc = vga_update_display(pThis, false);
+    rc = vga_update_display(pThis, false);
 
     /* restore */
@@ -5012 +5016 @@
     pThis->graphic_mode = graphic_mode;
     pThis->fRenderVRAM = fRenderVRAM;
+    PDMCritSectLeave(&pThis->lock);
 
     if (rc != VINF_SUCCESS)
@@ -5047 +5052 @@
     PDMDEV_ASSERT_EMT(VGASTATE2DEVINS(pThis));
     LogFlow(("vgaPortDisplayBlt: pvData=%p x=%d y=%d cx=%d cy=%d\n", pvData, x, y, cx, cy));
+
+    rc = PDMCritSectEnter(&pThis->lock, VERR_SEM_BUSY);
+    AssertRC(rc);
 
     /*
@@ -5110 +5118 @@
         rc = VERR_INVALID_PARAMETER;
 
+    PDMCritSectLeave(&pThis->lock);
+
     LogFlow(("vgaPortDisplayBlt: returns %Rrc\n", rc));
     return rc;
@@ -5149 +5159 @@
     }
 
+    int rc = PDMCritSectEnter(&s->lock, VERR_SEM_BUSY);
+    AssertRC(rc);
+
     /* Correct negative x and y coordinates. */
     if (x < 0)
@@ -5196 +5209 @@
         LogFlow(("vgaPortUpdateDisplayRect: nothing to do: %dx%d\n", w, h));
 #endif /* DEBUG_sunlover */
+        PDMCritSectLeave(&s->lock);
         return;
     }
@@ -5259 +5273 @@
         pu8Src += cbLineSrc;
     }
+    PDMCritSectLeave(&s->lock);
 
 #ifdef DEBUG_sunlover