Changeset 7443 in vbox for trunk/src/VBox/Additions/x11/xgraphics/vboxutils.c

Timestamp:

Mar 13, 2008 3:56:58 PM (17 years ago)

Author:

vboxsync

Message:

Additions/X11: make the X11 drivers work again when the kernel module fails to load

File:

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

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

@@ -315 +315 @@
 
 Bool
-vbox_init(int scrnIndex)
+vbox_init(int scrnIndex, VBOXPtr pVBox)
 {
     Bool rc = TRUE;
@@ -321 +321 @@
     if (RT_FAILURE(vrc))
     {
-        xf86DrvMsg(scrnIndex, X_ERROR, "VbglR3Init failed rc=%d.\n", rc);
+        xf86DrvMsg(scrnIndex, X_ERROR,
+                   "Failed to initialize the VirtualBox device (rc=%d) - make sure that the VirtualBox guest additions are properly installed.  If you are not sure, try reinstalling them.  The X Window graphics drivers will run in compatibility mode.\n",
+                   vrc);
         rc = FALSE;
     }
+    pVBox->useDevice = rc;
     return rc;
 }
@@ -337 +340 @@
     TRACE_ENTRY();
 
+    if (!pVBox->useDevice)
+        return FALSE;
     pVBox->useVbva = FALSE;
 
@@ -733 +738 @@
     Bool rc;
 
+    if (!pVBox->useDevice)
+        return FALSE;
     pVBox->pCurs = pCurs = xf86CreateCursorInfoRec();
     if (!pCurs)
@@ -830 +837 @@
  */
 Bool
-vboxEnableGraphicsCap(void)
-{
+vboxEnableGraphicsCap(VBOXPtr pVBox)
+{
+    if (!pVBox->useDevice)
+        return FALSE;
     return RT_SUCCESS(VbglR3SetGuestCaps(VMMDEV_GUEST_SUPPORTS_GRAPHICS, 0));
 }
@@ -842 +851 @@
  */
 Bool
-vboxDisableGraphicsCap(void)
-{
+vboxDisableGraphicsCap(VBOXPtr pVBox)
+{
+    if (!pVBox->useDevice)
+        return FALSE;
     return RT_SUCCESS(VbglR3SetGuestCaps(0, VMMDEV_GUEST_SUPPORTS_GRAPHICS));
 }
@@ -860 +871 @@
 Bool
 vboxGetDisplayChangeRequest(ScrnInfoPtr pScrn, uint32_t *pcx, uint32_t *pcy,
-                            uint32_t *pcBits, uint32_t *piDisplay)
-{
+                            uint32_t *pcBits, uint32_t *piDisplay,
+                            VBOXPtr pVBox)
+{
+    if (!pVBox->useDevice)
+        return FALSE;
     int rc = VbglR3GetLastDisplayChangeRequest(pcx, pcy, pcBits, piDisplay);
     if (RT_SUCCESS(rc))
@@ -868 +882 @@
     return FALSE;
 }
-