Changeset 6033 in vbox for trunk/src/VBox/Additions

Timestamp:

Dec 10, 2007 8:04:17 AM (17 years ago)

Author:

vboxsync

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

26665

Message:

vboxadd changes.

Location:

trunk/src/VBox/Additions/common/VBoxGuest

Files:

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

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

@@ -20 +20 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#include "the-solaris-kernel.h" /** @todo r=bird: no need to do like linux here, solaris is stable. */
+#include <sys/conf.h>
+#include <sys/cmn_err.h>
+#include <sys/modctl.h>
+#include <sys/mutex.h>
+#include <sys/pci.h>
+#include <sys/stat.h>
+#include <sys/ddi.h>
+#include <sys/sunddi.h>
+#undef u /* /usr/include/sys/user.h:249:1 is where this is defined to (curproc->p_user). very cool. */
+
 #include "VBoxGuestInternal.h"
-
 #include <VBox/log.h>
 #include <VBox/VBoxGuest.h>
@@ -61 +69 @@
 static uint_t VBoxGuestSolarisISR(caddr_t Arg);
 
-DECLVBGL(int) VBoxGuestSolarisServiceCall(void *pvState, unsigned iCmd, void *pvData, size_t cbData, size_t *pcbDataReturned);
+DECLVBGL(int) VBoxGuestSolarisServiceCall(void *pvSession, unsigned iCmd, void *pvData, size_t cbData, size_t *pcbDataReturned);
 DECLVBGL(void *) VBoxGuestSolarisServiceOpen(uint32_t *pu32Version);
-DECLVBGL(void) VBoxGuestSolarisServiceClose(void *pvState);
+DECLVBGL(int) VBoxGuestSolarisServiceClose(void *pvSession);
 
 
@@ -176 +184 @@
 int _init(void)
 {
-    int rc;
-
     VBA_LOGCONT("_init\n");
-    rc = ddi_soft_state_init(&g_pVBoxAddSolarisState, sizeof(VBoxAddDevState), 1);
+
+    int rc = ddi_soft_state_init(&g_pVBoxAddSolarisState, sizeof(VBoxAddDevState), 1);
     if (!rc)
     {
@@ -192 +199 @@
 int _fini(void)
 {
-    int rc;
-
     VBA_LOGCONT("_fini\n");
-    rc = mod_remove(&g_VBoxAddSolarisModLinkage);
+
+    int rc = mod_remove(&g_VBoxAddSolarisModLinkage);
     if (!rc)
         ddi_soft_state_fini(&g_pVBoxAddSolarisState);
@@ -313 +319 @@
                                         {
                                             /*
-                                             * Create kernel session.
+                                             * Call the common device extension initializer.
                                              */
-                                            /** @todo this should be done *each* time the device is opened by a client kernel module. */
-                                            rc = VBoxGuestCreateKernelSession(&g_DevExt, &pState->pKernelSession);
-                                            pState->u32Version = VMMDEV_VERSION;
+                                            rc = VBoxGuestInitDevExt(&g_DevExt, pState->uIOPortBase, NULL, 0, OSTypeSolaris);
                                             if (RT_SUCCESS(rc))
                                             {
-                                                /*
-                                                 * Call the common device extension initializer.
-                                                 */
-                                                rc = VBoxGuestInitDevExt(&g_DevExt, pState->uIOPortBase, NULL, 0, OSTypeSolaris);
-                                                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(&pState->PciHandle);
-                                                        ddi_report_dev(pDip);
-                                                        return DDI_SUCCESS;
-                                                    }
-
-                                                    VBA_LOGNOTE("ddi_create_minor_node failed.\n");
+                                                    g_pDip = pDip;
+                                                    ddi_set_driver_private(pDip, pState);
+                                                    pci_config_teardown(&pState->PciHandle);
+                                                    ddi_report_dev(pDip);
+                                                    return DDI_SUCCESS;
                                                 }
-                                                else
-                                                    VBA_LOGNOTE("VBoxGuestInitDevExt failed.\n");
+
+                                                VBA_LOGNOTE("ddi_create_minor_node failed.\n");
                                             }
                                             else
-                                                VBA_LOGNOTE("VBoxGuestCreateKernelSession failed.\n");
+                                                VBA_LOGNOTE("VBoxGuestInitDevExt failed.\n");
                                             VBoxGuestSolarisRemoveIRQ(pDip, pState);
                                         }
@@ -625 +620 @@
  *
  * @returns VBox error code.
- * @param   pvState             Opaque pointer to the state info structure.
+ * @param   pvSession           Opaque pointer to the session.
  * @param   iCmd                Requested function.
  * @param   pvData              IO data buffer.
@@ -631 +626 @@
  * @param   pcbDataReturned     Where to store the amount of returned data.
  */
-DECLVBGL(int) VBoxGuestSolarisServiceCall(void *pvState, unsigned iCmd, void *pvData, size_t cbData, size_t *pcbDataReturned)
+DECLVBGL(int) VBoxGuestSolarisServiceCall(void *pvSession, unsigned iCmd, void *pvData, size_t cbData, size_t *pcbDataReturned)
 {
     VBA_LOGCONT("VBoxGuestSolarisServiceCall\n");
 
-    VBoxAddDevState *pState = (VBoxAddDevState *)pvState;
-    AssertPtrReturn(pState, VERR_INVALID_POINTER);
-    AssertPtrReturn(pState->pKernelSession, VERR_INVALID_POINTER);
-    AssertMsgReturn(pState->pKernelSession->pDevExt == &g_DevExt,
-                    ("SC: %p != %p\n", pState->pKernelSession->pDevExt, &g_DevExt), VERR_INVALID_HANDLE);
+    PVBOXGUESTSESSION pSession = (PVBOXGUESTSESSION)pvSession;
+    AssertPtrReturn(pSession, VERR_INVALID_POINTER);
+    AssertMsgReturn(pSession->pDevExt == &g_DevExt,
+                    ("SC: %p != %p\n", pSession->pDevExt, &g_DevExt), VERR_INVALID_HANDLE);
 
     return VBoxGuestCommonIOCtl(iCmd, &g_DevExt, pState->pKernelSession, pvData, cbData, pcbDataReturned);
@@ -648 +642 @@
  * Solaris Guest service open.
  *
- * @returns Opaque pointer to driver state info structure.
+ * @returns Opaque pointer to session object.
  * @param   pu32Version         Where to store VMMDev version.
  */
@@ -655 +649 @@
     VBA_LOGCONT("VBoxGuestSolarisServiceOpen\n");
 
-    /** @todo See the comment where pKernelSession is initialized.
-     * This is the same call as VBoxGuestOS2IDCConnect */
-    VBoxAddDevState *pState = ddi_get_driver_private(g_pDip);
-    AssertPtrReturn(pState, NULL);
-
-    if (pState)
+    AssertPtrReturn(pu32Version, NULL);
+    PVBOXGUESTSESSION pSession;
+    int rc = VBoxGuestCreateKernelSession(&g_DevExt, &pSession);
+    if (RT_SUCCESS(rc))
     {
         *pu32Version = VMMDEV_VERSION;
-        return pState;
-    }
+        return pSession;
+    }
+    VBA_LOGNOTE("VBoxGuestCreateKernelSession failed. rc=%d\n", rc);
     return NULL;
 }
@@ -672 +665 @@
  * Solaris Guest service close.
  *
- * @param   pvState             Opaque pointer to the state info structure.
- */
-DECLVBGL(void) VBoxGuestSolarisServiceClose(void *pvState)
-{
-    /** @todo Must close the session created above.
-     * This is the same call as VBoxGuestOS2IDCService / case VBOXGUEST_IOCTL_OS2_IDC_DISCONNECT. */
-    VBA_LOGCONT("VBoxGuestSolarisServiceClosel\n");
-    NOREF(pvState);
-}
-
+ * @returns VBox error code.
+ * @param   pvState             Opaque pointer to the session object.
+ */
+DECLVBGL(int) VBoxGuestSolarisServiceClose(void *pvSession)
+{
+    VBA_LOGCONT("VBoxGuestSolarisServiceClose\n");
+
+    PVBOXGUESTSESSION pSession = (PVBOXGUESTSESSION)pvSession;
+    AssertPtrReturn(pSession, VERR_INVALID_POINTER);
+    if (pSession)
+    {
+        VBoxGuestCloseSession(&g_DevExt, pSession);
+        return VINF_SUCCESS;
+    }
+    VBA_LOGNOTE("Invalid pSession.\n");
+    return VERR_INVALID_HANDLE;
+}
+

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

@@ -192 +192 @@
         if (pDevExt->WaitSpinlock != NIL_RTSPINLOCK)
             RTSpinlockDestroy(pDevExt->WaitSpinlock);
-        rc2 = RTR0MemObjFree(pDevExt->MemObjMMIO, true); AssertRC(rc2);
         return rc;
     }

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

@@ -145 +145 @@
 __BEGIN_DECLS
 
-int  VBoxGuestInitDevExt(PVBOXGUESTDEVEXT pDevExt, uint16_t IOPortBase, RTCCPHYS PhysMMIOBase, VBOXOSTYPE enmOSType);
+int  VBoxGuestInitDevExt(PVBOXGUESTDEVEXT pDevExt, uint16_t IOPortBase, RTCCPHYS PhysMMIOBase, uint32_t cbMMIO, VBOXOSTYPE enmOSType);
 void VBoxGuestDeleteDevExt(PVBOXGUESTDEVEXT pDevExt);
 bool VBoxGuestCommonISR(PVBOXGUESTDEVEXT pDevExt);