Changeset 64482 in vbox for trunk/src

Timestamp:

Oct 29, 2016 10:15:44 AM (8 years ago)

Author:

vboxsync

Message:

DevVGA: DevVGA_SVGA build fixes for disabled debug code

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA.cpp (modified) (14 diffs)
• DevVGA.h (modified) (1 diff)

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

@@ -54 +54 @@
 /* should go BEFORE any other DevVGA include to make all DevVGA.h config defines be visible */
 #include "DevVGA.h"
-
-#ifdef DEBUG
-/* Enable to log FIFO register accesses. */
-//# define DEBUG_FIFO_ACCESS
-/* Enable to log GMR page accesses. */
-//# define DEBUG_GMR_ACCESS
-#endif
 
 #include "DevVGA-SVGA.h"
@@ -1589 +1582 @@
 static int vmsvgaFIFOAccess(PVM pVM, PVGASTATE pThis, RTGCPHYS GCPhys, bool fWriteAccess)
 {
+    RT_NOREF(pVM);
     RTGCPHYS GCPhysOffset = GCPhys - pThis->svga.GCPhysFIFO;
     uint32_t *pFIFO = pThis->svga.pFIFOR3;
@@ -1933 +1927 @@
  */
 static DECLCALLBACK(VBOXSTRICTRC)
-vmsvgaR3FIFOAccessHandler(PVM pVM, PVMCPU pVCpu RTGCPHYS GCPhys, void *pvPhys, void *pvBuf, size_t cbBuf,
+vmsvgaR3FIFOAccessHandler(PVM pVM, PVMCPU pVCpu, RTGCPHYS GCPhys, void *pvPhys, void *pvBuf, size_t cbBuf,
                           PGMACCESSTYPE enmAccessType, PGMACCESSORIGIN enmOrigin, void *pvUser)
 {
@@ -1939 +1933 @@
     int         rc;
     Assert(pThis);
-    Assert(GCPhys >= pThis->GCPhysVRAM);
+    Assert(GCPhys >= pThis->svga.GCPhysFIFO);
     NOREF(pVCpu); NOREF(pvPhys); NOREF(pvBuf); NOREF(cbBuf); NOREF(enmOrigin);
 
@@ -1953 +1947 @@
 
 #ifdef DEBUG_GMR_ACCESS
+# ifdef IN_RING3
+
 /**
  * HC access handler for the FIFO.
@@ -1975 +1971 @@
     Assert(pThis);
     PVMSVGAR3STATE pSVGAState = pThis->svga.pSvgaR3State;
-    NOREF(pVCpu); NOREF(pvPhys); NOREF(pvBuf); NOREF(cbBuf); NOREF(enmOrigin);
+    NOREF(pVCpu); NOREF(pvPhys); NOREF(pvBuf); NOREF(cbBuf); NOREF(enmAccessType); NOREF(enmOrigin);
 
     Log(("vmsvgaR3GMRAccessHandler: GMR access to page %RGp\n", GCPhys));
@@ -1995 +1991 @@
                      */
                     int rc = PGMHandlerPhysicalPageTempOff(pVM, pGMR->paDesc[j].GCPhys, GCPhys);
+                    AssertRC(rc);
                     goto end;
                 }
@@ -2004 +2001 @@
 }
 
-# ifdef IN_RING3
-
-/* Callback handler for VMR3ReqCallWait */
+/* Callback handler for VMR3ReqCallWaitU */
 static DECLCALLBACK(int) vmsvgaRegisterGMR(PPDMDEVINS pDevIns, uint32_t gmrId)
 {
@@ -2024 +2019 @@
 }
 
-/* Callback handler for VMR3ReqCallWait */
+/* Callback handler for VMR3ReqCallWaitU */
 static DECLCALLBACK(int) vmsvgaDeregisterGMR(PPDMDEVINS pDevIns, uint32_t gmrId)
 {
@@ -2039 +2034 @@
 }
 
-/* Callback handler for VMR3ReqCallWait */
+/* Callback handler for VMR3ReqCallWaitU */
 static DECLCALLBACK(int) vmsvgaResetGMRHandlers(PVGASTATE pThis)
 {
@@ -2971 +2966 @@
 
 #  ifdef DEBUG_GMR_ACCESS
-                VMR3ReqCallWait(PDMDevHlpGetVM(pThis->pDevInsR3), VMCPUID_ANY, (PFNRT)vmsvgaRegisterGMR, 2, pThis->pDevInsR3, pCmd->gmrId);
+                VMR3ReqCallWaitU(PDMDevHlpGetUVM(pThis->pDevInsR3), VMCPUID_ANY, (PFNRT)vmsvgaRegisterGMR, 2, pThis->pDevInsR3, pCmd->gmrId);
 #  endif
                 break;
@@ -3134 +3129 @@
                                                    SVGA3D_TEX_FILTER_NONE, cMipLevels, (SVGA3dSize *)(pCmd + 1));
 #  ifdef DEBUG_GMR_ACCESS
-                        VMR3ReqCallWait(PDMDevHlpGetVM(pThis->pDevInsR3), VMCPUID_ANY, (PFNRT)vmsvgaResetGMRHandlers, 1, pThis);
+                        VMR3ReqCallWaitU(PDMDevHlpGetUVM(pThis->pDevInsR3), VMCPUID_ANY, (PFNRT)vmsvgaResetGMRHandlers, 1, pThis);
 #  endif
                         break;
@@ -3486 +3481 @@
                 || (pThis->svga.u32IrqMask & SVGA_IRQFLAG_FIFO_PROGRESS))
             {
-                PDMCritSectEnter(&pThis->CritSect, VERR_IGNORED);
+                int rc2 = PDMCritSectEnter(&pThis->CritSect, VERR_IGNORED);
+                AssertRC(rc2);
 
                 /* FIFO progress might trigger an interrupt. */
@@ -3538 +3534 @@
         PGMR pGMR = &pSVGAState->aGMR[idGMR];
 # ifdef DEBUG_GMR_ACCESS
-        VMR3ReqCallWait(PDMDevHlpGetVM(pThis->pDevInsR3), VMCPUID_ANY, (PFNRT)vmsvgaDeregisterGMR, 2, pThis->pDevInsR3, idGMR);
+        VMR3ReqCallWaitU(PDMDevHlpGetUVM(pThis->pDevInsR3), VMCPUID_ANY, (PFNRT)vmsvgaDeregisterGMR, 2, pThis->pDevInsR3, idGMR);
 # endif
 

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

@@ -213 +213 @@
 
 #ifdef VBOX_WITH_VMSVGA
+
+#ifdef DEBUG
+/* Enable to log FIFO register accesses. */
+//# define DEBUG_FIFO_ACCESS
+/* Enable to log GMR page accesses. */
+//# define DEBUG_GMR_ACCESS
+#endif
 
 #define VMSVGA_FIFO_EXTCMD_NONE                         0