Changeset 38016 in vbox for trunk/src/VBox/HostDrivers
- Timestamp:
- Jul 18, 2011 1:06:11 PM (14 years ago)
- svn:sync-xref-src-repo-rev:
- 72953
- Location:
- trunk/src/VBox/HostDrivers/VBoxUSB/solaris
- Files:
-
- 2 edited
-
VBoxUSB-solaris.c (modified) (10 diffs)
-
VBoxUSBMon-solaris.c (modified) (8 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSB-solaris.c
r36341 r38016 286 286 int fPoll; /* Polling status flag */ 287 287 RTPROCESS Process; /* The process (id) of the session */ 288 bool fInstanceOpen; /* If the process is still holding this instance */ 288 289 VBOXUSBREQ_CLIENT_INFO ClientInfo; /* Registration data */ 289 290 vboxusb_power_t *pPower; /* Power Management */ … … 352 353 int VBoxUSBMonSolarisUnregisterClient(dev_info_t *pClientDip); 353 354 355 /** Callbacks from Monitor */ 356 LOCAL int vboxUSBSolarisSetConsumerCredentials(RTPROCESS Process, int Instance, void *pvReserved); 357 354 358 355 359 /******************************************************************************* … … 464 468 { 465 469 pState = ddi_get_soft_state(g_pVBoxUSBSolarisState, instance); 466 if ( pState)470 if (RT_LIKELY(pState)) 467 471 { 468 472 pState->pDip = pDip; … … 477 481 pState->fPoll = VBOXUSB_POLL_OFF; 478 482 pState->Process = NIL_RTPROCESS; 483 pState->fInstanceOpen = false; 479 484 pState->pPower = NULL; 480 485 … … 568 573 szDevicePath); 569 574 pState->ClientInfo.Instance = instance; 575 pState->ClientInfo.pfnSetConsumerCredentials = &vboxUSBSolarisSetConsumerCredentials; 570 576 rc = VBoxUSBMonSolarisRegisterClient(pState->pDip, &pState->ClientInfo); 571 577 if (RT_SUCCESS(rc)) … … 817 823 818 824 825 /** 826 * Callback invoked from the Monitor driver when a VM process tries to access 827 * this client instance. This determines which VM process will be allowed to 828 * open and access the USB device. 829 * 830 * @returns VBox status code. 831 * 832 * @param Process The VM process performing the client info. query. 833 * @param Instance This client instance (the one set while we register 834 * ourselves to the Monitor driver) 835 * @param pvReserved Reserved for future, unused. 836 */ 837 LOCAL int vboxUSBSolarisSetConsumerCredentials(RTPROCESS Process, int Instance, void *pvReserved) 838 { 839 LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisSetConsumerCredentials Process=%u Instance=%d\n", Process, Instance)); 840 vboxusb_state_t *pState = ddi_get_soft_state(g_pVBoxUSBSolarisState, Instance); 841 if (!pState) 842 { 843 LogRel((DEVICE_NAME ":vboxUSBSolarisSetConsumerCredentials failed to get device state for instance %d\n", Instance)); 844 return VERR_INVALID_STATE; 845 } 846 847 int rc = VINF_SUCCESS; 848 mutex_enter(&pState->Mtx); 849 850 if (pState->fInstanceOpen == false) 851 pState->Process = Process; 852 else 853 { 854 LogRel((DEVICE_NAME ":vboxUSBSolarisSetConsumerCredentials failed! Process %u already has client open.\n", pState->Process)); 855 rc = VERR_RESOURCE_BUSY; 856 } 857 858 mutex_exit(&pState->Mtx); 859 860 return rc; 861 } 862 863 819 864 int VBoxUSBSolarisOpen(dev_t *pDev, int fFlag, int fType, cred_t *pCred) 820 865 { … … 838 883 } 839 884 885 mutex_enter(&pState->Mtx); 886 840 887 /* 841 888 * Only one user process can open a device instance at a time. 842 889 */ 843 if (pState-> Process != NIL_RTPROCESS)890 if (pState->fInstanceOpen == true) 844 891 { 845 892 LogRel((DEVICE_NAME ":VBoxUSBSolarisOpen a process is already using this device instance.\n")); … … 847 894 } 848 895 849 pState->Process = RTProcSelf(); 896 if (pState->Process != RTProcSelf()) 897 { 898 LogRel((DEVICE_NAME ":VBoxUSBSolarisOpen invalid process.\n")); 899 return EPERM; 900 } 901 850 902 pState->fPoll = VBOXUSB_POLL_ON; 903 pState->fInstanceOpen = true; 904 905 mutex_exit(&pState->Mtx); 851 906 852 907 NOREF(fFlag); … … 872 927 pState->fPoll = VBOXUSB_POLL_OFF; 873 928 pState->Process = NIL_RTPROCESS; 929 pState->fInstanceOpen = false; 874 930 mutex_exit(&pState->Mtx); 875 931 … … 1570 1626 AssertPtrReturn(pEp, VERR_INVALID_POINTER); 1571 1627 1572 //LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisSendUrb pState=%p pUrbReq=%p bEndpoint=%#x[%d] enmDir=%#x enmType=%#x cbData=%d pvData=%p\n",1573 // pState, pUrbReq, pUrbReq->bEndpoint, EndPtIndex, pUrbReq->enmDir, pUrbReq->enmType, pUrbReq->cbData, pUrbReq->pvData)); 1628 /* LogFlowFunc((DEVICE_NAME ":vboxUSBSolarisSendUrb pState=%p pUrbReq=%p bEndpoint=%#x[%d] enmDir=%#x enmType=%#x cbData=%d pvData=%p\n", 1629 pState, pUrbReq, pUrbReq->bEndpoint, EndPtIndex, pUrbReq->enmDir, pUrbReq->enmType, pUrbReq->cbData, pUrbReq->pvData)); */ 1574 1630 1575 1631 if (RT_UNLIKELY(!pUrbReq->pvData)) -
trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSBMon-solaris.c
r36361 r38016 165 165 *******************************************************************************/ 166 166 /** Global Device handle we only support one instance. */ 167 static dev_info_t *g_pDip ;167 static dev_info_t *g_pDip = NULL; 168 168 /** Global Mutex. */ 169 169 static kmutex_t g_VBoxUSBMonSolarisMtx; … … 171 171 static uint64_t g_cVBoxUSBMonSolarisClient = 0; 172 172 /** Global list of client drivers registered with us. */ 173 vboxusbmon_client_t *g_pVBoxUSBMonSolarisClients = 0;173 vboxusbmon_client_t *g_pVBoxUSBMonSolarisClients = NULL; 174 174 /** Opaque pointer to list of soft states. */ 175 175 static void *g_pVBoxUSBMonSolarisState; … … 293 293 case DDI_ATTACH: 294 294 { 295 vboxusbmon_state_t *pState = NULL; 295 if (RT_UNLIKELY(g_pDip)) 296 { 297 LogRel((DEVICE_NAME ":VBoxUSBMonSolarisAttach global instance already initialized.\n")); 298 return DDI_FAILURE; 299 } 300 301 g_pDip = pDip; 296 302 int instance = ddi_get_instance(pDip); 297 int rc; 298 299 pState = RTMemAllocZ(sizeof(*pState)); 300 if (pState) 303 int rc = ddi_create_priv_minor_node(pDip, DEVICE_NAME, S_IFCHR, instance, DDI_PSEUDO, 0, 304 "none", "none", 0660); 305 if (rc == DDI_SUCCESS) 301 306 { 302 g_pDip = pDip; 303 rc = ddi_create_priv_minor_node(pDip, DEVICE_NAME, S_IFCHR, instance, DDI_PSEUDO, 0, 304 "none", "none", 0666); 305 if (rc == DDI_SUCCESS) 306 { 307 ddi_set_driver_private(pDip, pState); 308 ddi_report_dev(pDip); 309 return rc; 310 } 311 else 312 LogRel((DEVICE_NAME ":ddi_create_minor_node failed! rc=%d\n", rc)); 313 RTMemFree(pState); 307 ddi_report_dev(pDip); 308 return rc; 314 309 } 315 310 else 316 LogRel((DEVICE_NAME ": RTMemAllocZ failed to allocated %d bytes for pState\n", sizeof(*pState)));311 LogRel((DEVICE_NAME ":VBoxUSBMonSolarisAttach ddi_create_minor_node failed! rc=%d\n", rc)); 317 312 return DDI_FAILURE; 318 313 } … … 359 354 mutex_exit(&g_VBoxUSBMonSolarisMtx); 360 355 361 vboxusbmon_state_t *pState = ddi_get_driver_private(g_pDip); 362 if (pState) 363 { 364 ddi_remove_minor_node(pDip, NULL); 365 RTMemFree(pState); 366 return DDI_SUCCESS; 367 } 368 else 369 LogRel((DEVICE_NAME ":failed to get soft state on detach.\n")); 370 break; 356 ddi_remove_minor_node(pDip, NULL); 357 g_pDip = NULL; 358 return DDI_SUCCESS; 371 359 } 372 360 … … 853 841 } 854 842 843 844 /** 845 * Query client driver information. This also has a side-effect that it informs 846 * the client driver which upcoming VM process should be allowed to open it. 847 * 848 * @returns VBox status code. 849 * @param pState Pointer to the device state. 850 * @param pClientInfo Pointer to the client info. object. 851 */ 855 852 static int vboxUSBMonSolarisClientInfo(vboxusbmon_state_t *pState, PVBOXUSB_CLIENT_INFO pClientInfo) 856 853 { … … 870 867 RTStrPrintf(pClientInfo->szClientPath, sizeof(pClientInfo->szClientPath), "%s", pCur->Info.szClientPath); 871 868 869 /* 870 * Inform the client driver that this is the client process that is going to open it. We can predict the future! 871 */ 872 int rc; 873 if (pCur->Info.pfnSetConsumerCredentials) 874 { 875 rc = pCur->Info.pfnSetConsumerCredentials(pState->Process, pCur->Info.Instance, NULL /* pvReserved */); 876 if (RT_FAILURE(rc)) 877 LogRel((DEVICE_NAME ":vboxUSBMonSolarisClientInfo pfnSetConsumerCredentials failed. rc=%d\n", rc)); 878 } 879 else 880 rc = VERR_INVALID_FUNCTION; 881 872 882 mutex_exit(&g_VBoxUSBMonSolarisMtx); 873 883 874 LogFlow((DEVICE_NAME ":vboxUSBMonSolarisClientInfo found. %s \n", pClientInfo->szDeviceIdent));875 return VINF_SUCCESS;884 LogFlow((DEVICE_NAME ":vboxUSBMonSolarisClientInfo found. %s rc=%d\n", pClientInfo->szDeviceIdent, rc)); 885 return rc; 876 886 } 877 887 pPrev = pCur; … … 900 910 if (RT_LIKELY(g_pDip)) 901 911 { 902 vboxusbmon_state_t *pState = ddi_get_driver_private(g_pDip); 903 904 if (RT_LIKELY(pState)) 905 { 906 vboxusbmon_client_t *pClient = RTMemAlloc(sizeof(vboxusbmon_client_t)); 907 if (RT_LIKELY(pClient)) 908 { 909 bcopy(pClientInfo, &pClient->Info, sizeof(pClient->Info)); 910 pClient->pDip = pClientDip; 911 912 mutex_enter(&g_VBoxUSBMonSolarisMtx); 913 pClient->pNext = g_pVBoxUSBMonSolarisClients; 914 g_pVBoxUSBMonSolarisClients = pClient; 915 mutex_exit(&g_VBoxUSBMonSolarisMtx); 916 917 LogFlow((DEVICE_NAME ":VBoxUSBMonSolarisRegisterClient registered. %d %s %s\n", 918 pClient->Info.Instance, pClient->Info.szClientPath, pClient->Info.szDeviceIdent)); 919 920 return VINF_SUCCESS; 921 } 922 else 923 return VERR_NO_MEMORY; 912 vboxusbmon_client_t *pClient = RTMemAllocZ(sizeof(vboxusbmon_client_t)); 913 if (RT_LIKELY(pClient)) 914 { 915 pClient->Info.Instance = pClientInfo->Instance; 916 strncpy(pClient->Info.szClientPath, pClientInfo->szClientPath, sizeof(pClient->Info.szClientPath)); 917 strncpy(pClient->Info.szDeviceIdent, pClientInfo->szDeviceIdent, sizeof(pClient->Info.szDeviceIdent)); 918 pClient->Info.pfnSetConsumerCredentials = pClientInfo->pfnSetConsumerCredentials; 919 pClient->pDip = pClientDip; 920 921 mutex_enter(&g_VBoxUSBMonSolarisMtx); 922 pClient->pNext = g_pVBoxUSBMonSolarisClients; 923 g_pVBoxUSBMonSolarisClients = pClient; 924 mutex_exit(&g_VBoxUSBMonSolarisMtx); 925 926 LogFlow((DEVICE_NAME ":VBoxUSBMonSolarisRegisterClient registered. %d %s %s\n", 927 pClient->Info.Instance, pClient->Info.szClientPath, pClient->Info.szDeviceIdent)); 928 929 return VINF_SUCCESS; 924 930 } 925 931 else 926 return VERR_ INTERNAL_ERROR;932 return VERR_NO_MEMORY; 927 933 } 928 934 else 929 return VERR_IN TERNAL_ERROR_2;935 return VERR_INVALID_STATE; 930 936 } 931 937 … … 941 947 { 942 948 LogFlowFunc((DEVICE_NAME ":VBoxUSBMonSolarisUnregisterClient pClientDip=%p\n", pClientDip)); 949 AssertReturn(pClientDip, VERR_INVALID_PARAMETER); 943 950 944 951 if (RT_LIKELY(g_pDip)) 945 952 { 946 vboxusbmon_state_t *pState = ddi_get_driver_private(g_pDip); 947 948 if (RT_LIKELY(pState)) 949 { 950 mutex_enter(&g_VBoxUSBMonSolarisMtx); 951 952 vboxusbmon_client_t *pCur = g_pVBoxUSBMonSolarisClients; 953 vboxusbmon_client_t *pPrev = NULL; 954 while (pCur) 953 mutex_enter(&g_VBoxUSBMonSolarisMtx); 954 955 vboxusbmon_client_t *pCur = g_pVBoxUSBMonSolarisClients; 956 vboxusbmon_client_t *pPrev = NULL; 957 while (pCur) 958 { 959 if (pCur->pDip == pClientDip) 955 960 { 956 if (pCur->pDip == pClientDip) 957 { 958 if (pPrev) 959 pPrev->pNext = pCur->pNext; 960 else 961 g_pVBoxUSBMonSolarisClients = pCur->pNext; 962 963 mutex_exit(&g_VBoxUSBMonSolarisMtx); 964 965 LogFlow((DEVICE_NAME ":VBoxUSBMonSolarisUnregisterClient unregistered. %d %s %s\n", 966 pCur->Info.Instance, pCur->Info.szClientPath, pCur->Info.szDeviceIdent)); 967 RTMemFree(pCur); 968 pCur = NULL; 969 return VINF_SUCCESS; 970 } 971 pPrev = pCur; 972 pCur = pCur->pNext; 961 if (pPrev) 962 pPrev->pNext = pCur->pNext; 963 else 964 g_pVBoxUSBMonSolarisClients = pCur->pNext; 965 966 mutex_exit(&g_VBoxUSBMonSolarisMtx); 967 968 LogFlow((DEVICE_NAME ":VBoxUSBMonSolarisUnregisterClient unregistered. %d %s %s\n", 969 pCur->Info.Instance, pCur->Info.szClientPath, pCur->Info.szDeviceIdent)); 970 RTMemFree(pCur); 971 pCur = NULL; 972 return VINF_SUCCESS; 973 973 } 974 975 mutex_exit(&g_VBoxUSBMonSolarisMtx);976 977 LogRel((DEVICE_NAME ":VBoxUSBMonSolarisUnregisterClient Failed to find registered client %p\n", pClientDip)); 978 return VERR_SEARCH_ERROR;979 } 980 else981 return VERR_INTERNAL_ERROR;974 pPrev = pCur; 975 pCur = pCur->pNext; 976 } 977 978 mutex_exit(&g_VBoxUSBMonSolarisMtx); 979 980 LogRel((DEVICE_NAME ":VBoxUSBMonSolarisUnregisterClient Failed to find registered client %p\n", pClientDip)); 981 return VERR_NOT_FOUND; 982 982 } 983 983 else 984 return VERR_IN TERNAL_ERROR_2;984 return VERR_INVALID_STATE; 985 985 } 986 986
Note:
See TracChangeset
for help on using the changeset viewer.
