Changeset 8318 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Apr 23, 2008 8:56:36 AM (17 years ago)

Author:

vboxsync

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

30080

Message:

Additions/common, solaris: Report disabled guest graphics capabilities by default.

Location:

trunk/src/VBox/Additions/common/VBoxGuest

Files:

• VBoxGuest-solaris.c (modified) (2 diffs)
• VBoxGuest.cpp (modified) (1 diff)
• VBoxGuestInternal.h (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c

@@ -35 +35 @@
 
 #include "VBoxGuestInternal.h"
+#include <VBox/VBoxDev.h>       /* for VMMDEV_GUEST_SUPPORTS_GRAPHICS */
 #include <VBox/log.h>
 #include <iprt/assert.h>
@@ -331 +332 @@
                                     if (RT_SUCCESS(rc))
                                     {
-                                        rc = ddi_create_minor_node(pDip, DEVICE_NAME, S_IFCHR, instance, DDI_PSEUDO, 0);
-                                        if (rc == DDI_SUCCESS)
+                                        /*
+                                         * Disable graphics capability explicitly for Solaris guests.
+                                         */
+                                        rc = VBoxGuestSetGuestCapabilities(0, VMMDEV_GUEST_SUPPORTS_GRAPHICS);
+                                        if (RT_SUCCESS(rc))
                                         {
-                                            g_pDip = pDip;
-                                            ddi_set_driver_private(pDip, pState);
-                                            pci_config_teardown(&PciHandle);
-                                            ddi_report_dev(pDip);
-                                            return DDI_SUCCESS;
+                                            rc = ddi_create_minor_node(pDip, DEVICE_NAME, S_IFCHR, instance, DDI_PSEUDO, 0);
+                                            if (rc == DDI_SUCCESS)
+                                            {
+                                                g_pDip = pDip;
+                                                ddi_set_driver_private(pDip, pState);
+                                                pci_config_teardown(&PciHandle);
+                                                ddi_report_dev(pDip);
+                                                return DDI_SUCCESS;
+                                            }
+
+                                            LogRel((DEVICE_NAME ":ddi_create_minor_node failed.\n"));
                                         }
-
-                                        LogRel((DEVICE_NAME ":ddi_create_minor_node failed.\n"));
+                                        else
+                                            LogRel((DEVICE_NAME ":VBoxGuestSetGuestCapabilities failed. rc=%d\n", rc));
                                     }
                                     else

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp

@@ -518 +518 @@
     VBoxGuestWaitFreeLocked(pDevExt, pWait);
     RTSpinlockReleaseNoInts(pDevExt->WaitSpinlock, &Tmp);
+}
+
+
+/** @todo XXX: This should later be done as a proper IOCtl request. Currently we call this from Ring-0. */
+int VBoxGuestSetGuestCapabilities(uint32_t u32OrMask, uint32_t u32NotMask)
+{
+    int rc;
+    VMMDevReqGuestCapabilities2 *pReq;
+    rc = VbglGRAlloc((VMMDevRequestHeader **)&pReq, sizeof(*pReq), VMMDevReq_SetGuestCapabilities);
+    if (RT_FAILURE(rc))
+    {
+        Log(("VBoxGuestSetGuestCapabilities: failed to allocate %u (%#x) bytes to cache the request. rc=%d!!\n",
+             sizeof(*pReq), sizeof(*pReq), rc));
+        return rc;
+    }
+
+    pReq->u32OrMask = u32OrMask;
+    pReq->u32NotMask = u32NotMask;
+
+    rc = VbglGRPerform(&pReq->header);
+    if (RT_FAILURE(rc))
+        Log(("VBoxGuestSetGuestCapabilities:VbglGRPerform failed, rc=%Rrc!\n", rc));
+    else if (RT_FAILURE(pReq->header.rc))
+    {
+        Log(("VBoxGuestSetGuestCapabilities: The request failed; VMMDev rc=%Rrc!\n", pReq->header.rc));
+        rc = pReq->header.rc;
+    }
+
+    VbglGRFree(&pReq->header);
+    return rc;
 }
 

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h

@@ -152 +152 @@
 void VBoxGuestDeleteDevExt(PVBOXGUESTDEVEXT pDevExt);
 bool VBoxGuestCommonISR(PVBOXGUESTDEVEXT pDevExt);
+int  VBoxGuestSetGuestCapabilities(uint32_t u32OrMask, uint32_t u32NotMask);
 
 int  VBoxGuestCreateUserSession(PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION *ppSession);