Changeset 64650 in vbox for trunk/src/VBox/Additions

Timestamp:

Nov 11, 2016 2:55:07 PM (8 years ago)

Author:

vboxsync

Message:

bugref:8614: Additions/common/VBoxVideo: make the code more self-contained: my last attempt at removing all assertions from debug versions of the Linux video driver was not correct: I missed some places, and forgot that LINUX_VERSION_CODE is only defined when Linux headers are included. Hopefully fix that.

Location:

trunk/src/VBox/Additions/common/VBoxVideo

Files:

• HGSMIBase.cpp (modified) (9 diffs)
• Modesetting.cpp (modified) (1 diff)
• VBVABase.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp

@@ -44 +44 @@
     HGSMIBUFFERHEADER *pHdr = HGSMIBufferHeaderFromData(pvMem);
     HGSMIOFFSET offMem = HGSMIPointerToOffset(&pCtx->areaCtx, pHdr);
-    Assert(offMem != HGSMIOFFSET_VOID);
+    VBVOAssert(offMem != HGSMIOFFSET_VOID);
     if(offMem != HGSMIOFFSET_VOID)
     {
@@ -57 +57 @@
 {
     int rc = HGSMIBufferProcess(&pCtx->areaCtx, &pCtx->channels, offBuffer);
-    Assert(!RT_FAILURE(rc));
+    VBVOAssert(!RT_FAILURE(rc));
     if(RT_FAILURE(rc))
     {
@@ -78 +78 @@
 {
     HGSMIOFFSET offset = hgsmiGetHostBuffer(pCtx);
-    AssertReturnVoid(offset != HGSMIOFFSET_VOID);
+    VBVOAssertReturnVoid(offset != HGSMIOFFSET_VOID);
     hgsmiHostCmdProcess(pCtx, offset);
 }
@@ -162 +162 @@
     HGSMIOFFSET offBuffer = HGSMIHeapBufferOffset (HGSMIGUESTCMDHEAP_GET(&pCtx->heapCtx), pvBuffer);
 
-    Assert(offBuffer != HGSMIOFFSET_VOID);
+    VBVOAssert(offBuffer != HGSMIOFFSET_VOID);
     if (offBuffer != HGSMIOFFSET_VOID)
     {
@@ -242 +242 @@
         if (RT_SUCCESS(rc))
         {
-            AssertRC(pCaps->rc);
+            VBVOAssertRC(pCaps->rc);
             rc = pCaps->rc;
         }
@@ -318 +318 @@
                                              uint32_t *poffHostFlags)
 {
-    AssertPtrNullReturnVoid(poffVRAMBaseMapping);
-    AssertPtrNullReturnVoid(pcbMapping);
-    AssertPtrNullReturnVoid(poffGuestHeapMemory);
-    AssertPtrNullReturnVoid(pcbGuestHeapMemory);
-    AssertPtrNullReturnVoid(poffHostFlags);
+    VBVOAssertPtrNullReturnVoid(poffVRAMBaseMapping);
+    VBVOAssertPtrNullReturnVoid(pcbMapping);
+    VBVOAssertPtrNullReturnVoid(poffGuestHeapMemory);
+    VBVOAssertPtrNullReturnVoid(pcbGuestHeapMemory);
+    VBVOAssertPtrNullReturnVoid(poffHostFlags);
     if (poffVRAMBaseMapping)
         *poffVRAMBaseMapping = cbVRAM - VBVA_ADAPTER_INFORMATION_SIZE;
@@ -386 +386 @@
     uint32_t offVRAMHostArea = offVRAMBaseMapping, cbHostArea = 0;
 
-    AssertPtrReturnVoid(poffVRAMHostArea);
-    AssertPtrReturnVoid(pcbHostArea);
+    VBVOAssertPtrReturnVoid(poffVRAMHostArea);
+    VBVOAssertPtrReturnVoid(pcbHostArea);
     VBoxQueryConfHGSMI(pCtx, VBOX_VBVA_CONF32_HOST_HEAP_SIZE, &cbHostArea);
     if (cbHostArea != 0)
@@ -464 +464 @@
      * host heap is ready */
     int rc = vboxHGSMIReportFlagsLocation(pCtx, offVRAMFlagsLocation);
-    AssertRC(rc);
+    VBVOAssertRC(rc);
     if (RT_SUCCESS(rc) && fCaps)
     {
         /* Inform about caps */
         rc = vboxHGSMISendCapsInfo(pCtx, fCaps);
-        AssertRC(rc);
+        VBVOAssertRC(rc);
     }
     if (RT_SUCCESS (rc))
@@ -475 +475 @@
         /* Report the host heap location. */
         rc = vboxHGSMIReportHostArea(pCtx, offVRAMHostArea, cbHostArea);
-        AssertRC(rc);
+        VBVOAssertRC(rc);
     }
     // Log(("VBoxVideo::vboxSetupAdapterInfo finished rc = %d\n", rc));

trunk/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp

@@ -23 +23 @@
 #ifndef VBOX_GUESTR3XF86MOD
 # include <iprt/string.h>
-#endif
-
-#ifndef LINUX_VERSION_CODE
-# define VBVOAssertPtr AssertPtr
-#else
-# define VBVOAssertPtr(a) do {} while(0)
 #endif
 

trunk/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp

@@ -21 +21 @@
 #include <VBox/err.h>
 // #include <VBox/log.h>
-#ifndef LINUX_VERSION_CODE
-# include <iprt/assert.h>
-# define VBVOAssert Assert
-#else
-# define VBVOAssert(a) do {} while(0)
-#endif
 #include <iprt/string.h>