Changeset 12395 in vbox

Timestamp:

Sep 11, 2008 7:43:35 AM (16 years ago)

Author:

vboxsync

Message:

Additions/x11: fix error checking in Xorg 1.5 graphics driver

File:

• trunk/src/VBox/Additions/x11/xgraphics/vboxutils.c (modified) (2 diffs)

trunk/src/VBox/Additions/x11/xgraphics/vboxutils.c

@@ -359 +359 @@
     if (pVBox->vmmDevInfo)
     {
-        if (!pci_device_probe(pVBox->vmmDevInfo))
+        if (pci_device_probe(pVBox->vmmDevInfo) != 0)
         {
             xf86DrvMsg (scrnIndex, X_ERROR,
@@ -366 +366 @@
                         pVBox->vmmDevInfo->device_id);
         }
-        pci_device_map_range(pVBox->vmmDevInfo,
-                             pVBox->vmmDevInfo->regions[1].base_addr,
-                             pVBox->vmmDevInfo->regions[1].size,
-                             PCI_DEV_MAP_FLAG_WRITABLE,
-                             (void **)&pVBox->pVMMDevMemory);
+        else
+        {
+            if (pci_device_map_range(pVBox->vmmDevInfo,
+                                     pVBox->vmmDevInfo->regions[1].base_addr,
+                                     pVBox->vmmDevInfo->regions[1].size,
+                                     PCI_DEV_MAP_FLAG_WRITABLE,
+                                     (void **)&pVBox->pVMMDevMemory) != 0)
+                xf86DrvMsg (scrnIndex, X_ERROR,
+                            "Failed to map VMM device range\n");
+        }
     }
 #else