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

Timestamp:

Apr 24, 2008 9:32:22 AM (17 years ago)

Author:

vboxsync

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

30129

Message:

Additions/common: moved guest cap disabling into common VBoxGuest.

Location:

trunk/src/VBox/Additions/common/VBoxGuest

Files:

• VBoxGuest-solaris.c (modified) (3 diffs)
• VBoxGuest.cpp (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>
@@ -332 +331 @@
                                     if (RT_SUCCESS(rc))
                                     {
-                                        /*
-                                         * Disable graphics capability explicitly for Solaris guests.
-                                         */
-                                        rc = VBoxGuestSetGuestCapabilities(0, VMMDEV_GUEST_SUPPORTS_GRAPHICS);
-                                        if (RT_SUCCESS(rc))
+                                        rc = ddi_create_minor_node(pDip, DEVICE_NAME, S_IFCHR, instance, DDI_PSEUDO, 0);
+                                        if (rc == 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"));
+                                            g_pDip = pDip;
+                                            ddi_set_driver_private(pDip, pState);
+                                            pci_config_teardown(&PciHandle);
+                                            ddi_report_dev(pDip);
+                                            return DDI_SUCCESS;
                                         }
-                                        else
-                                            LogRel((DEVICE_NAME ":VBoxGuestSetGuestCapabilities failed. rc=%d\n", rc));
+
+                                        LogRel((DEVICE_NAME ":ddi_create_minor_node failed.\n"));
                                     }
                                     else
@@ -499 +489 @@
 
     /*
-     * Verify we are being opened as a character device
+     * Verify we are being opened as a character device.
      */
     if (fType != OTYP_CHR)

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

@@ -220 +220 @@
                 if (RT_SUCCESS(rc))
                 {
-                    vboxGuestInitFixateGuestMappings(pDevExt);
-                    Log(("VBoxGuestInitDevExt: returns success\n"));
-                    return VINF_SUCCESS;
+                    /*
+                     * Disable guest graphics capability by default. The guest specific
+                     * graphics driver will re-enable this when it is necessary.
+                     */
+                    rc = VBoxGuestSetGuestCapabilities(0, VMMDEV_GUEST_SUPPORTS_GRAPHICS);
+                    if (RT_SUCCESS(rc))
+                    {
+                        vboxGuestInitFixateGuestMappings(pDevExt);
+                        Log(("VBoxGuestInitDevExt: returns success\n"));
+                        return VINF_SUCCESS;
+                    }
                 }
             }