Changeset 2714 in vbox for trunk/src/VBox/Additions/common/VBoxGuestLib

Timestamp:

May 18, 2007 1:32:20 PM (18 years ago)

Author:

vboxsync

Message:

Do not allow to use VbglGr* if VBoxGuest is not available. Backed out r21276.

Location:

trunk/src/VBox/Additions/common/VBoxGuestLib

Files:

• GenericRequest.cpp (modified) (3 diffs)
• Init.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/GenericRequest.cpp

@@ -29 +29 @@
 {
     int rc = VbglEnter ();
-    VMMDevRequestHeader *pReq;
 
     if (VBOX_FAILURE(rc))
@@ -40 +39 @@
     }
 
-    pReq = (VMMDevRequestHeader *)VbglPhysHeapAlloc (cbSize);
+    VMMDevRequestHeader *pReq = (VMMDevRequestHeader *)VbglPhysHeapAlloc (cbSize);
     if (!pReq)
     {
@@ -74 +73 @@
         return VERR_INVALID_PARAMETER;
 
-    if (g_vbgldata.portVMMDev == 0)
-        return VERR_VBGL_NOT_INITIALIZED;
-
     physaddr = VbglPhysHeapGetPhysAddr (pReq);
     if (!physaddr)

trunk/src/VBox/Additions/common/VBoxGuestLib/Init.cpp

@@ -33 +33 @@
 
 #ifndef VBGL_VBOXGUEST
-static int vbglQueryVMMDevPort (void)
+/* The guest library uses lazy initialization for VMMDev port and memory,
+ * because these values are provided by the VBoxGuest driver and it might
+ * be loaded later than other drivers.
+ * The VbglEnter checks the current library status, tries to retrive these
+ * values and fails if they are unavailable.
+ */
+static void vbglQueryVMMDevPort (void)
 {
     int rc = VINF_SUCCESS;
@@ -61 +67 @@
 
     dprintf (("vbglQueryVMMDevPort rc = %d\n", rc));
-    
-    return rc;
 }
 #endif
@@ -77 +81 @@
 #endif
 
-    rc = g_vbgldata.status != VbglStatusNotInitialized? VINF_SUCCESS: VERR_VBGL_NOT_INITIALIZED;
+    rc = g_vbgldata.status == VbglStatusReady? VINF_SUCCESS: VERR_VBGL_NOT_INITIALIZED;
     
     // dprintf(("VbglEnter: rc = %d\n", rc));
@@ -171 +175 @@
     if (VBOX_SUCCESS(rc))
     {
-        /* Obtain VMMDev port via IOCTL to VBoxGuest main driver. */
-        rc = vbglQueryVMMDevPort ();
+        /* Try to obtain VMMDev port via IOCTL to VBoxGuest main driver. */
+        vbglQueryVMMDevPort ();
 
 #ifdef VBOX_HGCM
-        if (VBOX_SUCCESS(rc))
-        {
-            rc = vbglHGCMInit ();
-        }
-#endif
+        rc = vbglHGCMInit ();
+#endif /* VBOX_HGCM */
 
         if (VBOX_FAILURE(rc))