Changeset 70039 in vbox for trunk/src/VBox/VMM
- Timestamp:
- Dec 8, 2017 5:23:10 PM (7 years ago)
- Location:
- trunk/src/VBox/VMM/VMMR3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/VMM/VMMR3/PDMDevice.cpp
r69111 r70039 986 986 * @param pszDriver The name of the driver which to detach. If NULL 987 987 * then the entire driver chain is detatched. 988 * @param iOccur anceThe occurrence of that driver in the chain. This is988 * @param iOccurrence The occurrence of that driver in the chain. This is 989 989 * usually 0. 990 990 * @param fFlags Flags, combination of the PDMDEVATT_FLAGS_* \#defines. … … 992 992 */ 993 993 VMMR3DECL(int) PDMR3DriverDetach(PUVM pUVM, const char *pszDevice, unsigned iDevIns, unsigned iLun, 994 const char *pszDriver, unsigned iOccur ance, uint32_t fFlags)995 { 996 LogFlow(("PDMR3DriverDetach: pszDevice=%p:{%s} iDevIns=%u iLun=%u pszDriver=%p:{%s} iOccur ance=%u fFlags=%#x\n",997 pszDevice, pszDevice, iDevIns, iLun, pszDriver, pszDriver, iOccur ance, fFlags));994 const char *pszDriver, unsigned iOccurrence, uint32_t fFlags) 995 { 996 LogFlow(("PDMR3DriverDetach: pszDevice=%p:{%s} iDevIns=%u iLun=%u pszDriver=%p:{%s} iOccurrence=%u fFlags=%#x\n", 997 pszDevice, pszDevice, iDevIns, iLun, pszDriver, pszDriver, iOccurrence, fFlags)); 998 998 UVM_ASSERT_VALID_EXT_RETURN(pUVM, VERR_INVALID_VM_HANDLE); 999 999 PVM pVM = pUVM->pVM; … … 1002 1002 AssertPtr(pszDevice); 1003 1003 AssertPtrNull(pszDriver); 1004 Assert(iOccur ance == 0 || pszDriver);1004 Assert(iOccurrence == 0 || pszDriver); 1005 1005 Assert(!(fFlags & ~(PDM_TACH_FLAGS_NOT_HOT_PLUG))); 1006 1006 … … 1024 1024 if (!strcmp(pDrvIns->pReg->szName, pszDriver)) 1025 1025 { 1026 if (iOccur ance == 0)1026 if (iOccurrence == 0) 1027 1027 break; 1028 iOccur ance--;1028 iOccurrence--; 1029 1029 } 1030 1030 pDrvIns = pDrvIns->Internal.s.pDown; … … 1061 1061 * If NULL then the entire driver chain is to be 1062 1062 * reattached. 1063 * @param iOccur anceThe occurrence of that driver in the chain. This is1063 * @param iOccurrence The occurrence of that driver in the chain. This is 1064 1064 * usually 0. 1065 1065 * @param fFlags Flags, combination of the PDMDEVATT_FLAGS_* \#defines. … … 1076 1076 */ 1077 1077 VMMR3DECL(int) PDMR3DriverReattach(PUVM pUVM, const char *pszDevice, unsigned iDevIns, unsigned iLun, 1078 const char *pszDriver, unsigned iOccur ance, uint32_t fFlags,1078 const char *pszDriver, unsigned iOccurrence, uint32_t fFlags, 1079 1079 PCFGMNODE pCfg, PPPDMIBASE ppBase) 1080 1080 { 1081 NOREF(pUVM); NOREF(pszDevice); NOREF(iDevIns); NOREF(iLun); NOREF(pszDriver); NOREF(iOccur ance);1081 NOREF(pUVM); NOREF(pszDevice); NOREF(iDevIns); NOREF(iLun); NOREF(pszDriver); NOREF(iOccurrence); 1082 1082 NOREF(fFlags); NOREF(pCfg); NOREF(ppBase); 1083 1083 return VERR_NOT_IMPLEMENTED; -
trunk/src/VBox/VMM/VMMR3/PDMUsb.cpp
r69111 r70039 1382 1382 * @param pszDriver The name of the driver which to detach. If NULL 1383 1383 * then the entire driver chain is detatched. 1384 * @param iOccur anceThe occurrence of that driver in the chain. This is1384 * @param iOccurrence The occurrence of that driver in the chain. This is 1385 1385 * usually 0. 1386 1386 * @param fFlags Flags, combination of the PDM_TACH_FLAGS_* \#defines. … … 1388 1388 */ 1389 1389 VMMR3DECL(int) PDMR3UsbDriverDetach(PUVM pUVM, const char *pszDevice, unsigned iDevIns, unsigned iLun, 1390 const char *pszDriver, unsigned iOccur ance, uint32_t fFlags)1391 { 1392 LogFlow(("PDMR3UsbDriverDetach: pszDevice=%p:{%s} iDevIns=%u iLun=%u pszDriver=%p:{%s} iOccur ance=%u fFlags=%#x\n",1393 pszDevice, pszDevice, iDevIns, iLun, pszDriver, pszDriver, iOccur ance, fFlags));1390 const char *pszDriver, unsigned iOccurrence, uint32_t fFlags) 1391 { 1392 LogFlow(("PDMR3UsbDriverDetach: pszDevice=%p:{%s} iDevIns=%u iLun=%u pszDriver=%p:{%s} iOccurrence=%u fFlags=%#x\n", 1393 pszDevice, pszDevice, iDevIns, iLun, pszDriver, pszDriver, iOccurrence, fFlags)); 1394 1394 UVM_ASSERT_VALID_EXT_RETURN(pUVM, VERR_INVALID_VM_HANDLE); 1395 1395 PVM pVM = pUVM->pVM; … … 1398 1398 AssertPtr(pszDevice); 1399 1399 AssertPtrNull(pszDriver); 1400 Assert(iOccur ance == 0 || pszDriver);1400 Assert(iOccurrence == 0 || pszDriver); 1401 1401 Assert(!(fFlags & ~(PDM_TACH_FLAGS_NOT_HOT_PLUG))); 1402 1402 … … 1420 1420 if (!strcmp(pDrvIns->pReg->szName, pszDriver)) 1421 1421 { 1422 if (iOccur ance == 0)1422 if (iOccurrence == 0) 1423 1423 break; 1424 iOccur ance--;1424 iOccurrence--; 1425 1425 } 1426 1426 pDrvIns = pDrvIns->Internal.s.pDown;
Note:
See TracChangeset
for help on using the changeset viewer.