Changeset 7438 in vbox

Timestamp:

Mar 12, 2008 4:12:14 PM (17 years ago)

Author:

vboxsync

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

28876

Message:

Additions/Linux: turn off the graphics capability when the additions first load

Location:

trunk/src/VBox/Additions/linux/module

Files:

• files_vboxadd (modified) (1 diff)
• vboxmod.c (modified) (2 diffs)

trunk/src/VBox/Additions/linux/module/files_vboxadd

@@ -36 +36 @@
     ${PATH_ROOT}/include/VBox/types.h=>include/VBox/types.h \
     ${PATH_ROOT}/include/VBox/ostypes.h=>include/VBox/ostypes.h \
+    ${PATH_ROOT}/include/VBox/VBoxDev.h=>include/VBox/VBoxDev.h \
     ${PATH_ROOT}/include/VBox/VBoxGuest.h=>include/VBox/VBoxGuest.h \
     ${PATH_ROOT}/include/VBox/VBoxGuestLib.h=>include/VBox/VBoxGuestLib.h \

trunk/src/VBox/Additions/linux/module/vboxmod.c

@@ -65 +65 @@
 
 #include <VBox/log.h>
+#include <VBox/VBoxDev.h>
 #include <iprt/asm.h>
 #include <iprt/assert.h>
@@ -941 +942 @@
     VbglGRFree(&infoReq->header);
 
+    /* Unset the graphics capability until/unless X is loaded. */
+    /** @todo check the error code once we bump the additions version.
+              For now we ignore it for compatibility with older hosts. */
+    {
+        VMMDevReqGuestCapabilities2 *vmmreqGuestCaps;
+
+        
+        rcVBox = VbglGRAlloc((VMMDevRequestHeader**)&vmmreqGuestCaps,
+                              sizeof(VMMDevReqGuestCapabilities2),
+                              VMMDevReq_SetGuestCapabilities);
+        if (VBOX_FAILURE(rcVBox))
+        {
+            LogRelFunc(("could not allocate request structure! rc = %Vrc\n", rcVBox));
+            goto fail;
+        }
+        vmmreqGuestCaps->u32OrMask = 0;
+        vmmreqGuestCaps->u32NotMask = VMMDEV_GUEST_SUPPORTS_GRAPHICS;
+        rcVBox = VbglGRPerform(&vmmreqGuestCaps->header);
+        VbglGRFree(&vmmreqGuestCaps->header);
+        if (RT_FAILURE(rcVBox))
+            goto fail;
+    }
+
     /* perform hypervisor address space reservation */
     if (vboxadd_reserve_hypervisor())