Changeset 85863 in vbox for trunk/src/VBox/Devices/Graphics

Timestamp:

Aug 21, 2020 11:38:40 AM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

140032

Message:

Devices/Graphics/DevVGA: Compilation fixes if VBOX_WITH_VMSVGA is not defined.

File:

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

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

@@ -5532 +5532 @@
     RT_NOREF(pPciDev, cb);
 
+# ifdef VBOX_WITH_VMSVGA
     AssertReturn(   iRegion == pThis->pciRegions.iVRAM
-                 && (   enmType == PCI_ADDRESS_SPACE_MEM_PREFETCH
-                     || (enmType == PCI_ADDRESS_SPACE_MEM && pThis->fVMSVGAEnabled && pThis->fStateLoaded))
-                 , VERR_INTERNAL_ERROR);
+                 && (    enmType == PCI_ADDRESS_SPACE_MEM_PREFETCH
+                     || (enmType == PCI_ADDRESS_SPACE_MEM && pThis->fVMSVGAEnabled && pThis->fStateLoaded)), VERR_INTERNAL_ERROR);
+# else
+    AssertReturn(   iRegion == pThis->pciRegions.iVRAM
+                 && enmType == PCI_ADDRESS_SPACE_MEM_PREFETCH, VERR_INTERNAL_ERROR);
+# endif
+
     Assert(pPciDev == pDevIns->apPciDevs[0]);
 
@@ -7319 +7324 @@
      * We currently only access SVGA_FIFO_MIN, SVGA_FIFO_PITCHLOCK, and SVGA_FIFO_BUSY.
      */
+# if defined(VBOX_WITH_VMSVGA) && !defined(IN_RC)
     AssertCompile((RT_MAX(SVGA_FIFO_MIN, RT_MAX(SVGA_FIFO_PITCHLOCK, SVGA_FIFO_BUSY)) + 1) * sizeof(uint32_t) < PAGE_SIZE);
-# if defined(VBOX_WITH_VMSVGA) && !defined(IN_RC)
     if (pThis->fVMSVGAEnabled)
     {