Changeset 68793 in vbox

Timestamp:

Sep 19, 2017 3:46:36 PM (7 years ago)

Author:

vboxsync

Message:

VBoxGuest/solaris: fixes

Location:

trunk/src/VBox/Additions/common/VBoxGuest

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxGuest-solaris.c (modified) (2 diffs)
• lib/VBoxGuestR0LibIdc-solaris.cpp (modified) (1 diff)
• solaris/load.sh (added)

trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk

@@ -242 +242 @@
 endif
 
+
+#
+# Helper script.
+#
+INSTALLS.solaris += VBoxGuestLoad
+VBoxGuestLoad_TEMPLATE = VBOXGUESTR0
+VBoxGuestLoad_EXEC_SOURCES = solaris/load.sh
+
+
 include $(FILE_KBUILD_SUB_FOOTER)
 

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

@@ -193 +193 @@
 static bool                 g_fSoftIntRegistered = false;
 
+/** Additional IPRT function we need to drag in for vboxfs. */
+PFNRT g_Deps[] =
+{
+    (PFNRT)RTErrConvertToErrno,
+};
+
+
 /**
  * Kernel entry points
@@ -259 +266 @@
 int _info(struct modinfo *pModInfo)
 {
-    LogFlow((DEVICE_NAME ":_info\n"));
+    /* LogFlow((DEVICE_NAME ":_info\n")); - Called too early, causing RTThreadPreemtIsEnabled warning. */
     return mod_info(&g_vgdrvSolarisModLinkage, pModInfo);
 }

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibIdc-solaris.cpp

@@ -41 +41 @@
     ldi_handle_t hDev   = NULL;
     ldi_ident_t  hIdent = ldi_ident_from_anon();
+    /* Note! ldi_open_by_name actually opens the device and ends up creating a useless user session.
+             Wonder if there is any way to detect ldi_open_by_name and do I/O controls via hDev... */
     int rc = ldi_open_by_name(VBOXGUEST_DEVICE_NAME, FREAD, kcred, &hDev, hIdent);
     ldi_ident_release(hIdent);
     if (rc == 0)
     {
-        rc = VBoxGuestIDC(NULL, VBGL_IOCTL_IDC_DISCONNECT, &pReq->Hdr, sizeof(*pReq));
+        rc = VBoxGuestIDC(NULL, VBGL_IOCTL_IDC_CONNECT, &pReq->Hdr, sizeof(*pReq));
         if (RT_SUCCESS(rc) && RT_SUCCESS(pReq->Hdr.rc))
         {