Changeset 26166 in vbox for trunk/src/VBox/Devices
- Timestamp:
- Feb 2, 2010 7:54:23 PM (15 years ago)
- svn:sync-xref-src-repo-rev:
- 57180
- Location:
- trunk/src/VBox/Devices
- Files:
-
- 23 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Devices/Audio/audio.c
r26001 r26166 2046 2046 /* u32Version */ 2047 2047 PDM_DRVREG_VERSION, 2048 /* sz DriverName */2048 /* szName */ 2049 2049 "AUDIO", 2050 2050 /* szRCMod */ -
trunk/src/VBox/Devices/Input/DrvKeyboardQueue.cpp
r26001 r26166 325 325 /* u32Version */ 326 326 PDM_DRVREG_VERSION, 327 /* sz DriverName */327 /* szName */ 328 328 "KeyboardQueue", 329 329 /* szRCMod */ -
trunk/src/VBox/Devices/Input/DrvMouseQueue.cpp
r26001 r26166 312 312 /* u32Version */ 313 313 PDM_DRVREG_VERSION, 314 /* sz DriverName */314 /* szName */ 315 315 "MouseQueue", 316 316 /* szRCMod */ -
trunk/src/VBox/Devices/Network/DrvIntNet.cpp
r26137 r26166 1173 1173 /* u32Version */ 1174 1174 PDM_DRVREG_VERSION, 1175 /* sz DriverName */1175 /* szName */ 1176 1176 "IntNet", 1177 1177 /* szRCMod */ -
trunk/src/VBox/Devices/Network/DrvNAT.cpp
r26001 r26166 1197 1197 /* u32Version */ 1198 1198 PDM_DRVREG_VERSION, 1199 /* sz DriverName */1199 /* szName */ 1200 1200 "NAT", 1201 1201 /* szRCMod */ -
trunk/src/VBox/Devices/Network/DrvNetSniffer.cpp
r26001 r26166 480 480 /* u32Version */ 481 481 PDM_DRVREG_VERSION, 482 /* sz DriverName */482 /* szName */ 483 483 "NetSniffer", 484 484 /* szRCMod */ -
trunk/src/VBox/Devices/Network/DrvTAP.cpp
r26001 r26166 1061 1061 /* u32Version */ 1062 1062 PDM_DRVREG_VERSION, 1063 /* sz DriverName */1063 /* szName */ 1064 1064 "HostInterface", 1065 1065 /* szRCMod */ -
trunk/src/VBox/Devices/PC/DrvACPI.cpp
r26001 r26166 769 769 /* u32Version */ 770 770 PDM_DRVREG_VERSION, 771 /* sz DriverName */771 /* szName */ 772 772 "ACPIHost", 773 773 /* szRCMod */ -
trunk/src/VBox/Devices/PC/DrvAcpiCpu.cpp
r26001 r26166 96 96 /* u32Version */ 97 97 PDM_DRVREG_VERSION, 98 /* sz DriverName */98 /* szName */ 99 99 "ACPICpu", 100 100 /* szRCMod */ -
trunk/src/VBox/Devices/Parallel/DrvHostParallel.cpp
r26001 r26166 394 394 /* u32Version */ 395 395 PDM_DRVREG_VERSION, 396 /* sz DriverName */396 /* szName */ 397 397 "HostParallel", 398 398 /* szRCMod */ -
trunk/src/VBox/Devices/Serial/DrvChar.cpp
r26001 r26166 410 410 /* u32Version */ 411 411 PDM_DRVREG_VERSION, 412 /* sz DriverName */412 /* szName */ 413 413 "Char", 414 414 /* szRCMod */ -
trunk/src/VBox/Devices/Serial/DrvHostSerial.cpp
r26001 r26166 1459 1459 /* u32Version */ 1460 1460 PDM_DRVREG_VERSION, 1461 /* sz DriverName */1461 /* szName */ 1462 1462 "Host Serial", 1463 1463 /* szRCMod */ -
trunk/src/VBox/Devices/Serial/DrvNamedPipe.cpp
r26001 r26166 608 608 /* u32Version */ 609 609 PDM_DRVREG_VERSION, 610 /* sz DriverName */610 /* szName */ 611 611 "NamedPipe", 612 612 /* szRCMod */ -
trunk/src/VBox/Devices/Serial/DrvRawFile.cpp
r26163 r26166 212 212 /* u32Version */ 213 213 PDM_DRVREG_VERSION, 214 /* sz DriverName */214 /* szName */ 215 215 "RawFile", 216 216 /* szRCMod */ -
trunk/src/VBox/Devices/Storage/DrvBlock.cpp
r26001 r26166 899 899 /* u32Version */ 900 900 PDM_DRVREG_VERSION, 901 /* sz DriverName */901 /* szName */ 902 902 "Block", 903 903 /* szRCMod */ -
trunk/src/VBox/Devices/Storage/DrvHostBase.cpp
r26161 r26166 140 140 PDRVHOSTBASE pThis = PDMIBLOCK_2_DRVHOSTBASE(pInterface); 141 141 LogFlow(("%s-%d: drvHostBaseRead: off=%#llx pvBuf=%p cbRead=%#x (%s)\n", 142 pThis->pDrvIns->pReg->sz DriverName, pThis->pDrvIns->iInstance, off, pvBuf, cbRead, pThis->pszDevice));142 pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, off, pvBuf, cbRead, pThis->pszDevice)); 143 143 RTCritSectEnter(&pThis->CritSect); 144 144 … … 197 197 Log2(("%s-%d: drvHostBaseRead: off=%#llx cbRead=%#x\n" 198 198 "%16.*Rhxd\n", 199 pThis->pDrvIns->pReg->sz DriverName, pThis->pDrvIns->iInstance, off, cbRead, cbRead, pvBuf));199 pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, off, cbRead, cbRead, pvBuf)); 200 200 } 201 201 else 202 202 Log(("%s-%d: drvHostBaseRead: RTFileRead(%d, %p, %#x) -> %Rrc (off=%#llx '%s')\n", 203 pThis->pDrvIns->pReg->sz DriverName, pThis->pDrvIns->iInstance, pThis->FileDevice,203 pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pThis->FileDevice, 204 204 pvBuf, cbRead, rc, off, pThis->pszDevice)); 205 205 } 206 206 else 207 Log(("%s-%d: drvHostBaseRead: RTFileSeek(%d,%#llx,) -> %Rrc\n", pThis->pDrvIns->pReg->sz DriverName,207 Log(("%s-%d: drvHostBaseRead: RTFileSeek(%d,%#llx,) -> %Rrc\n", pThis->pDrvIns->pReg->szName, 208 208 pThis->pDrvIns->iInstance, pThis->FileDevice, off, rc)); 209 209 #endif … … 213 213 214 214 RTCritSectLeave(&pThis->CritSect); 215 LogFlow(("%s-%d: drvHostBaseRead: returns %Rrc\n", pThis->pDrvIns->pReg->sz DriverName, pThis->pDrvIns->iInstance, rc));215 LogFlow(("%s-%d: drvHostBaseRead: returns %Rrc\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, rc)); 216 216 return rc; 217 217 } … … 223 223 PDRVHOSTBASE pThis = PDMIBLOCK_2_DRVHOSTBASE(pInterface); 224 224 LogFlow(("%s-%d: drvHostBaseWrite: off=%#llx pvBuf=%p cbWrite=%#x (%s)\n", 225 pThis->pDrvIns->pReg->sz DriverName, pThis->pDrvIns->iInstance, off, pvBuf, cbWrite, pThis->pszDevice));225 pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, off, pvBuf, cbWrite, pThis->pszDevice)); 226 226 Log2(("%s-%d: drvHostBaseWrite: off=%#llx cbWrite=%#x\n" 227 227 "%16.*Rhxd\n", 228 pThis->pDrvIns->pReg->sz DriverName, pThis->pDrvIns->iInstance, off, cbWrite, cbWrite, pvBuf));228 pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, off, cbWrite, cbWrite, pvBuf)); 229 229 RTCritSectEnter(&pThis->CritSect); 230 230 … … 251 251 if (RT_FAILURE(rc)) 252 252 Log(("%s-%d: drvHostBaseWrite: RTFileWrite(%d, %p, %#x) -> %Rrc (off=%#llx '%s')\n", 253 pThis->pDrvIns->pReg->sz DriverName, pThis->pDrvIns->iInstance, pThis->FileDevice,253 pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pThis->FileDevice, 254 254 pvBuf, cbWrite, rc, off, pThis->pszDevice)); 255 255 } 256 256 else 257 257 Log(("%s-%d: drvHostBaseWrite: RTFileSeek(%d,%#llx,) -> %Rrc\n", 258 pThis->pDrvIns->pReg->sz DriverName, pThis->pDrvIns->iInstance, pThis->FileDevice, off, rc));258 pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pThis->FileDevice, off, rc)); 259 259 #endif 260 260 } … … 266 266 267 267 RTCritSectLeave(&pThis->CritSect); 268 LogFlow(("%s-%d: drvHostBaseWrite: returns %Rrc\n", pThis->pDrvIns->pReg->sz DriverName, pThis->pDrvIns->iInstance, rc));268 LogFlow(("%s-%d: drvHostBaseWrite: returns %Rrc\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, rc)); 269 269 return rc; 270 270 } … … 277 277 PDRVHOSTBASE pThis = PDMIBLOCK_2_DRVHOSTBASE(pInterface); 278 278 LogFlow(("%s-%d: drvHostBaseFlush: (%s)\n", 279 pThis->pDrvIns->pReg->sz DriverName, pThis->pDrvIns->iInstance, pThis->pszDevice));279 pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pThis->pszDevice)); 280 280 RTCritSectEnter(&pThis->CritSect); 281 281 … … 293 293 294 294 RTCritSectLeave(&pThis->CritSect); 295 LogFlow(("%s-%d: drvHostBaseFlush: returns %Rrc\n", pThis->pDrvIns->pReg->sz DriverName, pThis->pDrvIns->iInstance, rc));295 LogFlow(("%s-%d: drvHostBaseFlush: returns %Rrc\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, rc)); 296 296 return rc; 297 297 } … … 317 317 318 318 RTCritSectLeave(&pThis->CritSect); 319 LogFlow(("%s-%d: drvHostBaseGetSize: returns %llu\n", pThis->pDrvIns->pReg->sz DriverName, pThis->pDrvIns->iInstance, cb));319 LogFlow(("%s-%d: drvHostBaseGetSize: returns %llu\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, cb)); 320 320 return cb; 321 321 } … … 326 326 { 327 327 PDRVHOSTBASE pThis = PDMIBLOCK_2_DRVHOSTBASE(pInterface); 328 LogFlow(("%s-%d: drvHostBaseGetType: returns %d\n", pThis->pDrvIns->pReg->sz DriverName, pThis->pDrvIns->iInstance, pThis->enmType));328 LogFlow(("%s-%d: drvHostBaseGetType: returns %d\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pThis->enmType)); 329 329 return pThis->enmType; 330 330 } … … 338 338 *pUuid = pThis->Uuid; 339 339 340 LogFlow(("%s-%d: drvHostBaseGetUuid: returns VINF_SUCCESS *pUuid=%RTuuid\n", pThis->pDrvIns->pReg->sz DriverName, pThis->pDrvIns->iInstance, pUuid));340 LogFlow(("%s-%d: drvHostBaseGetUuid: returns VINF_SUCCESS *pUuid=%RTuuid\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pUuid)); 341 341 return VINF_SUCCESS; 342 342 } … … 372 372 RTCritSectLeave(&pThis->CritSect); 373 373 LogFlow(("%s-%d: %s: returns %Rrc CHS={%d,%d,%d}\n", 374 pThis->pDrvIns->pReg->sz DriverName, pThis->pDrvIns->iInstance, __FUNCTION__, rc, pThis->PCHSGeometry.cCylinders, pThis->PCHSGeometry.cHeads, pThis->PCHSGeometry.cSectors));374 pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, __FUNCTION__, rc, pThis->PCHSGeometry.cCylinders, pThis->PCHSGeometry.cHeads, pThis->PCHSGeometry.cSectors)); 375 375 return rc; 376 376 } … … 382 382 PDRVHOSTBASE pThis = PDMIBLOCKBIOS_2_DRVHOSTBASE(pInterface); 383 383 LogFlow(("%s-%d: %s: cCylinders=%d cHeads=%d cSectors=%d\n", 384 pThis->pDrvIns->pReg->sz DriverName, pThis->pDrvIns->iInstance, __FUNCTION__, pPCHSGeometry->cCylinders, pPCHSGeometry->cHeads, pPCHSGeometry->cSectors));384 pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, __FUNCTION__, pPCHSGeometry->cCylinders, pPCHSGeometry->cHeads, pPCHSGeometry->cSectors)); 385 385 RTCritSectEnter(&pThis->CritSect); 386 386 … … 424 424 RTCritSectLeave(&pThis->CritSect); 425 425 LogFlow(("%s-%d: %s: returns %Rrc CHS={%d,%d,%d}\n", 426 pThis->pDrvIns->pReg->sz DriverName, pThis->pDrvIns->iInstance, __FUNCTION__, rc, pThis->LCHSGeometry.cCylinders, pThis->LCHSGeometry.cHeads, pThis->LCHSGeometry.cSectors));426 pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, __FUNCTION__, rc, pThis->LCHSGeometry.cCylinders, pThis->LCHSGeometry.cHeads, pThis->LCHSGeometry.cSectors)); 427 427 return rc; 428 428 } … … 434 434 PDRVHOSTBASE pThis = PDMIBLOCKBIOS_2_DRVHOSTBASE(pInterface); 435 435 LogFlow(("%s-%d: %s: cCylinders=%d cHeads=%d cSectors=%d\n", 436 pThis->pDrvIns->pReg->sz DriverName, pThis->pDrvIns->iInstance, __FUNCTION__, pLCHSGeometry->cCylinders, pLCHSGeometry->cHeads, pLCHSGeometry->cSectors));436 pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, __FUNCTION__, pLCHSGeometry->cCylinders, pLCHSGeometry->cHeads, pLCHSGeometry->cSectors)); 437 437 RTCritSectEnter(&pThis->CritSect); 438 438 … … 517 517 } 518 518 else 519 LogFlow(("%s-%d: drvHostBaseLock: already locked\n", pThis->pDrvIns->pReg->sz DriverName, pThis->pDrvIns->iInstance));519 LogFlow(("%s-%d: drvHostBaseLock: already locked\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance)); 520 520 521 521 RTCritSectLeave(&pThis->CritSect); 522 LogFlow(("%s-%d: drvHostBaseLock: returns %Rrc\n", pThis->pDrvIns->pReg->sz DriverName, pThis->pDrvIns->iInstance, rc));522 LogFlow(("%s-%d: drvHostBaseLock: returns %Rrc\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, rc)); 523 523 return rc; 524 524 } … … 540 540 } 541 541 else 542 LogFlow(("%s-%d: drvHostBaseUnlock: not locked\n", pThis->pDrvIns->pReg->sz DriverName, pThis->pDrvIns->iInstance));542 LogFlow(("%s-%d: drvHostBaseUnlock: not locked\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance)); 543 543 544 544 RTCritSectLeave(&pThis->CritSect); 545 LogFlow(("%s-%d: drvHostBaseUnlock: returns %Rrc\n", pThis->pDrvIns->pReg->sz DriverName, pThis->pDrvIns->iInstance, rc));545 LogFlow(("%s-%d: drvHostBaseUnlock: returns %Rrc\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, rc)); 546 546 return rc; 547 547 } … … 706 706 * Try claim the device. 707 707 */ 708 Log(("%s-%d: calling DADiskClaim on '%s'.\n", pDrvIns->pReg->sz DriverName, pDrvIns->iInstance, szName));708 Log(("%s-%d: calling DADiskClaim on '%s'.\n", pDrvIns->pReg->szName, pDrvIns->iInstance, szName)); 709 709 int rcDA = -2; 710 710 DADiskClaim(pThis->pDADisk, kDADiskClaimOptionDefault, NULL, NULL, drvHostBaseDADoneCallback, &rcDA); … … 717 717 * Try unmount the device. 718 718 */ 719 Log(("%s-%d: calling DADiskUnmount on '%s'.\n", pDrvIns->pReg->sz DriverName, pDrvIns->iInstance, szName));719 Log(("%s-%d: calling DADiskUnmount on '%s'.\n", pDrvIns->pReg->szName, pDrvIns->iInstance, szName)); 720 720 rcDA = -2; 721 721 DADiskUnmount(pThis->pDADisk, kDADiskUnmountOptionWhole, drvHostBaseDADoneCallback, &rcDA); … … 727 727 iTry = 99; 728 728 DASessionUnscheduleFromRunLoop(pThis->pDASession, CFRunLoopGetCurrent(), MY_RUN_LOOP_MODE); 729 Log(("%s-%d: unmount succeed - retrying.\n", pDrvIns->pReg->sz DriverName, pDrvIns->iInstance));729 Log(("%s-%d: unmount succeed - retrying.\n", pDrvIns->pReg->szName, pDrvIns->iInstance)); 730 730 continue; 731 731 } 732 Log(("%s-%d: umount => rc32=%d & rcDA=%#x\n", pDrvIns->pReg->sz DriverName, pDrvIns->iInstance, rc32, rcDA));732 Log(("%s-%d: umount => rc32=%d & rcDA=%#x\n", pDrvIns->pReg->szName, pDrvIns->iInstance, rc32, rcDA)); 733 733 734 734 /* failed - cleanup */ … … 736 736 } 737 737 else 738 Log(("%s-%d: claim => rc32=%d & rcDA=%#x\n", pDrvIns->pReg->sz DriverName, pDrvIns->iInstance, rc32, rcDA));738 Log(("%s-%d: claim => rc32=%d & rcDA=%#x\n", pDrvIns->pReg->szName, pDrvIns->iInstance, rc32, rcDA)); 739 739 740 740 CFRelease(pThis->pDADisk); … … 742 742 } 743 743 else 744 Log(("%s-%d: failed to open disk '%s'!\n", pDrvIns->pReg->sz DriverName, pDrvIns->iInstance, szName));744 Log(("%s-%d: failed to open disk '%s'!\n", pDrvIns->pReg->szName, pDrvIns->iInstance, szName)); 745 745 746 746 DASessionUnscheduleFromRunLoop(pThis->pDASession, CFRunLoopGetCurrent(), MY_RUN_LOOP_MODE); … … 749 749 } 750 750 else 751 Log(("%s-%d: failed to create DA session!\n", pDrvIns->pReg->sz DriverName, pDrvIns->iInstance));751 Log(("%s-%d: failed to create DA session!\n", pDrvIns->pReg->szName, pDrvIns->iInstance)); 752 752 } 753 753 RTThreadSleep(10); … … 1073 1073 { 1074 1074 #ifndef RT_OS_DARWIN /* Only *one* open for darwin. */ 1075 LogFlow(("%s-%d: drvHostBaseReopen: '%s'\n", pThis->pDrvIns->pReg->sz DriverName, pThis->pDrvIns->iInstance, pThis->pszDeviceOpen));1075 LogFlow(("%s-%d: drvHostBaseReopen: '%s'\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pThis->pszDeviceOpen)); 1076 1076 1077 1077 RTFILE FileDevice; … … 1096 1096 if (!pThis->fReadOnlyConfig) 1097 1097 { 1098 LogFlow(("%s-%d: drvHostBaseReopen: '%s' - retry readonly (%Rrc)\n", pThis->pDrvIns->pReg->sz DriverName, pThis->pDrvIns->iInstance, pThis->pszDeviceOpen, rc));1098 LogFlow(("%s-%d: drvHostBaseReopen: '%s' - retry readonly (%Rrc)\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pThis->pszDeviceOpen, rc)); 1099 1099 #ifdef RT_OS_SOLARIS 1100 1100 rc = drvHostBaseOpen(pThis, &FileDevice, &FileRawDevice, false); … … 1106 1106 { 1107 1107 LogFlow(("%s-%d: failed to open device '%s', rc=%Rrc\n", 1108 pThis->pDrvIns->pReg->sz DriverName, pThis->pDrvIns->iInstance, pThis->pszDevice, rc));1108 pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pThis->pszDevice, rc)); 1109 1109 return rc; 1110 1110 } … … 1436 1436 { 1437 1437 LogFlow(("%s-%d: failed to figure media size of %s, rc=%Rrc\n", 1438 pThis->pDrvIns->pReg->sz DriverName, pThis->pDrvIns->iInstance, pThis->pszDevice, rc));1438 pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pThis->pszDevice, rc)); 1439 1439 return rc; 1440 1440 } … … 1448 1448 pThis->pDrvMountNotify->pfnMountNotify(pThis->pDrvMountNotify); 1449 1449 LogFlow(("%s-%d: drvHostBaseMediaPresent: cbSize=%lld (%#llx)\n", 1450 pThis->pDrvIns->pReg->sz DriverName, pThis->pDrvIns->iInstance, pThis->cbSize, pThis->cbSize));1450 pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pThis->cbSize, pThis->cbSize)); 1451 1451 return VINF_SUCCESS; 1452 1452 } … … 1543 1543 PDRVHOSTBASE pThis = (PDRVHOSTBASE)pvUser; 1544 1544 LogFlow(("%s-%d: drvHostBaseMediaThread: ThreadSelf=%p pvUser=%p\n", 1545 pThis->pDrvIns->pReg->sz DriverName, pThis->pDrvIns->iInstance, ThreadSelf, pvUser));1545 pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, ThreadSelf, pvUser)); 1546 1546 #ifdef RT_OS_WINDOWS 1547 1547 static WNDCLASS s_classDeviceChange = {0}; … … 1576 1576 if (!hwnd) 1577 1577 { 1578 LogFlow(("%s-%d: drvHostBaseMediaThread: returns VERR_GENERAL_FAILURE\n", pThis->pDrvIns->pReg->sz DriverName, pThis->pDrvIns->iInstance));1578 LogFlow(("%s-%d: drvHostBaseMediaThread: returns VERR_GENERAL_FAILURE\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance)); 1579 1579 return VERR_GENERAL_FAILURE; 1580 1580 } 1581 LogFlow(("%s-%d: drvHostBaseMediaThread: Created hwndDeviceChange=%p\n", pThis->pDrvIns->pReg->sz DriverName, pThis->pDrvIns->iInstance, hwnd));1581 LogFlow(("%s-%d: drvHostBaseMediaThread: Created hwndDeviceChange=%p\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, hwnd)); 1582 1582 1583 1583 /* … … 1644 1644 1645 1645 /* (Don't clear the thread handle here, the destructor thread is using it to wait.) */ 1646 LogFlow(("%s-%d: drvHostBaseMediaThread: returns VINF_SUCCESS\n", pThis->pDrvIns->pReg->sz DriverName, pThis->pDrvIns->iInstance));1646 LogFlow(("%s-%d: drvHostBaseMediaThread: returns VINF_SUCCESS\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance)); 1647 1647 return VINF_SUCCESS; 1648 1648 } … … 1661 1661 { 1662 1662 PDRVHOSTBASE pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTBASE); 1663 LogFlow(("%s-%d: drvHostBaseMediaThread:\n", pThis->pDrvIns->pReg->sz DriverName, pThis->pDrvIns->iInstance));1663 LogFlow(("%s-%d: drvHostBaseMediaThread:\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance)); 1664 1664 RTCritSectEnter(&pThis->CritSect); 1665 1665 … … 1683 1683 { 1684 1684 PDRVHOSTBASE pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTBASE); 1685 LogFlow(("%s-%d: drvHostBaseDestruct: iInstance=%d\n", pDrvIns->pReg->sz DriverName, pDrvIns->iInstance, pDrvIns->iInstance));1685 LogFlow(("%s-%d: drvHostBaseDestruct: iInstance=%d\n", pDrvIns->pReg->szName, pDrvIns->iInstance, pDrvIns->iInstance)); 1686 1686 1687 1687 /* … … 1758 1758 if (pThis->ppScsiTaskDI) 1759 1759 { 1760 LogFlow(("%s-%d: releasing exclusive scsi access!\n", pDrvIns->pReg->sz DriverName, pDrvIns->iInstance));1760 LogFlow(("%s-%d: releasing exclusive scsi access!\n", pDrvIns->pReg->szName, pDrvIns->iInstance)); 1761 1761 (*pThis->ppScsiTaskDI)->ReleaseExclusiveAccess(pThis->ppScsiTaskDI); 1762 1762 (*pThis->ppScsiTaskDI)->Release(pThis->ppScsiTaskDI); … … 1765 1765 if (pThis->pDADisk) 1766 1766 { 1767 LogFlow(("%s-%d: unclaiming the disk!\n", pDrvIns->pReg->sz DriverName, pDrvIns->iInstance));1767 LogFlow(("%s-%d: unclaiming the disk!\n", pDrvIns->pReg->szName, pDrvIns->iInstance)); 1768 1768 DADiskUnclaim(pThis->pDADisk); 1769 1769 CFRelease(pThis->pDADisk); … … 1772 1772 if (pThis->ppMMCDI) 1773 1773 { 1774 LogFlow(("%s-%d: releasing the MMC object!\n", pDrvIns->pReg->sz DriverName, pDrvIns->iInstance));1774 LogFlow(("%s-%d: releasing the MMC object!\n", pDrvIns->pReg->szName, pDrvIns->iInstance)); 1775 1775 (*pThis->ppMMCDI)->Release(pThis->ppMMCDI); 1776 1776 pThis->ppMMCDI = NULL; … … 1783 1783 if (pThis->pDASession) 1784 1784 { 1785 LogFlow(("%s-%d: releasing the DA session!\n", pDrvIns->pReg->sz DriverName, pDrvIns->iInstance));1785 LogFlow(("%s-%d: releasing the DA session!\n", pDrvIns->pReg->szName, pDrvIns->iInstance)); 1786 1786 CFRelease(pThis->pDASession); 1787 1787 pThis->pDASession = NULL; … … 1830 1830 if (!pThis->fKeepInstance && RTCritSectIsInitialized(&pThis->CritSect)) 1831 1831 RTCritSectDelete(&pThis->CritSect); 1832 LogFlow(("%s-%d: drvHostBaseDestruct completed\n", pDrvIns->pReg->sz DriverName, pDrvIns->iInstance));1832 LogFlow(("%s-%d: drvHostBaseDestruct completed\n", pDrvIns->pReg->szName, pDrvIns->iInstance)); 1833 1833 } 1834 1834 … … 1850 1850 { 1851 1851 PDRVHOSTBASE pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTBASE); 1852 LogFlow(("%s-%d: DRVHostBaseInitData: iInstance=%d\n", pDrvIns->pReg->sz DriverName, pDrvIns->iInstance, pDrvIns->iInstance));1852 LogFlow(("%s-%d: DRVHostBaseInitData: iInstance=%d\n", pDrvIns->pReg->szName, pDrvIns->iInstance, pDrvIns->iInstance)); 1853 1853 1854 1854 /* … … 2045 2045 /* log config summary */ 2046 2046 Log(("%s-%d: pszDevice='%s' (%s) cMilliesPoller=%d fReadOnlyConfig=%d fLocked=%d fBIOSVisible=%d Uuid=%RTuuid\n", 2047 pDrvIns->pReg->sz DriverName, pDrvIns->iInstance, pThis->pszDevice, pThis->pszDeviceOpen, pThis->cMilliesPoller,2047 pDrvIns->pReg->szName, pDrvIns->iInstance, pThis->pszDevice, pThis->pszDeviceOpen, pThis->cMilliesPoller, 2048 2048 pThis->fReadOnlyConfig, pThis->fLocked, pThis->fBiosVisible, &pThis->Uuid)); 2049 2049 -
trunk/src/VBox/Devices/Storage/DrvHostDVD.cpp
r25893 r26166 828 828 /* u32Version */ 829 829 PDM_DRVREG_VERSION, 830 /* sz DriverName */830 /* szName */ 831 831 "HostDVD", 832 832 /* szRCMod */ -
trunk/src/VBox/Devices/Storage/DrvHostFloppy.cpp
r25893 r26166 202 202 /* u32Version */ 203 203 PDM_DRVREG_VERSION, 204 /* sz DriverName */204 /* szName */ 205 205 "HostFloppy", 206 206 /* szRCMod */ -
trunk/src/VBox/Devices/Storage/DrvMediaISO.cpp
r26001 r26166 293 293 /* u32Version */ 294 294 PDM_DRVREG_VERSION, 295 /* sz DriverName */295 /* szName */ 296 296 "MediaISO", 297 297 /* szRCMod */ -
trunk/src/VBox/Devices/Storage/DrvRawImage.cpp
r26001 r26166 345 345 /* u32Version */ 346 346 PDM_DRVREG_VERSION, 347 /* sz DriverName */347 /* szName */ 348 348 "RawImage", 349 349 /* szRCMod */ -
trunk/src/VBox/Devices/Storage/DrvSCSI.cpp
r26001 r26166 1025 1025 /* u32Version */ 1026 1026 PDM_DRVREG_VERSION, 1027 /* sz DriverName */1027 /* szName */ 1028 1028 "SCSI", 1029 1029 /* szRCMod */ -
trunk/src/VBox/Devices/Storage/DrvSCSIHost.cpp
r26001 r26166 498 498 /* u32Version */ 499 499 PDM_DRVREG_VERSION, 500 /* sz DriverName */500 /* szName */ 501 501 "SCSIHost", 502 502 /* szRCMod */ -
trunk/src/VBox/Devices/Storage/DrvVD.cpp
r26147 r26166 1334 1334 /* u32Version */ 1335 1335 PDM_DRVREG_VERSION, 1336 /* sz DriverName */1336 /* szName */ 1337 1337 "VD", 1338 1338 /* szRCMod */
Note:
See TracChangeset
for help on using the changeset viewer.