VirtualBox

Changeset 26166 in vbox for trunk


Ignore:
Timestamp:
Feb 2, 2010 7:54:23 PM (15 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
57180
Message:

PDM: s/szDriverName/szName/g - PDMDRVREG.

Location:
trunk
Files:
38 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/VBox/pdmdrv.h

    r26161 r26166  
    224224    uint32_t            u32Version;
    225225    /** Driver name. */
    226     char                szDriverName[32];
     226    char                szName[32];
    227227    /** Name of the raw-mode context module (no path).
    228228     * Only evalutated if PDM_DRVREG_FLAGS_RC is set. */

  • trunk/src/VBox/Devices/Audio/audio.c

    r26001 r26166  
    20462046    /* u32Version */
    20472047    PDM_DRVREG_VERSION,
    2048     /* szDriverName */
     2048    /* szName */
    20492049    "AUDIO",
    20502050    /* szRCMod */

  • trunk/src/VBox/Devices/Input/DrvKeyboardQueue.cpp

    r26001 r26166  
    325325    /* u32Version */
    326326    PDM_DRVREG_VERSION,
    327     /* szDriverName */
     327    /* szName */
    328328    "KeyboardQueue",
    329329    /* szRCMod */

  • trunk/src/VBox/Devices/Input/DrvMouseQueue.cpp

    r26001 r26166  
    312312    /* u32Version */
    313313    PDM_DRVREG_VERSION,
    314     /* szDriverName */
     314    /* szName */
    315315    "MouseQueue",
    316316    /* szRCMod */

  • trunk/src/VBox/Devices/Network/DrvIntNet.cpp

    r26137 r26166  
    11731173    /* u32Version */
    11741174    PDM_DRVREG_VERSION,
    1175     /* szDriverName */
     1175    /* szName */
    11761176    "IntNet",
    11771177    /* szRCMod */

  • trunk/src/VBox/Devices/Network/DrvNAT.cpp

    r26001 r26166  
    11971197    /* u32Version */
    11981198    PDM_DRVREG_VERSION,
    1199     /* szDriverName */
     1199    /* szName */
    12001200    "NAT",
    12011201    /* szRCMod */

  • trunk/src/VBox/Devices/Network/DrvNetSniffer.cpp

    r26001 r26166  
    480480    /* u32Version */
    481481    PDM_DRVREG_VERSION,
    482     /* szDriverName */
     482    /* szName */
    483483    "NetSniffer",
    484484    /* szRCMod */

  • trunk/src/VBox/Devices/Network/DrvTAP.cpp

    r26001 r26166  
    10611061    /* u32Version */
    10621062    PDM_DRVREG_VERSION,
    1063     /* szDriverName */
     1063    /* szName */
    10641064    "HostInterface",
    10651065    /* szRCMod */

  • trunk/src/VBox/Devices/PC/DrvACPI.cpp

    r26001 r26166  
    769769    /* u32Version */
    770770    PDM_DRVREG_VERSION,
    771     /* szDriverName */
     771    /* szName */
    772772    "ACPIHost",
    773773    /* szRCMod */

  • trunk/src/VBox/Devices/PC/DrvAcpiCpu.cpp

    r26001 r26166  
    9696    /* u32Version */
    9797    PDM_DRVREG_VERSION,
    98     /* szDriverName */
     98    /* szName */
    9999    "ACPICpu",
    100100    /* szRCMod */

  • trunk/src/VBox/Devices/Parallel/DrvHostParallel.cpp

    r26001 r26166  
    394394    /* u32Version */
    395395    PDM_DRVREG_VERSION,
    396     /* szDriverName */
     396    /* szName */
    397397    "HostParallel",
    398398    /* szRCMod */

  • trunk/src/VBox/Devices/Serial/DrvChar.cpp

    r26001 r26166  
    410410    /* u32Version */
    411411    PDM_DRVREG_VERSION,
    412     /* szDriverName */
     412    /* szName */
    413413    "Char",
    414414    /* szRCMod */

  • trunk/src/VBox/Devices/Serial/DrvHostSerial.cpp

    r26001 r26166  
    14591459    /* u32Version */
    14601460    PDM_DRVREG_VERSION,
    1461     /* szDriverName */
     1461    /* szName */
    14621462    "Host Serial",
    14631463        /* szRCMod */

  • trunk/src/VBox/Devices/Serial/DrvNamedPipe.cpp

    r26001 r26166  
    608608    /* u32Version */
    609609    PDM_DRVREG_VERSION,
    610     /* szDriverName */
     610    /* szName */
    611611    "NamedPipe",
    612612    /* szRCMod */

  • trunk/src/VBox/Devices/Serial/DrvRawFile.cpp

    r26163 r26166  
    212212    /* u32Version */
    213213    PDM_DRVREG_VERSION,
    214     /* szDriverName */
     214    /* szName */
    215215    "RawFile",
    216216    /* szRCMod */

  • trunk/src/VBox/Devices/Storage/DrvBlock.cpp

    r26001 r26166  
    899899    /* u32Version */
    900900    PDM_DRVREG_VERSION,
    901     /* szDriverName */
     901    /* szName */
    902902    "Block",
    903903    /* szRCMod */

  • trunk/src/VBox/Devices/Storage/DrvHostBase.cpp

    r26161 r26166  
    140140    PDRVHOSTBASE pThis = PDMIBLOCK_2_DRVHOSTBASE(pInterface);
    141141    LogFlow(("%s-%d: drvHostBaseRead: off=%#llx pvBuf=%p cbRead=%#x (%s)\n",
    142              pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, off, pvBuf, cbRead, pThis->pszDevice));
     142             pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, off, pvBuf, cbRead, pThis->pszDevice));
    143143    RTCritSectEnter(&pThis->CritSect);
    144144
    … …  
    197197                Log2(("%s-%d: drvHostBaseRead: off=%#llx cbRead=%#x\n"
    198198                      "%16.*Rhxd\n",
    199                       pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, off, cbRead, cbRead, pvBuf));
     199                      pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, off, cbRead, cbRead, pvBuf));
    200200            }
    201201            else
    202202                Log(("%s-%d: drvHostBaseRead: RTFileRead(%d, %p, %#x) -> %Rrc (off=%#llx '%s')\n",
    203                      pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, pThis->FileDevice,
     203                     pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pThis->FileDevice,
    204204                     pvBuf, cbRead, rc, off, pThis->pszDevice));
    205205        }
    206206        else
    207             Log(("%s-%d: drvHostBaseRead: RTFileSeek(%d,%#llx,) -> %Rrc\n", pThis->pDrvIns->pReg->szDriverName,
     207            Log(("%s-%d: drvHostBaseRead: RTFileSeek(%d,%#llx,) -> %Rrc\n", pThis->pDrvIns->pReg->szName,
    208208                 pThis->pDrvIns->iInstance, pThis->FileDevice, off, rc));
    209209#endif
    … …  
    213213
    214214    RTCritSectLeave(&pThis->CritSect);
    215     LogFlow(("%s-%d: drvHostBaseRead: returns %Rrc\n", pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, rc));
     215    LogFlow(("%s-%d: drvHostBaseRead: returns %Rrc\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, rc));
    216216    return rc;
    217217}
    … …  
    223223    PDRVHOSTBASE pThis = PDMIBLOCK_2_DRVHOSTBASE(pInterface);
    224224    LogFlow(("%s-%d: drvHostBaseWrite: off=%#llx pvBuf=%p cbWrite=%#x (%s)\n",
    225              pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, off, pvBuf, cbWrite, pThis->pszDevice));
     225             pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, off, pvBuf, cbWrite, pThis->pszDevice));
    226226    Log2(("%s-%d: drvHostBaseWrite: off=%#llx cbWrite=%#x\n"
    227227          "%16.*Rhxd\n",
    228           pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, off, cbWrite, cbWrite, pvBuf));
     228          pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, off, cbWrite, cbWrite, pvBuf));
    229229    RTCritSectEnter(&pThis->CritSect);
    230230
    … …  
    251251                if (RT_FAILURE(rc))
    252252                    Log(("%s-%d: drvHostBaseWrite: RTFileWrite(%d, %p, %#x) -> %Rrc (off=%#llx '%s')\n",
    253                          pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, pThis->FileDevice,
     253                         pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pThis->FileDevice,
    254254                         pvBuf, cbWrite, rc, off, pThis->pszDevice));
    255255            }
    256256            else
    257257                Log(("%s-%d: drvHostBaseWrite: RTFileSeek(%d,%#llx,) -> %Rrc\n",
    258                      pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, pThis->FileDevice, off, rc));
     258                     pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pThis->FileDevice, off, rc));
    259259#endif
    260260        }
    … …  
    266266
    267267    RTCritSectLeave(&pThis->CritSect);
    268     LogFlow(("%s-%d: drvHostBaseWrite: returns %Rrc\n", pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, rc));
     268    LogFlow(("%s-%d: drvHostBaseWrite: returns %Rrc\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, rc));
    269269    return rc;
    270270}
    … …  
    277277    PDRVHOSTBASE pThis = PDMIBLOCK_2_DRVHOSTBASE(pInterface);
    278278    LogFlow(("%s-%d: drvHostBaseFlush: (%s)\n",
    279              pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, pThis->pszDevice));
     279             pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pThis->pszDevice));
    280280    RTCritSectEnter(&pThis->CritSect);
    281281
    … …  
    293293
    294294    RTCritSectLeave(&pThis->CritSect);
    295     LogFlow(("%s-%d: drvHostBaseFlush: returns %Rrc\n", pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, rc));
     295    LogFlow(("%s-%d: drvHostBaseFlush: returns %Rrc\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, rc));
    296296    return rc;
    297297}
    … …  
    317317
    318318    RTCritSectLeave(&pThis->CritSect);
    319     LogFlow(("%s-%d: drvHostBaseGetSize: returns %llu\n", pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, cb));
     319    LogFlow(("%s-%d: drvHostBaseGetSize: returns %llu\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, cb));
    320320    return cb;
    321321}
    … …  
    326326{
    327327    PDRVHOSTBASE pThis = PDMIBLOCK_2_DRVHOSTBASE(pInterface);
    328     LogFlow(("%s-%d: drvHostBaseGetType: returns %d\n", pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, pThis->enmType));
     328    LogFlow(("%s-%d: drvHostBaseGetType: returns %d\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pThis->enmType));
    329329    return pThis->enmType;
    330330}
    … …  
    338338    *pUuid = pThis->Uuid;
    339339
    340     LogFlow(("%s-%d: drvHostBaseGetUuid: returns VINF_SUCCESS *pUuid=%RTuuid\n", pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, pUuid));
     340    LogFlow(("%s-%d: drvHostBaseGetUuid: returns VINF_SUCCESS *pUuid=%RTuuid\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pUuid));
    341341    return VINF_SUCCESS;
    342342}
    … …  
    372372    RTCritSectLeave(&pThis->CritSect);
    373373    LogFlow(("%s-%d: %s: returns %Rrc CHS={%d,%d,%d}\n",
    374              pThis->pDrvIns->pReg->szDriverName, 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));
    375375    return rc;
    376376}
    … …  
    382382    PDRVHOSTBASE pThis = PDMIBLOCKBIOS_2_DRVHOSTBASE(pInterface);
    383383    LogFlow(("%s-%d: %s: cCylinders=%d cHeads=%d cSectors=%d\n",
    384              pThis->pDrvIns->pReg->szDriverName, 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));
    385385    RTCritSectEnter(&pThis->CritSect);
    386386
    … …  
    424424    RTCritSectLeave(&pThis->CritSect);
    425425    LogFlow(("%s-%d: %s: returns %Rrc CHS={%d,%d,%d}\n",
    426              pThis->pDrvIns->pReg->szDriverName, 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));
    427427    return rc;
    428428}
    … …  
    434434    PDRVHOSTBASE pThis = PDMIBLOCKBIOS_2_DRVHOSTBASE(pInterface);
    435435    LogFlow(("%s-%d: %s: cCylinders=%d cHeads=%d cSectors=%d\n",
    436              pThis->pDrvIns->pReg->szDriverName, 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));
    437437    RTCritSectEnter(&pThis->CritSect);
    438438
    … …  
    517517    }
    518518    else
    519         LogFlow(("%s-%d: drvHostBaseLock: already locked\n", pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance));
     519        LogFlow(("%s-%d: drvHostBaseLock: already locked\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance));
    520520
    521521    RTCritSectLeave(&pThis->CritSect);
    522     LogFlow(("%s-%d: drvHostBaseLock: returns %Rrc\n", pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, rc));
     522    LogFlow(("%s-%d: drvHostBaseLock: returns %Rrc\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, rc));
    523523    return rc;
    524524}
    … …  
    540540    }
    541541    else
    542         LogFlow(("%s-%d: drvHostBaseUnlock: not locked\n", pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance));
     542        LogFlow(("%s-%d: drvHostBaseUnlock: not locked\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance));
    543543
    544544    RTCritSectLeave(&pThis->CritSect);
    545     LogFlow(("%s-%d: drvHostBaseUnlock: returns %Rrc\n", pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, rc));
     545    LogFlow(("%s-%d: drvHostBaseUnlock: returns %Rrc\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, rc));
    546546    return rc;
    547547}
    … …  
    706706                     * Try claim the device.
    707707                     */
    708                     Log(("%s-%d: calling DADiskClaim on '%s'.\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance, szName));
     708                    Log(("%s-%d: calling DADiskClaim on '%s'.\n", pDrvIns->pReg->szName, pDrvIns->iInstance, szName));
    709709                    int rcDA = -2;
    710710                    DADiskClaim(pThis->pDADisk, kDADiskClaimOptionDefault, NULL, NULL, drvHostBaseDADoneCallback, &rcDA);
    … …  
    717717                         * Try unmount the device.
    718718                         */
    719                         Log(("%s-%d: calling DADiskUnmount on '%s'.\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance, szName));
     719                        Log(("%s-%d: calling DADiskUnmount on '%s'.\n", pDrvIns->pReg->szName, pDrvIns->iInstance, szName));
    720720                        rcDA = -2;
    721721                        DADiskUnmount(pThis->pDADisk, kDADiskUnmountOptionWhole, drvHostBaseDADoneCallback, &rcDA);
    … …  
    727727                            iTry = 99;
    728728                            DASessionUnscheduleFromRunLoop(pThis->pDASession, CFRunLoopGetCurrent(), MY_RUN_LOOP_MODE);
    729                             Log(("%s-%d: unmount succeed - retrying.\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance));
     729                            Log(("%s-%d: unmount succeed - retrying.\n", pDrvIns->pReg->szName, pDrvIns->iInstance));
    730730                            continue;
    731731                        }
    732                         Log(("%s-%d: umount => rc32=%d & rcDA=%#x\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance, rc32, rcDA));
     732                        Log(("%s-%d: umount => rc32=%d & rcDA=%#x\n", pDrvIns->pReg->szName, pDrvIns->iInstance, rc32, rcDA));
    733733
    734734                        /* failed - cleanup */
    … …  
    736736                    }
    737737                    else
    738                         Log(("%s-%d: claim => rc32=%d & rcDA=%#x\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance, rc32, rcDA));
     738                        Log(("%s-%d: claim => rc32=%d & rcDA=%#x\n", pDrvIns->pReg->szName, pDrvIns->iInstance, rc32, rcDA));
    739739
    740740                    CFRelease(pThis->pDADisk);
    … …  
    742742                }
    743743                else
    744                     Log(("%s-%d: failed to open disk '%s'!\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance, szName));
     744                    Log(("%s-%d: failed to open disk '%s'!\n", pDrvIns->pReg->szName, pDrvIns->iInstance, szName));
    745745
    746746                DASessionUnscheduleFromRunLoop(pThis->pDASession, CFRunLoopGetCurrent(), MY_RUN_LOOP_MODE);
    … …  
    749749            }
    750750            else
    751                 Log(("%s-%d: failed to create DA session!\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance));
     751                Log(("%s-%d: failed to create DA session!\n", pDrvIns->pReg->szName, pDrvIns->iInstance));
    752752        }
    753753        RTThreadSleep(10);
    … …  
    10731073{
    10741074#ifndef RT_OS_DARWIN /* Only *one* open for darwin. */
    1075     LogFlow(("%s-%d: drvHostBaseReopen: '%s'\n", pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, pThis->pszDeviceOpen));
     1075    LogFlow(("%s-%d: drvHostBaseReopen: '%s'\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pThis->pszDeviceOpen));
    10761076
    10771077    RTFILE FileDevice;
    … …  
    10961096        if (!pThis->fReadOnlyConfig)
    10971097        {
    1098             LogFlow(("%s-%d: drvHostBaseReopen: '%s' - retry readonly (%Rrc)\n", pThis->pDrvIns->pReg->szDriverName, 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));
    10991099#ifdef RT_OS_SOLARIS
    11001100            rc = drvHostBaseOpen(pThis, &FileDevice, &FileRawDevice, false);
    … …  
    11061106        {
    11071107            LogFlow(("%s-%d: failed to open device '%s', rc=%Rrc\n",
    1108                      pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, pThis->pszDevice, rc));
     1108                     pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pThis->pszDevice, rc));
    11091109            return rc;
    11101110        }
    … …  
    14361436    {
    14371437        LogFlow(("%s-%d: failed to figure media size of %s, rc=%Rrc\n",
    1438                  pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, pThis->pszDevice, rc));
     1438                 pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pThis->pszDevice, rc));
    14391439        return rc;
    14401440    }
    … …  
    14481448        pThis->pDrvMountNotify->pfnMountNotify(pThis->pDrvMountNotify);
    14491449    LogFlow(("%s-%d: drvHostBaseMediaPresent: cbSize=%lld (%#llx)\n",
    1450              pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, pThis->cbSize, pThis->cbSize));
     1450             pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pThis->cbSize, pThis->cbSize));
    14511451    return VINF_SUCCESS;
    14521452}
    … …  
    15431543    PDRVHOSTBASE pThis = (PDRVHOSTBASE)pvUser;
    15441544    LogFlow(("%s-%d: drvHostBaseMediaThread: ThreadSelf=%p pvUser=%p\n",
    1545              pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, ThreadSelf, pvUser));
     1545             pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, ThreadSelf, pvUser));
    15461546#ifdef RT_OS_WINDOWS
    15471547    static WNDCLASS s_classDeviceChange = {0};
    … …  
    15761576    if (!hwnd)
    15771577    {
    1578         LogFlow(("%s-%d: drvHostBaseMediaThread: returns VERR_GENERAL_FAILURE\n", pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance));
     1578        LogFlow(("%s-%d: drvHostBaseMediaThread: returns VERR_GENERAL_FAILURE\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance));
    15791579        return VERR_GENERAL_FAILURE;
    15801580    }
    1581     LogFlow(("%s-%d: drvHostBaseMediaThread: Created hwndDeviceChange=%p\n", pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance, hwnd));
     1581    LogFlow(("%s-%d: drvHostBaseMediaThread: Created hwndDeviceChange=%p\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, hwnd));
    15821582
    15831583    /*
    … …  
    16441644
    16451645    /* (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->szDriverName, pThis->pDrvIns->iInstance));
     1646    LogFlow(("%s-%d: drvHostBaseMediaThread: returns VINF_SUCCESS\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance));
    16471647    return VINF_SUCCESS;
    16481648}
    … …  
    16611661{
    16621662    PDRVHOSTBASE pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTBASE);
    1663     LogFlow(("%s-%d: drvHostBaseMediaThread:\n", pThis->pDrvIns->pReg->szDriverName, pThis->pDrvIns->iInstance));
     1663    LogFlow(("%s-%d: drvHostBaseMediaThread:\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance));
    16641664    RTCritSectEnter(&pThis->CritSect);
    16651665
    … …  
    16831683{
    16841684    PDRVHOSTBASE pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTBASE);
    1685     LogFlow(("%s-%d: drvHostBaseDestruct: iInstance=%d\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance, pDrvIns->iInstance));
     1685    LogFlow(("%s-%d: drvHostBaseDestruct: iInstance=%d\n", pDrvIns->pReg->szName, pDrvIns->iInstance, pDrvIns->iInstance));
    16861686
    16871687    /*
    … …  
    17581758    if (pThis->ppScsiTaskDI)
    17591759    {
    1760         LogFlow(("%s-%d: releasing exclusive scsi access!\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance));
     1760        LogFlow(("%s-%d: releasing exclusive scsi access!\n", pDrvIns->pReg->szName, pDrvIns->iInstance));
    17611761        (*pThis->ppScsiTaskDI)->ReleaseExclusiveAccess(pThis->ppScsiTaskDI);
    17621762        (*pThis->ppScsiTaskDI)->Release(pThis->ppScsiTaskDI);
    … …  
    17651765    if (pThis->pDADisk)
    17661766    {
    1767         LogFlow(("%s-%d: unclaiming the disk!\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance));
     1767        LogFlow(("%s-%d: unclaiming the disk!\n", pDrvIns->pReg->szName, pDrvIns->iInstance));
    17681768        DADiskUnclaim(pThis->pDADisk);
    17691769        CFRelease(pThis->pDADisk);
    … …  
    17721772    if (pThis->ppMMCDI)
    17731773    {
    1774         LogFlow(("%s-%d: releasing the MMC object!\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance));
     1774        LogFlow(("%s-%d: releasing the MMC object!\n", pDrvIns->pReg->szName, pDrvIns->iInstance));
    17751775        (*pThis->ppMMCDI)->Release(pThis->ppMMCDI);
    17761776        pThis->ppMMCDI = NULL;
    … …  
    17831783    if (pThis->pDASession)
    17841784    {
    1785         LogFlow(("%s-%d: releasing the DA session!\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance));
     1785        LogFlow(("%s-%d: releasing the DA session!\n", pDrvIns->pReg->szName, pDrvIns->iInstance));
    17861786        CFRelease(pThis->pDASession);
    17871787        pThis->pDASession = NULL;
    … …  
    18301830    if (!pThis->fKeepInstance && RTCritSectIsInitialized(&pThis->CritSect))
    18311831        RTCritSectDelete(&pThis->CritSect);
    1832     LogFlow(("%s-%d: drvHostBaseDestruct completed\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance));
     1832    LogFlow(("%s-%d: drvHostBaseDestruct completed\n", pDrvIns->pReg->szName, pDrvIns->iInstance));
    18331833}
    18341834
    … …  
    18501850{
    18511851    PDRVHOSTBASE pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTBASE);
    1852     LogFlow(("%s-%d: DRVHostBaseInitData: iInstance=%d\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance, pDrvIns->iInstance));
     1852    LogFlow(("%s-%d: DRVHostBaseInitData: iInstance=%d\n", pDrvIns->pReg->szName, pDrvIns->iInstance, pDrvIns->iInstance));
    18531853
    18541854    /*
    … …  
    20452045    /* log config summary */
    20462046    Log(("%s-%d: pszDevice='%s' (%s) cMilliesPoller=%d fReadOnlyConfig=%d fLocked=%d fBIOSVisible=%d Uuid=%RTuuid\n",
    2047          pDrvIns->pReg->szDriverName, pDrvIns->iInstance, pThis->pszDevice, pThis->pszDeviceOpen, pThis->cMilliesPoller,
     2047         pDrvIns->pReg->szName, pDrvIns->iInstance, pThis->pszDevice, pThis->pszDeviceOpen, pThis->cMilliesPoller,
    20482048         pThis->fReadOnlyConfig, pThis->fLocked, pThis->fBiosVisible, &pThis->Uuid));
    20492049

  • trunk/src/VBox/Devices/Storage/DrvHostDVD.cpp

    r25893 r26166  
    828828    /* u32Version */
    829829    PDM_DRVREG_VERSION,
    830     /* szDriverName */
     830    /* szName */
    831831    "HostDVD",
    832832    /* szRCMod */

  • trunk/src/VBox/Devices/Storage/DrvHostFloppy.cpp

    r25893 r26166  
    202202    /* u32Version */
    203203    PDM_DRVREG_VERSION,
    204     /* szDriverName */
     204    /* szName */
    205205    "HostFloppy",
    206206    /* szRCMod */

  • trunk/src/VBox/Devices/Storage/DrvMediaISO.cpp

    r26001 r26166  
    293293    /* u32Version */
    294294    PDM_DRVREG_VERSION,
    295     /* szDriverName */
     295    /* szName */
    296296    "MediaISO",
    297297    /* szRCMod */

  • trunk/src/VBox/Devices/Storage/DrvRawImage.cpp

    r26001 r26166  
    345345    /* u32Version */
    346346    PDM_DRVREG_VERSION,
    347     /* szDriverName */
     347    /* szName */
    348348    "RawImage",
    349349    /* szRCMod */

  • trunk/src/VBox/Devices/Storage/DrvSCSI.cpp

    r26001 r26166  
    10251025    /* u32Version */
    10261026    PDM_DRVREG_VERSION,
    1027     /* szDriverName */
     1027    /* szName */
    10281028    "SCSI",
    10291029    /* szRCMod */

  • trunk/src/VBox/Devices/Storage/DrvSCSIHost.cpp

    r26001 r26166  
    498498    /* u32Version */
    499499    PDM_DRVREG_VERSION,
    500     /* szDriverName */
     500    /* szName */
    501501    "SCSIHost",
    502502    /* szRCMod */

  • trunk/src/VBox/Devices/Storage/DrvVD.cpp

    r26147 r26166  
    13341334    /* u32Version */
    13351335    PDM_DRVREG_VERSION,
    1336     /* szDriverName */
     1336    /* szName */
    13371337    "VD",
    13381338    /* szRCMod */

  • trunk/src/VBox/Frontends/VBoxBFE/DisplayImpl.cpp

    r26001 r26166  
    12401240    /* u32Version */
    12411241    PDM_DRVREG_VERSION,
    1242     /* szDriverName */
     1242    /* szName */
    12431243    "MainDisplay",
    12441244    /* szRCMod */

  • trunk/src/VBox/Frontends/VBoxBFE/KeyboardImpl.cpp

    r25971 r26166  
    257257    /* u32Version */
    258258    PDM_DRVREG_VERSION,
    259     /* szDriverName */
     259    /* szName */
    260260    "MainKeyboard",
    261261    /* szRCMod */

  • trunk/src/VBox/Frontends/VBoxBFE/MouseImpl.cpp

    r25969 r26166  
    262262    /* u32Version */
    263263    PDM_DRVREG_VERSION,
    264     /* szDriverName */
     264    /* szName */
    265265    "MainMouse",
    266266    /* szRCMod */

  • trunk/src/VBox/Frontends/VBoxBFE/StatusImpl.cpp

    r25984 r26166  
    197197    /* u32Version */
    198198    PDM_DRVREG_VERSION,
    199     /* szDriverName */
     199    /* szName */
    200200    "MainStatus",
    201201    /* szRCMod */

  • trunk/src/VBox/Frontends/VBoxBFE/VMMDevInterface.cpp

    r25984 r26166  
    477477    /* u32Version */
    478478    PDM_DRVREG_VERSION,
    479     /* szDriverName */
     479    /* szName */
    480480    "HGCM",
    481481    /* szRCMod */

  • trunk/src/VBox/Main/AudioSnifferInterface.cpp

    r26001 r26166  
    213213    /* u32Version */
    214214    PDM_DRVREG_VERSION,
    215     /* szDriverName */
     215    /* szName */
    216216    "MainAudioSniffer",
    217217    /* szRCMod */

  • trunk/src/VBox/Main/ConsoleImpl.cpp

    r26068 r26166  
    82388238    /* u32Version */
    82398239    PDM_DRVREG_VERSION,
    8240     /* szDriverName */
     8240    /* szName */
    82418241    "MainStatus",
    82428242    /* szRCMod */

  • trunk/src/VBox/Main/DisplayImpl.cpp

    r26004 r26166  
    34993499    /* u32Version */
    35003500    PDM_DRVREG_VERSION,
    3501     /* szDriverName */
     3501    /* szName */
    35023502    "MainDisplay",
    35033503    /* szRCMod */

  • trunk/src/VBox/Main/KeyboardImpl.cpp

    r26001 r26166  
    321321    /* u32Version */
    322322    PDM_DRVREG_VERSION,
    323     /* szDriverName */
     323    /* szName */
    324324    "MainKeyboard",
    325325    /* szRCMod */

  • trunk/src/VBox/Main/MouseImpl.cpp

    r26001 r26166  
    446446    /* u32Version */
    447447    PDM_DRVREG_VERSION,
    448     /* szDriverName */
     448    /* szName */
    449449    "MainMouse",
    450450    /* szRCMod */

  • trunk/src/VBox/Main/VMMDevInterface.cpp

    r25985 r26166  
    819819    /* u32Version */
    820820    PDM_DRVREG_VERSION,
    821     /* szDriverName */
     821    /* szName */
    822822    "HGCM",
    823823    /* szRCMod */

  • trunk/src/VBox/VMM/PDM.cpp

    r26165 r26166  
    504504            {
    505505                LogFlow(("pdmR3DevTerm: Destroying - driver '%s'/%d on LUN#%d of device '%s'/%d\n",
    506                          pDrvIns->pReg->szDriverName, pDrvIns->iInstance, pLun->iLun, pszDevice, iInstance));
     506                         pDrvIns->pReg->szName, pDrvIns->iInstance, pLun->iLun, pszDevice, iInstance));
    507507                pDrvIns->pReg->pfnDestruct(pDrvIns);
    508508            }
    … …  
    926926    {
    927927        LogFlow(("PDMR3PowerOn: Notifying - driver '%s'/%d on LUN#%d of device '%s'/%d\n",
    928                  pDrvIns->pReg->szDriverName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
     928                 pDrvIns->pReg->szName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
    929929        int rc = VINF_SUCCESS; pDrvIns->pReg->pfnPowerOn(pDrvIns);
    930930        if (RT_FAILURE(rc))
    931931        {
    932932            LogRel(("PDMR3PowerOn: driver '%s'/%d on LUN#%d of device '%s'/%d -> %Rrc\n",
    933                     pDrvIns->pReg->szDriverName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance, rc));
     933                    pDrvIns->pReg->szName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance, rc));
    934934            return rc;
    935935        }
    … …  
    10601060            {
    10611061                LogFlow(("PDMR3Reset: Notifying - driver '%s'/%d on LUN#%d of device '%s'/%d\n",
    1062                          pDrvIns->pReg->szDriverName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
     1062                         pDrvIns->pReg->szName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
    10631063                pDrvIns->pReg->pfnReset(pDrvIns);
    10641064                if (pDrvIns->Internal.s.pfnAsyncNotify)
    10651065                    LogFlow(("PDMR3Reset: Async notification started - driver '%s'/%d on LUN#%d of device '%s'/%d\n",
    1066                              pDrvIns->pReg->szDriverName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
     1066                             pDrvIns->pReg->szName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
    10671067            }
    10681068            else if (pDrvIns->Internal.s.pfnAsyncNotify(pDrvIns))
    … …  
    10701070                pDrvIns->Internal.s.pfnAsyncNotify = false;
    10711071                LogFlow(("PDMR3Reset: Async notification completed - driver '%s'/%d on LUN#%d of device '%s'/%d\n",
    1072                          pDrvIns->pReg->szDriverName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
     1072                         pDrvIns->pReg->szName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
    10731073            }
    10741074            if (pDrvIns->Internal.s.pfnAsyncNotify)
    … …  
    12861286            {
    12871287                LogFlow(("PDMR3Suspend: Notifying - driver '%s'/%d on LUN#%d of device '%s'/%d\n",
    1288                          pDrvIns->pReg->szDriverName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
     1288                         pDrvIns->pReg->szName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
    12891289                pDrvIns->pReg->pfnSuspend(pDrvIns);
    12901290                if (pDrvIns->Internal.s.pfnAsyncNotify)
    12911291                    LogFlow(("PDMR3Suspend: Async notification started - driver '%s'/%d on LUN#%d of device '%s'/%d\n",
    1292                              pDrvIns->pReg->szDriverName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
     1292                             pDrvIns->pReg->szName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
    12931293            }
    12941294            else if (pDrvIns->Internal.s.pfnAsyncNotify(pDrvIns))
    … …  
    12961296                pDrvIns->Internal.s.pfnAsyncNotify = false;
    12971297                LogFlow(("PDMR3Suspend: Async notification completed - driver '%s'/%d on LUN#%d of device '%s'/%d\n",
    1298                          pDrvIns->pReg->szDriverName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
     1298                         pDrvIns->pReg->szName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
    12991299            }
    13001300            if (pDrvIns->Internal.s.pfnAsyncNotify)
    … …  
    14841484    {
    14851485        LogFlow(("PDMR3Resume: Notifying - driver '%s'/%d on LUN#%d of device '%s'/%d\n",
    1486                  pDrvIns->pReg->szDriverName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
     1486                 pDrvIns->pReg->szName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
    14871487        int rc = VINF_SUCCESS; pDrvIns->pReg->pfnResume(pDrvIns);
    14881488        if (RT_FAILURE(rc))
    14891489        {
    14901490            LogRel(("PDMR3Resume: driver '%s'/%d on LUN#%d of device '%s'/%d -> %Rrc\n",
    1491                     pDrvIns->pReg->szDriverName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance, rc));
     1491                    pDrvIns->pReg->szName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance, rc));
    14921492            return rc;
    14931493        }
    … …  
    16181618            {
    16191619                LogFlow(("PDMR3PowerOff: Notifying - driver '%s'/%d on LUN#%d of device '%s'/%d\n",
    1620                          pDrvIns->pReg->szDriverName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
     1620                         pDrvIns->pReg->szName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
    16211621                pDrvIns->pReg->pfnPowerOff(pDrvIns);
    16221622                if (pDrvIns->Internal.s.pfnAsyncNotify)
    16231623                    LogFlow(("PDMR3PowerOff: Async notification started - driver '%s'/%d on LUN#%d of device '%s'/%d\n",
    1624                              pDrvIns->pReg->szDriverName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
     1624                             pDrvIns->pReg->szName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
    16251625            }
    16261626            else if (pDrvIns->Internal.s.pfnAsyncNotify(pDrvIns))
    … …  
    16281628                pDrvIns->Internal.s.pfnAsyncNotify = false;
    16291629                LogFlow(("PDMR3PowerOff: Async notification completed - driver '%s'/%d on LUN#%d of device '%s'/%d\n",
    1630                          pDrvIns->pReg->szDriverName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
     1630                         pDrvIns->pReg->szName, pDrvIns->iInstance, iLun, pszDeviceName, iDevInstance));
    16311631            }
    16321632            if (pDrvIns->Internal.s.pfnAsyncNotify)

  • trunk/src/VBox/VMM/PDMDevice.cpp

    r26165 r26166  
    938938                while (pDrvIns)
    939939                {
    940                     if (!strcmp(pDrvIns->pReg->szDriverName, pszDriver))
     940                    if (!strcmp(pDrvIns->pReg->szName, pszDriver))
    941941                    {
    942942                        if (iOccurance == 0)

  • trunk/src/VBox/VMM/PDMDriver.cpp

    r26165 r26166  
    279279                    ("%#x\n", pReg->u32Version),
    280280                    VERR_PDM_UNKNOWN_DRVREG_VERSION);
    281     AssertReturn(pReg->szDriverName[0], VERR_PDM_INVALID_DRIVER_REGISTRATION);
    282     AssertMsgReturn(memchr(pReg->szDriverName, '\0', sizeof(pReg->szDriverName)),
    283                     (".*s\n", sizeof(pReg->szDriverName), pReg->szDriverName),
     281    AssertReturn(pReg->szName[0], VERR_PDM_INVALID_DRIVER_REGISTRATION);
     282    AssertMsgReturn(memchr(pReg->szName, '\0', sizeof(pReg->szName)),
     283                    (".*s\n", sizeof(pReg->szName), pReg->szName),
    284284                    VERR_PDM_INVALID_DRIVER_REGISTRATION);
    285285    AssertMsgReturn(    !(pReg->fFlags & PDM_DRVREG_FLAGS_R0)
    286286                    ||  (   pReg->szR0Mod[0]
    287287                         && memchr(pReg->szR0Mod, '\0', sizeof(pReg->szR0Mod))),
    288                     ("%s: %.*s\n", pReg->szDriverName, sizeof(pReg->szR0Mod), pReg->szR0Mod),
     288                    ("%s: %.*s\n", pReg->szName, sizeof(pReg->szR0Mod), pReg->szR0Mod),
    289289                    VERR_PDM_INVALID_DRIVER_REGISTRATION);
    290290    AssertMsgReturn(    !(pReg->fFlags & PDM_DRVREG_FLAGS_RC)
    291291                    ||  (   pReg->szRCMod[0]
    292292                         && memchr(pReg->szRCMod, '\0', sizeof(pReg->szRCMod))),
    293                     ("%s: %.*s\n", pReg->szDriverName, sizeof(pReg->szRCMod), pReg->szRCMod),
     293                    ("%s: %.*s\n", pReg->szName, sizeof(pReg->szRCMod), pReg->szRCMod),
    294294                    VERR_PDM_INVALID_DRIVER_REGISTRATION);
    295295    AssertMsgReturn(VALID_PTR(pReg->pszDescription),
    296                     ("%s: %p\n", pReg->szDriverName, pReg->pszDescription),
     296                    ("%s: %p\n", pReg->szName, pReg->pszDescription),
    297297                    VERR_PDM_INVALID_DRIVER_REGISTRATION);
    298298    AssertMsgReturn(!(pReg->fFlags & ~(PDM_DRVREG_FLAGS_HOST_BITS_MASK | PDM_DRVREG_FLAGS_R0 | PDM_DRVREG_FLAGS_RC)),
    299                     ("%s: %#x\n", pReg->szDriverName, pReg->fFlags),
     299                    ("%s: %#x\n", pReg->szName, pReg->fFlags),
    300300                    VERR_PDM_INVALID_DRIVER_REGISTRATION);
    301301    AssertMsgReturn((pReg->fFlags & PDM_DRVREG_FLAGS_HOST_BITS_MASK) == PDM_DRVREG_FLAGS_HOST_BITS_DEFAULT,
    302                     ("%s: %#x\n", pReg->szDriverName, pReg->fFlags),
     302                    ("%s: %#x\n", pReg->szName, pReg->fFlags),
    303303                    VERR_PDM_INVALID_DRIVER_HOST_BITS);
    304304    AssertMsgReturn(pReg->cMaxInstances > 0,
    305                     ("%s: %#x\n", pReg->szDriverName, pReg->cMaxInstances),
     305                    ("%s: %#x\n", pReg->szName, pReg->cMaxInstances),
    306306                    VERR_PDM_INVALID_DRIVER_REGISTRATION);
    307307    AssertMsgReturn(pReg->cbInstance <= _1M,
    308                     ("%s: %#x\n", pReg->szDriverName, pReg->cbInstance),
     308                    ("%s: %#x\n", pReg->szName, pReg->cbInstance),
    309309                    VERR_PDM_INVALID_DRIVER_REGISTRATION);
    310310    AssertMsgReturn(VALID_PTR(pReg->pfnConstruct),
    311                     ("%s: %p\n", pReg->szDriverName, pReg->pfnConstruct),
     311                    ("%s: %p\n", pReg->szName, pReg->pfnConstruct),
    312312                    VERR_PDM_INVALID_DRIVER_REGISTRATION);
    313313    AssertMsgReturn(VALID_PTR(pReg->pfnRelocate) || !(pReg->fFlags & PDM_DRVREG_FLAGS_RC),
    314                     ("%s: %#x\n", pReg->szDriverName, pReg->cbInstance),
     314                    ("%s: %#x\n", pReg->szName, pReg->cbInstance),
    315315                    VERR_PDM_INVALID_DRIVER_REGISTRATION);
    316316    AssertMsgReturn(pReg->pfnSoftReset == NULL,
    317                     ("%s: %p\n", pReg->szDriverName, pReg->pfnSoftReset),
     317                    ("%s: %p\n", pReg->szName, pReg->pfnSoftReset),
    318318                    VERR_PDM_INVALID_DRIVER_REGISTRATION);
    319319    AssertMsgReturn(pReg->u32VersionEnd == PDM_DRVREG_VERSION,
    320                     ("%s: #x\n", pReg->szDriverName, pReg->u32VersionEnd),
     320                    ("%s: #x\n", pReg->szName, pReg->u32VersionEnd),
    321321                    VERR_PDM_INVALID_DRIVER_REGISTRATION);
    322322
    … …  
    329329    for (; pDrv; pDrvPrev = pDrv, pDrv = pDrv->pNext)
    330330    {
    331         if (!strcmp(pDrv->pReg->szDriverName, pReg->szDriverName))
    332         {
    333             AssertMsgFailed(("Driver '%s' already exists\n", pReg->szDriverName));
     331        if (!strcmp(pDrv->pReg->szName, pReg->szName))
     332        {
     333            AssertMsgFailed(("Driver '%s' already exists\n", pReg->szName));
    334334            return VERR_PDM_DRIVER_NAME_CLASH;
    335335        }
    … …  
    351351        else
    352352            pRegCB->pVM->pdm.s.pDrvs = pDrv;
    353         Log(("PDM: Registered driver '%s'\n", pReg->szDriverName));
     353        Log(("PDM: Registered driver '%s'\n", pReg->szName));
    354354        return VINF_SUCCESS;
    355355    }
    … …  
    365365{
    366366    for (PPDMDRV pDrv = pVM->pdm.s.pDrvs; pDrv; pDrv = pDrv->pNext)
    367         if (!strcmp(pDrv->pReg->szDriverName, pszName))
     367        if (!strcmp(pDrv->pReg->szName, pszName))
    368368            return pDrv;
    369369    return NULL;
    … …  
    500500                        if (pLun)
    501501                            Log(("PDM: Attached driver %p:'%s'/%d to LUN#%d on device '%s'/%d, pDrvAbove=%p:'%s'/%d\n",
    502                                  pNew, pDrv->pReg->szDriverName, pNew->iInstance,
     502                                 pNew, pDrv->pReg->szName, pNew->iInstance,
    503503                                 pLun->iLun,
    504504                                 pLun->pDevIns ? pLun->pDevIns->pReg->szName : pLun->pUsbIns->pReg->szName,
    505505                                 pLun->pDevIns ? pLun->pDevIns->iInstance             : pLun->pUsbIns->iInstance,
    506                                  pDrvAbove, pDrvAbove ? pDrvAbove->pReg->szDriverName : "", pDrvAbove ? pDrvAbove->iInstance : -1));
     506                                 pDrvAbove, pDrvAbove ? pDrvAbove->pReg->szName : "", pDrvAbove ? pDrvAbove->iInstance : -1));
    507507                        else
    508508                            Log(("PDM: Attached driver %p:'%s'/%d, pDrvAbove=%p:'%s'/%d\n",
    509                                  pNew, pDrv->pReg->szDriverName, pNew->iInstance,
    510                                  pDrvAbove, pDrvAbove ? pDrvAbove->pReg->szDriverName : "", pDrvAbove ? pDrvAbove->iInstance : -1));
     509                                 pNew, pDrv->pReg->szName, pNew->iInstance,
     510                                 pDrvAbove, pDrvAbove ? pDrvAbove->pReg->szName : "", pDrvAbove ? pDrvAbove->iInstance : -1));
    511511                    }
    512512                    else
    … …  
    554554{
    555555    PDMDRV_ASSERT_DRVINS(pDrvIns);
    556     LogFlow(("pdmR3DrvDetach: pDrvIns=%p '%s'/%d\n", pDrvIns, pDrvIns->pReg->szDriverName, pDrvIns->iInstance));
     556    LogFlow(("pdmR3DrvDetach: pDrvIns=%p '%s'/%d\n", pDrvIns, pDrvIns->pReg->szName, pDrvIns->iInstance));
    557557    VM_ASSERT_EMT(pDrvIns->Internal.s.pVMR3);
    558558
    … …  
    562562    if (pDrvIns->Internal.s.fDetaching)
    563563    {
    564         AssertMsgFailed(("Recursive detach! '%s'/%d\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance));
     564        AssertMsgFailed(("Recursive detach! '%s'/%d\n", pDrvIns->pReg->szName, pDrvIns->iInstance));
    565565        return VINF_SUCCESS;           }
    566566
    … …  
    610610        while (pCur->Internal.s.pDown)
    611611            pCur = pCur->Internal.s.pDown;
    612         LogFlow(("pdmR3DrvDestroyChain: pCur=%p '%s'/%d\n", pCur, pCur->pReg->szDriverName, pCur->iInstance));
     612        LogFlow(("pdmR3DrvDestroyChain: pCur=%p '%s'/%d\n", pCur, pCur->pReg->szName, pCur->iInstance));
    613613
    614614        /*
    … …  
    693693    PVM pVM = pDrvIns->Internal.s.pVMR3;
    694694    VM_ASSERT_EMT(pVM);
    695     LogFlow(("pdmR3DrvHlp_Attach: caller='%s'/%d: fFlags=%#x\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance, fFlags));
     695    LogFlow(("pdmR3DrvHlp_Attach: caller='%s'/%d: fFlags=%#x\n", pDrvIns->pReg->szName, pDrvIns->iInstance, fFlags));
    696696    Assert(!(fFlags & ~(PDM_TACH_FLAGS_NOT_HOT_PLUG)));
    697697
    … …  
    720720
    721721    LogFlow(("pdmR3DrvHlp_Attach: caller='%s'/%d: return %Rrc\n",
    722              pDrvIns->pReg->szDriverName, pDrvIns->iInstance, rc));
     722             pDrvIns->pReg->szName, pDrvIns->iInstance, rc));
    723723    return rc;
    724724}
    … …  
    730730    PDMDRV_ASSERT_DRVINS(pDrvIns);
    731731    LogFlow(("pdmR3DrvHlp_Detach: caller='%s'/%d: fFlags=%#x\n",
    732              pDrvIns->pReg->szDriverName, pDrvIns->iInstance, fFlags));
     732             pDrvIns->pReg->szName, pDrvIns->iInstance, fFlags));
    733733    VM_ASSERT_EMT(pDrvIns->Internal.s.pVMR3);
    734734
    … …  
    746746
    747747    LogFlow(("pdmR3DrvHlp_Detach: caller='%s'/%d: returns %Rrc\n",
    748              pDrvIns->pReg->szDriverName, pDrvIns->iInstance, rc));
     748             pDrvIns->pReg->szName, pDrvIns->iInstance, rc));
    749749    return rc;
    750750}
    … …  
    756756    PDMDRV_ASSERT_DRVINS(pDrvIns);
    757757    LogFlow(("pdmR3DrvHlp_DetachSelf: caller='%s'/%d: fFlags=%#x\n",
    758              pDrvIns->pReg->szDriverName, pDrvIns->iInstance, fFlags));
     758             pDrvIns->pReg->szName, pDrvIns->iInstance, fFlags));
    759759    VM_ASSERT_EMT(pDrvIns->Internal.s.pVMR3);
    760760
    … …  
    771771    PDMDRV_ASSERT_DRVINS(pDrvIns);
    772772    LogFlow(("pdmR3DrvHlp_MountPrepare: caller='%s'/%d: pszFilename=%p:{%s} pszCoreDriver=%p:{%s}\n",
    773              pDrvIns->pReg->szDriverName, pDrvIns->iInstance, pszFilename, pszFilename, pszCoreDriver, pszCoreDriver));
     773             pDrvIns->pReg->szName, pDrvIns->iInstance, pszFilename, pszFilename, pszCoreDriver, pszCoreDriver));
    774774    VM_ASSERT_EMT(pDrvIns->Internal.s.pVMR3);
    775775
    … …  
    818818                {
    819819                    LogFlow(("pdmR3DrvHlp_MountPrepare: caller='%s'/%d: returns %Rrc (Driver=%s)\n",
    820                              pDrvIns->pReg->szDriverName, pDrvIns->iInstance, rc, pszCoreDriver));
     820                             pDrvIns->pReg->szName, pDrvIns->iInstance, rc, pszCoreDriver));
    821821                    return rc;
    822822                }
    … …  
    835835
    836836    LogFlow(("pdmR3DrvHlp_MountPrepare: caller='%s'/%d: returns %Rrc\n",
    837              pDrvIns->pReg->szDriverName, pDrvIns->iInstance, rc));
     837             pDrvIns->pReg->szName, pDrvIns->iInstance, rc));
    838838    return rc;
    839839}
    … …  
    848848
    849849    char szMsg[100];
    850     RTStrPrintf(szMsg, sizeof(szMsg), "AssertEMT '%s'/%d\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance);
     850    RTStrPrintf(szMsg, sizeof(szMsg), "AssertEMT '%s'/%d\n", pDrvIns->pReg->szName, pDrvIns->iInstance);
    851851    RTAssertMsg1Weak(szMsg, iLine, pszFile, pszFunction);
    852852    AssertBreakpoint();
    … …  
    864864
    865865    char szMsg[100];
    866     RTStrPrintf(szMsg, sizeof(szMsg), "AssertOther '%s'/%d\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance);
     866    RTStrPrintf(szMsg, sizeof(szMsg), "AssertOther '%s'/%d\n", pDrvIns->pReg->szName, pDrvIns->iInstance);
    867867    RTAssertMsg1Weak(szMsg, iLine, pszFile, pszFunction);
    868868    AssertBreakpoint();
    … …  
    921921    VMSTATE enmVMState = VMR3GetState(pDrvIns->Internal.s.pVMR3);
    922922
    923     LogFlow(("pdmR3DrvHlp_VMState: caller='%s'/%d: returns %d (%s)\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance,
     923    LogFlow(("pdmR3DrvHlp_VMState: caller='%s'/%d: returns %d (%s)\n", pDrvIns->pReg->szName, pDrvIns->iInstance,
    924924             enmVMState, VMR3GetStateName(enmVMState)));
    925925    return enmVMState;
    … …  
    934934    bool fRc = VMR3TeleportedAndNotFullyResumedYet(pDrvIns->Internal.s.pVMR3);
    935935
    936     LogFlow(("pdmR3DrvHlp_VMState: caller='%s'/%d: returns %RTbool)\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance,
     936    LogFlow(("pdmR3DrvHlp_VMState: caller='%s'/%d: returns %RTbool)\n", pDrvIns->pReg->szName, pDrvIns->iInstance,
    937937             fRc));
    938938    return fRc;
    … …  
    946946    PDMDRV_ASSERT_DRVINS(pDrvIns);
    947947    LogFlow(("pdmR3DrvHlp_PDMQueueCreate: caller='%s'/%d: cbItem=%d cItems=%d cMilliesInterval=%d pfnCallback=%p pszName=%p:{%s} ppQueue=%p\n",
    948              pDrvIns->pReg->szDriverName, pDrvIns->iInstance, cbItem, cItems, cMilliesInterval, pfnCallback, pszName, pszName, ppQueue, ppQueue));
     948             pDrvIns->pReg->szName, pDrvIns->iInstance, cbItem, cItems, cMilliesInterval, pfnCallback, pszName, pszName, ppQueue, ppQueue));
    949949    PVM pVM = pDrvIns->Internal.s.pVMR3;
    950950    VM_ASSERT_EMT(pVM);
    … …  
    958958    int rc = PDMR3QueueCreateDriver(pVM, pDrvIns, cbItem, cItems, cMilliesInterval, pfnCallback, pszName, ppQueue);
    959959
    960     LogFlow(("pdmR3DrvHlp_PDMQueueCreate: caller='%s'/%d: returns %Rrc *ppQueue=%p\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance, rc, *ppQueue));
     960    LogFlow(("pdmR3DrvHlp_PDMQueueCreate: caller='%s'/%d: returns %Rrc *ppQueue=%p\n", pDrvIns->pReg->szName, pDrvIns->iInstance, rc, *ppQueue));
    961961    return rc;
    962962}
    … …  
    986986    PDMDRV_ASSERT_DRVINS(pDrvIns);
    987987    LogFlow(("pdmR3DrvHlp_TMTimerCreate: caller='%s'/%d: enmClock=%d pfnCallback=%p pvUser=%p fFlags=%#x pszDesc=%p:{%s} ppTimer=%p\n",
    988              pDrvIns->pReg->szDriverName, pDrvIns->iInstance, enmClock, pfnCallback, pvUser, fFlags, pszDesc, pszDesc, ppTimer));
     988             pDrvIns->pReg->szName, pDrvIns->iInstance, enmClock, pfnCallback, pvUser, fFlags, pszDesc, pszDesc, ppTimer));
    989989
    990990    int rc = TMR3TimerCreateDriver(pDrvIns->Internal.s.pVMR3, pDrvIns, enmClock, pfnCallback, pvUser, fFlags, pszDesc, ppTimer);
    991991
    992     LogFlow(("pdmR3DrvHlp_TMTimerCreate: caller='%s'/%d: returns %Rrc *ppTimer=%p\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance, rc, *ppTimer));
     992    LogFlow(("pdmR3DrvHlp_TMTimerCreate: caller='%s'/%d: returns %Rrc *ppTimer=%p\n", pDrvIns->pReg->szName, pDrvIns->iInstance, rc, *ppTimer));
    993993    return rc;
    994994}
    … …  
    10061006    LogFlow(("pdmR3DrvHlp_SSMRegister: caller='%s'/%d: uVersion=#x cbGuess=%#x \n"
    10071007             "    pfnLivePrep=%p pfnLiveExec=%p pfnLiveVote=%p  pfnSavePrep=%p pfnSaveExec=%p pfnSaveDone=%p pszLoadPrep=%p pfnLoadExec=%p pfnLoaddone=%p\n",
    1008              pDrvIns->pReg->szDriverName, pDrvIns->iInstance, uVersion, cbGuess,
     1008             pDrvIns->pReg->szName, pDrvIns->iInstance, uVersion, cbGuess,
    10091009             pfnLivePrep, pfnLiveExec, pfnLiveVote,
    10101010             pfnSavePrep, pfnSaveExec, pfnSaveDone, pfnLoadPrep, pfnLoadExec, pfnLoadDone));
    10111011
    1012     int rc = SSMR3RegisterDriver(pDrvIns->Internal.s.pVMR3, pDrvIns, pDrvIns->pReg->szDriverName, pDrvIns->iInstance,
     1012    int rc = SSMR3RegisterDriver(pDrvIns->Internal.s.pVMR3, pDrvIns, pDrvIns->pReg->szName, pDrvIns->iInstance,
    10131013                                 uVersion, cbGuess,
    10141014                                 pfnLivePrep, pfnLiveExec, pfnLiveVote,
    … …  
    10161016                                 pfnLoadPrep, pfnLoadExec, pfnLoadDone);
    10171017
    1018     LogFlow(("pdmR3DrvHlp_SSMRegister: caller='%s'/%d: returns %Rrc\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance, rc));
     1018    LogFlow(("pdmR3DrvHlp_SSMRegister: caller='%s'/%d: returns %Rrc\n", pDrvIns->pReg->szName, pDrvIns->iInstance, rc));
    10191019    return rc;
    10201020}
    … …  
    10271027    VM_ASSERT_EMT(pDrvIns->Internal.s.pVMR3);
    10281028    LogFlow(("pdmR3DrvHlp_SSMDeregister: caller='%s'/%d: pszName=%p:{%s} u32Instance=%#x\n",
    1029              pDrvIns->pReg->szDriverName, pDrvIns->iInstance, pszName, pszName, u32Instance));
     1029             pDrvIns->pReg->szName, pDrvIns->iInstance, pszName, pszName, u32Instance));
    10301030
    10311031    int rc = SSMR3DeregisterDriver(pDrvIns->Internal.s.pVMR3, pDrvIns, pszName, u32Instance);
    10321032
    1033     LogFlow(("pdmR3DrvHlp_SSMDeregister: caller='%s'/%d: returns %Rrc\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance, rc));
     1033    LogFlow(("pdmR3DrvHlp_SSMDeregister: caller='%s'/%d: returns %Rrc\n", pDrvIns->pReg->szName, pDrvIns->iInstance, rc));
    10341034    return rc;
    10351035}
    … …  
    10921092    PDMDRV_ASSERT_DRVINS(pDrvIns);
    10931093    LogFlow(("pdmR3DrvHlp_SSMCallVMMR0Ex: caller='%s'/%d: uOperation=%u pvArg=%p cbArg=%d\n",
    1094              pDrvIns->pReg->szDriverName, pDrvIns->iInstance, uOperation, pvArg, cbArg));
     1094             pDrvIns->pReg->szName, pDrvIns->iInstance, uOperation, pvArg, cbArg));
    10951095    int rc;
    10961096    if (    uOperation >= VMMR0_DO_SRV_START
    … …  
    11031103    }
    11041104
    1105     LogFlow(("pdmR3DrvHlp_SUPCallVMMR0Ex: caller='%s'/%d: returns %Rrc\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance, rc));
     1105    LogFlow(("pdmR3DrvHlp_SUPCallVMMR0Ex: caller='%s'/%d: returns %Rrc\n", pDrvIns->pReg->szName, pDrvIns->iInstance, rc));
    11061106    return rc;
    11071107}
    … …  
    11141114    VM_ASSERT_EMT(pDrvIns->Internal.s.pVMR3);
    11151115    LogFlow(("pdmR3DrvHlp_USBRegisterHub: caller='%s'/%d: fVersions=%#x cPorts=%#x pUsbHubReg=%p ppUsbHubHlp=%p\n",
    1116              pDrvIns->pReg->szDriverName, pDrvIns->iInstance, fVersions, cPorts, pUsbHubReg, ppUsbHubHlp));
     1116             pDrvIns->pReg->szName, pDrvIns->iInstance, fVersions, cPorts, pUsbHubReg, ppUsbHubHlp));
    11171117
    11181118#ifdef VBOX_WITH_USB
    … …  
    11221122#endif
    11231123
    1124     LogFlow(("pdmR3DrvHlp_USBRegisterHub: caller='%s'/%d: returns %Rrc\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance, rc));
     1124    LogFlow(("pdmR3DrvHlp_USBRegisterHub: caller='%s'/%d: returns %Rrc\n", pDrvIns->pReg->szName, pDrvIns->iInstance, rc));
    11251125    return rc;
    11261126}
    … …  
    11321132    PDMDRV_ASSERT_DRVINS(pDrvIns);
    11331133    VM_ASSERT_EMT0(pDrvIns->Internal.s.pVMR3);
    1134     LogFlow(("pdmR3DrvHlp_SetAsyncNotification: caller='%s'/%d: pfnAsyncNotify=%p\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance, pfnAsyncNotify));
     1134    LogFlow(("pdmR3DrvHlp_SetAsyncNotification: caller='%s'/%d: pfnAsyncNotify=%p\n", pDrvIns->pReg->szName, pDrvIns->iInstance, pfnAsyncNotify));
    11351135
    11361136    int rc = VINF_SUCCESS;
    … …  
    11511151        pDrvIns->Internal.s.pfnAsyncNotify = pfnAsyncNotify;
    11521152
    1153     LogFlow(("pdmR3DrvHlp_SetAsyncNotification: caller='%s'/%d: returns %Rrc\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance, rc));
     1153    LogFlow(("pdmR3DrvHlp_SetAsyncNotification: caller='%s'/%d: returns %Rrc\n", pDrvIns->pReg->szName, pDrvIns->iInstance, rc));
    11541154    return rc;
    11551155}
    … …  
    11711171        || enmVMState == VMSTATE_POWERING_OFF_LS)
    11721172    {
    1173         LogFlow(("pdmR3DrvHlp_AsyncNotificationCompleted: caller='%s'/%d:\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance));
     1173        LogFlow(("pdmR3DrvHlp_AsyncNotificationCompleted: caller='%s'/%d:\n", pDrvIns->pReg->szName, pDrvIns->iInstance));
    11741174        VMR3AsyncPdmNotificationWakeupU(pVM->pUVM);
    11751175    }
    11761176    else
    1177         LogFlow(("pdmR3DrvHlp_AsyncNotificationCompleted: caller='%s'/%d: enmVMState=%d\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance, enmVMState));
     1177        LogFlow(("pdmR3DrvHlp_AsyncNotificationCompleted: caller='%s'/%d: enmVMState=%d\n", pDrvIns->pReg->szName, pDrvIns->iInstance, enmVMState));
    11781178}
    11791179
    … …  
    11861186    VM_ASSERT_EMT(pDrvIns->Internal.s.pVMR3);
    11871187    LogFlow(("pdmR3DrvHlp_PDMThreadCreate: caller='%s'/%d: ppThread=%p pvUser=%p pfnThread=%p pfnWakeup=%p cbStack=%#zx enmType=%d pszName=%p:{%s}\n",
    1188              pDrvIns->pReg->szDriverName, pDrvIns->iInstance, ppThread, pvUser, pfnThread, pfnWakeup, cbStack, enmType, pszName, pszName));
     1188             pDrvIns->pReg->szName, pDrvIns->iInstance, ppThread, pvUser, pfnThread, pfnWakeup, cbStack, enmType, pszName, pszName));
    11891189
    11901190    int rc = pdmR3ThreadCreateDriver(pDrvIns->Internal.s.pVMR3, pDrvIns, ppThread, pvUser, pfnThread, pfnWakeup, cbStack, enmType, pszName);
    11911191
    1192     LogFlow(("pdmR3DrvHlp_PDMThreadCreate: caller='%s'/%d: returns %Rrc *ppThread=%RTthrd\n", pDrvIns->pReg->szDriverName, pDrvIns->iInstance,
     1192    LogFlow(("pdmR3DrvHlp_PDMThreadCreate: caller='%s'/%d: returns %Rrc *ppThread=%RTthrd\n", pDrvIns->pReg->szName, pDrvIns->iInstance,
    11931193            rc, *ppThread));
    11941194    return rc;
    … …  
    12041204    VM_ASSERT_EMT(pDrvIns->Internal.s.pVMR3);
    12051205    LogFlow(("pdmR3DrvHlp_PDMAsyncCompletionTemplateCreate: caller='%s'/%d: ppTemplate=%p pfnCompleted=%p pszDesc=%p:{%s}\n",
    1206              pDrvIns->pReg->szDriverName, pDrvIns->iInstance, ppTemplate, pfnCompleted, pszDesc, pszDesc));
     1206             pDrvIns->pReg->szName, pDrvIns->iInstance, ppTemplate, pfnCompleted, pszDesc, pszDesc));
    12071207
    12081208    int rc = PDMR3AsyncCompletionTemplateCreateDriver(pDrvIns->Internal.s.pVMR3, pDrvIns, ppTemplate, pfnCompleted, pvTemplateUser, pszDesc);
    12091209
    1210     LogFlow(("pdmR3DrvHlp_PDMAsyncCompletionTemplateCreate: caller='%s'/%d: returns %Rrc *ppThread=%p\n", pDrvIns->pReg->szDriverName,
     1210    LogFlow(("pdmR3DrvHlp_PDMAsyncCompletionTemplateCreate: caller='%s'/%d: returns %Rrc *ppThread=%p\n", pDrvIns->pReg->szName,
    12111211             pDrvIns->iInstance, rc, *ppTemplate));
    12121212    return rc;
    … …  
    12211221    VM_ASSERT_EMT(pDrvIns->Internal.s.pVMR3);
    12221222    LogFlow(("pdmR3DrvHlp_PDMLdrGetRCInterfaceSymbols: caller='%s'/%d: pvInterface=%p cbInterface=%zu pszSymPrefix=%p:{%s} pszSymList=%p:{%s}\n",
    1223              pDrvIns->pReg->szDriverName, pDrvIns->iInstance, pvInterface, cbInterface, pszSymPrefix, pszSymPrefix, pszSymList, pszSymList));
     1223             pDrvIns->pReg->szName, pDrvIns->iInstance, pvInterface, cbInterface, pszSymPrefix, pszSymPrefix, pszSymList, pszSymList));
    12241224
    12251225    int rc;
    12261226    if (   strncmp(pszSymPrefix, "drv", 3) == 0
    1227         && RTStrIStr(pszSymPrefix + 3, pDrvIns->pReg->szDriverName) != NULL)
     1227        && RTStrIStr(pszSymPrefix + 3, pDrvIns->pReg->szName) != NULL)
    12281228    {
    12291229        if (pDrvIns->pReg->fFlags & PDM_DRVREG_FLAGS_RC)
    12301230            rc = PDMR3LdrGetInterfaceSymbols(pDrvIns->Internal.s.pVMR3, pvInterface, cbInterface,
    1231                                              pDrvIns->pReg->szDriverName, pszSymPrefix, pszSymList,
     1231                                             pDrvIns->pReg->szName, pszSymPrefix, pszSymList,
    12321232                                             false /*fRing0OrRC*/);
    12331233        else
    … …  
    12401240    {
    12411241        AssertMsgFailed(("Invalid prefix '%s' for '%s'; must start with 'drv' and contain the driver name!\n",
    1242                          pszSymPrefix, pDrvIns->pReg->szDriverName));
     1242                         pszSymPrefix, pDrvIns->pReg->szName));
    12431243        rc = VERR_INVALID_NAME;
    12441244    }
    12451245
    1246     LogFlow(("pdmR3DrvHlp_PDMLdrGetRCInterfaceSymbols: caller='%s'/%d: returns %Rrc\n", pDrvIns->pReg->szDriverName,
     1246    LogFlow(("pdmR3DrvHlp_PDMLdrGetRCInterfaceSymbols: caller='%s'/%d: returns %Rrc\n", pDrvIns->pReg->szName,
    12471247             pDrvIns->iInstance, rc));
    12481248    return rc;
    … …  
    12571257    VM_ASSERT_EMT(pDrvIns->Internal.s.pVMR3);
    12581258    LogFlow(("pdmR3DrvHlp_PDMLdrGetR0InterfaceSymbols: caller='%s'/%d: pvInterface=%p cbInterface=%zu pszSymPrefix=%p:{%s} pszSymList=%p:{%s}\n",
    1259              pDrvIns->pReg->szDriverName, pDrvIns->iInstance, pvInterface, cbInterface, pszSymPrefix, pszSymPrefix, pszSymList, pszSymList));
     1259             pDrvIns->pReg->szName, pDrvIns->iInstance, pvInterface, cbInterface, pszSymPrefix, pszSymPrefix, pszSymList, pszSymList));
    12601260
    12611261    int rc;
    12621262    if (   strncmp(pszSymPrefix, "drv", 3) == 0
    1263         && RTStrIStr(pszSymPrefix + 3, pDrvIns->pReg->szDriverName) != NULL)
     1263        && RTStrIStr(pszSymPrefix + 3, pDrvIns->pReg->szName) != NULL)
    12641264    {
    12651265        if (pDrvIns->pReg->fFlags & PDM_DRVREG_FLAGS_R0)
    12661266            rc = PDMR3LdrGetInterfaceSymbols(pDrvIns->Internal.s.pVMR3, pvInterface, cbInterface,
    1267                                              pDrvIns->pReg->szDriverName, pszSymPrefix, pszSymList,
     1267                                             pDrvIns->pReg->szName, pszSymPrefix, pszSymList,
    12681268                                             true /*fRing0OrRC*/);
    12691269        else
    … …  
    12761276    {
    12771277        AssertMsgFailed(("Invalid prefix '%s' for '%s'; must start with 'drv' and contain the driver name!\n",
    1278                          pszSymPrefix, pDrvIns->pReg->szDriverName));
     1278                         pszSymPrefix, pDrvIns->pReg->szName));
    12791279        rc = VERR_INVALID_NAME;
    12801280    }
    12811281
    1282     LogFlow(("pdmR3DrvHlp_PDMLdrGetR0InterfaceSymbols: caller='%s'/%d: returns %Rrc\n", pDrvIns->pReg->szDriverName,
     1282    LogFlow(("pdmR3DrvHlp_PDMLdrGetR0InterfaceSymbols: caller='%s'/%d: returns %Rrc\n", pDrvIns->pReg->szName,
    12831283             pDrvIns->iInstance, rc));
    12841284    return rc;
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette