VirtualBox

Changeset 2562 in vbox for trunk/src/VBox/Devices/Storage


Ignore:
Timestamp:
May 9, 2007 3:40:16 PM (18 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
21022
Message:

Rename identifiers to avoid conflicts with the new code.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r2539 r2562  
    190190*   Internal Functions                                                         *
    191191*******************************************************************************/
    192 static DECLCALLBACK(int)  vmdkConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle);
    193 static DECLCALLBACK(void) vmdkDestruct(PPDMDRVINS pDrvIns);
    194 static DECLCALLBACK(int)  vmdkRead(PPDMIMEDIA pInterface,
     192static DECLCALLBACK(int)  drvVmdkConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle);
     193static DECLCALLBACK(void) drvVmdkDestruct(PPDMDRVINS pDrvIns);
     194static DECLCALLBACK(int)  drvVmdkRead(PPDMIMEDIA pInterface,
    195195                                  uint64_t off, void *pvBuf, size_t cbRead);
    196 static DECLCALLBACK(int)  vmdkWrite(PPDMIMEDIA pInterface,
     196static DECLCALLBACK(int)  drvVmdkWrite(PPDMIMEDIA pInterface,
    197197                                   uint64_t off, const void *pvBuf, size_t cbWrite);
    198 static DECLCALLBACK(int)  vmdkFlush(PPDMIMEDIA pInterface);
    199 static DECLCALLBACK(uint64_t) vmdkGetSize(PPDMIMEDIA pInterface);
    200 static DECLCALLBACK(int)  vmdkBiosGetGeometry(PPDMIMEDIA pInterface, uint32_t *pcCylinders,
     198static DECLCALLBACK(int)  drvVmdkFlush(PPDMIMEDIA pInterface);
     199static DECLCALLBACK(uint64_t) drvVmdkGetSize(PPDMIMEDIA pInterface);
     200static DECLCALLBACK(int)  drvVmdkBiosGetGeometry(PPDMIMEDIA pInterface, uint32_t *pcCylinders,
    201201                                             uint32_t *pcHeads, uint32_t *pcSectors);
    202 static DECLCALLBACK(int)  vmdkBiosSetGeometry(PPDMIMEDIA pInterface, uint32_t cCylinders,
     202static DECLCALLBACK(int)  drvVmdkBiosSetGeometry(PPDMIMEDIA pInterface, uint32_t cCylinders,
    203203                                             uint32_t cHeads, uint32_t cSectors);
    204 static DECLCALLBACK(int)  vmdkGetUuid(PPDMIMEDIA pInterface, PRTUUID pUuid);
    205 static DECLCALLBACK(bool) vmdkIsReadOnly(PPDMIMEDIA pInterface);
    206 static DECLCALLBACK(int)  vmdkBiosGetTranslation(PPDMIMEDIA pInterface,
     204static DECLCALLBACK(int)  drvVmdkGetUuid(PPDMIMEDIA pInterface, PRTUUID pUuid);
     205static DECLCALLBACK(bool) drvVmdkIsReadOnly(PPDMIMEDIA pInterface);
     206static DECLCALLBACK(int)  drvVmdkBiosGetTranslation(PPDMIMEDIA pInterface,
    207207                                                PPDMBIOSTRANSLATION penmTranslation);
    208 static DECLCALLBACK(int)  vmdkBiosSetTranslation(PPDMIMEDIA pInterface,
     208static DECLCALLBACK(int)  drvVmdkBiosSetTranslation(PPDMIMEDIA pInterface,
    209209                                                PDMBIOSTRANSLATION enmTranslation);
    210 static DECLCALLBACK(void *) vmdkQueryInterface(PPDMIBASE pInterface, PDMINTERFACE enmInterface);
     210static DECLCALLBACK(void *) drvVmdkQueryInterface(PPDMIBASE pInterface, PDMINTERFACE enmInterface);
    211211
    212212#if 0
    … …  
    709709 *                      iInstance it's expected to be used a bit in this function.
    710710 */
    711 static DECLCALLBACK(int) vmdkConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle)
    712 {
    713     LogFlow(("vmdkConstruct:\n"));
     711static DECLCALLBACK(int) drvVmdkConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle)
     712{
     713    LogFlow(("drvVmdkConstruct:\n"));
    714714    PVMDKDISK pData = PDMINS2DATA(pDrvIns, PVMDKDISK);
    715715
    … …  
    717717     * Init the static parts.
    718718     */
    719     pDrvIns->IBase.pfnQueryInterface    = vmdkQueryInterface;
     719    pDrvIns->IBase.pfnQueryInterface    = drvVmdkQueryInterface;
    720720    pData->pDrvIns = pDrvIns;
    721721
    … …  
    728728
    729729    /* IMedia */
    730     pData->IMedia.pfnRead               = vmdkRead;
    731     pData->IMedia.pfnWrite              = vmdkWrite;
    732     pData->IMedia.pfnFlush              = vmdkFlush;
    733     pData->IMedia.pfnGetSize            = vmdkGetSize;
    734     pData->IMedia.pfnGetUuid            = vmdkGetUuid;
    735     pData->IMedia.pfnIsReadOnly         = vmdkIsReadOnly;
    736     pData->IMedia.pfnBiosGetGeometry    = vmdkBiosGetGeometry;
    737     pData->IMedia.pfnBiosSetGeometry    = vmdkBiosSetGeometry;
    738     pData->IMedia.pfnBiosGetTranslation = vmdkBiosGetTranslation;
    739     pData->IMedia.pfnBiosSetTranslation = vmdkBiosSetTranslation;
     730    pData->IMedia.pfnRead               = drvVmdkRead;
     731    pData->IMedia.pfnWrite              = drvVmdkWrite;
     732    pData->IMedia.pfnFlush              = drvVmdkFlush;
     733    pData->IMedia.pfnGetSize            = drvVmdkGetSize;
     734    pData->IMedia.pfnGetUuid            = drvVmdkGetUuid;
     735    pData->IMedia.pfnIsReadOnly         = drvVmdkIsReadOnly;
     736    pData->IMedia.pfnBiosGetGeometry    = drvVmdkBiosGetGeometry;
     737    pData->IMedia.pfnBiosSetGeometry    = drvVmdkBiosSetGeometry;
     738    pData->IMedia.pfnBiosGetTranslation = drvVmdkBiosGetTranslation;
     739    pData->IMedia.pfnBiosSetTranslation = drvVmdkBiosSetTranslation;
    740740
    741741    /*
    … …  
    765765    rc = vmdk_open(pData, pszName, fReadOnly);
    766766    if (VBOX_SUCCESS(rc))
    767         Log(("vmdkConstruct: Opened '%s' in %s mode\n", pszName, VMDKDiskIsReadOnly(pData) ? "read-only" : "read-write"));
     767        Log(("drvVmdkConstruct: Opened '%s' in %s mode\n", pszName, VMDKDiskIsReadOnly(pData) ? "read-only" : "read-write"));
    768768    else
    769769        AssertMsgFailed(("Failed to open image '%s' rc=%Vrc\n", pszName, rc));
    … …  
    783783 * @param   pDrvIns     The driver instance data.
    784784 */
    785 static DECLCALLBACK(void) vmdkDestruct(PPDMDRVINS pDrvIns)
    786 {
    787     LogFlow(("vmdkDestruct:\n"));
     785static DECLCALLBACK(void) drvVmdkDestruct(PPDMDRVINS pDrvIns)
     786{
     787    LogFlow(("drvVmdkDestruct:\n"));
    788788    PVMDKDISK pData = PDMINS2DATA(pDrvIns, PVMDKDISK);
    789789    vmdk_close(&pData->VmdkState);
    … …  
    797797 * @param   pDrvIns     The driver instance data.
    798798 */
    799 static DECLCALLBACK(void) vmdkSuspend(PPDMDRVINS pDrvIns)
    800 {
    801     LogFlow(("vmdkSuspend:\n"));
     799static DECLCALLBACK(void) drvVmdkSuspend(PPDMDRVINS pDrvIns)
     800{
     801    LogFlow(("drvVmdkSuspend:\n"));
    802802    PVMDKDISK pData = PDMINS2DATA(pDrvIns, PVMDKDISK);
    803803    if (!VMDKDiskIsReadOnly(pData))
    … …  
    811811/**
    812812 * Before the VM resumes we'll have to undo the read-only mode change
    813  * done in vmdkSuspend.
     813 * done in drvVmdkSuspend.
    814814 *
    815815 * @param   pDrvIns     The driver instance data.
    816816 */
    817 static DECLCALLBACK(void) vmdkResume(PPDMDRVINS pDrvIns)
    818 {
    819     LogFlow(("vmdkSuspend:\n"));
     817static DECLCALLBACK(void) drvVmdkResume(PPDMDRVINS pDrvIns)
     818{
     819    LogFlow(("drvVmdkSuspend:\n"));
    820820    PVMDKDISK pData = PDMINS2DATA(pDrvIns, PVMDKDISK);
    821821    if (!VMDKDiskIsReadOnly(pData))
    … …  
    829829
    830830/** @copydoc PDMIMEDIA::pfnGetSize */
    831 static DECLCALLBACK(uint64_t) vmdkGetSize(PPDMIMEDIA pInterface)
     831static DECLCALLBACK(uint64_t) drvVmdkGetSize(PPDMIMEDIA pInterface)
    832832{
    833833    PVMDKDISK pData = PDMIMEDIA_2_VMDKDISK(pInterface);
    834834    uint64_t cb = VMDKDiskGetSize(pData);
    835     LogFlow(("vmdkGetSize: returns %#llx (%llu)\n", cb, cb));
     835    LogFlow(("drvVmdkGetSize: returns %#llx (%llu)\n", cb, cb));
    836836    return cb;
    837837}
    … …  
    842842 * @see PDMIMEDIA::pfnBiosGetGeometry for details.
    843843 */
    844 static DECLCALLBACK(int) vmdkBiosGetGeometry(PPDMIMEDIA pInterface, uint32_t *pcCylinders, uint32_t *pcHeads, uint32_t *pcSectors)
     844static DECLCALLBACK(int) drvVmdkBiosGetGeometry(PPDMIMEDIA pInterface, uint32_t *pcCylinders, uint32_t *pcHeads, uint32_t *pcSectors)
    845845{
    846846    PVMDKDISK pData = PDMIMEDIA_2_VMDKDISK(pInterface);
    … …  
    848848    if (VBOX_SUCCESS(rc))
    849849    {
    850         LogFlow(("vmdkBiosGetGeometry: returns VINF_SUCCESS\n"));
     850        LogFlow(("drvVmdkBiosGetGeometry: returns VINF_SUCCESS\n"));
    851851        return VINF_SUCCESS;
    852852    }
    853     Log(("vmdkBiosGetGeometry: The Bios geometry data was not available.\n"));
     853    Log(("drvVmdkBiosGetGeometry: The Bios geometry data was not available.\n"));
    854854    return VERR_PDM_GEOMETRY_NOT_SET;
    855855}
    … …  
    860860 * @see PDMIMEDIA::pfnBiosSetGeometry for details.
    861861 */
    862 static DECLCALLBACK(int) vmdkBiosSetGeometry(PPDMIMEDIA pInterface, uint32_t cCylinders, uint32_t cHeads, uint32_t cSectors)
     862static DECLCALLBACK(int) drvVmdkBiosSetGeometry(PPDMIMEDIA pInterface, uint32_t cCylinders, uint32_t cHeads, uint32_t cSectors)
    863863{
    864864    PVMDKDISK pData = PDMIMEDIA_2_VMDKDISK(pInterface);
    865865    int rc = VMDKDiskSetGeometry(pData, cCylinders, cHeads, cSectors);
    866     LogFlow(("vmdkBiosSetGeometry: returns %Vrc (%d,%d,%d)\n", rc, cCylinders, cHeads, cSectors));
     866    LogFlow(("drvVmdkBiosSetGeometry: returns %Vrc (%d,%d,%d)\n", rc, cCylinders, cHeads, cSectors));
    867867    return rc;
    868868}
    … …  
    873873 * @see PDMIMEDIA::pfnRead for details.
    874874 */
    875 static DECLCALLBACK(int) vmdkRead(PPDMIMEDIA pInterface, uint64_t off, void *pvBuf, size_t cbRead)
    876 {
    877     LogFlow(("vmdkRead: off=%#llx pvBuf=%p cbRead=%d\n", off, pvBuf, cbRead));
     875static DECLCALLBACK(int) drvVmdkRead(PPDMIMEDIA pInterface, uint64_t off, void *pvBuf, size_t cbRead)
     876{
     877    LogFlow(("drvVmdkRead: off=%#llx pvBuf=%p cbRead=%d\n", off, pvBuf, cbRead));
    878878    PVMDKDISK pData = PDMIMEDIA_2_VMDKDISK(pInterface);
    879879    int rc = vmdk_read(&pData->VmdkState, off >> VMDK_GEOMETRY_SECTOR_SHIFT, (uint8_t *)pvBuf, cbRead >> VMDK_GEOMETRY_SECTOR_SHIFT);
    880880    if (VBOX_SUCCESS(rc))
    881         Log2(("vmdkRead: off=%#llx pvBuf=%p cbRead=%d\n"
     881        Log2(("drvVmdkRead: off=%#llx pvBuf=%p cbRead=%d\n"
    882882              "%.*Vhxd\n",
    883883              off, pvBuf, cbRead, cbRead, pvBuf));
    884     LogFlow(("vmdkRead: returns %Vrc\n", rc));
     884    LogFlow(("drvVmdkRead: returns %Vrc\n", rc));
    885885    return rc;
    886886}
    … …  
    891891 * @see PDMIMEDIA::pfnWrite for details.
    892892 */
    893 static DECLCALLBACK(int) vmdkWrite(PPDMIMEDIA pInterface, uint64_t off, const void *pvBuf, size_t cbWrite)
    894 {
    895     LogFlow(("vmdkWrite: off=%#llx pvBuf=%p cbWrite=%d\n", off, pvBuf, cbWrite));
     893static DECLCALLBACK(int) drvVmdkWrite(PPDMIMEDIA pInterface, uint64_t off, const void *pvBuf, size_t cbWrite)
     894{
     895    LogFlow(("drvVmdkWrite: off=%#llx pvBuf=%p cbWrite=%d\n", off, pvBuf, cbWrite));
    896896    PVMDKDISK pData = PDMIMEDIA_2_VMDKDISK(pInterface);
    897     Log2(("vmdkWrite: off=%#llx pvBuf=%p cbWrite=%d\n"
     897    Log2(("drvVmdkWrite: off=%#llx pvBuf=%p cbWrite=%d\n"
    898898          "%.*Vhxd\n",
    899899          off, pvBuf, cbWrite, cbWrite, pvBuf));
    900900    int rc = vmdk_write(&pData->VmdkState, off >> VMDK_GEOMETRY_SECTOR_SHIFT, (const uint8_t *)pvBuf, cbWrite >> VMDK_GEOMETRY_SECTOR_SHIFT);
    901     LogFlow(("vmdkWrite: returns %Vrc\n", rc));
     901    LogFlow(("drvVmdkWrite: returns %Vrc\n", rc));
    902902    return rc;
    903903}
    … …  
    908908 * @see PDMIMEDIA::pfnFlush for details.
    909909 */
    910 static DECLCALLBACK(int) vmdkFlush(PPDMIMEDIA pInterface)
    911 {
    912     LogFlow(("vmdkFlush:\n"));
     910static DECLCALLBACK(int) drvVmdkFlush(PPDMIMEDIA pInterface)
     911{
     912    LogFlow(("drvVmdkFlush:\n"));
    913913    PVMDKDISK pData = PDMIMEDIA_2_VMDKDISK(pInterface);
    914914    vmdk_flush(&pData->VmdkState);
    915915    int rc = VINF_SUCCESS;
    916     LogFlow(("vmdkFlush: returns %Vrc\n", rc));
     916    LogFlow(("drvVmdkFlush: returns %Vrc\n", rc));
    917917    return rc;
    918918}
    919919
    920920/** @copydoc PDMIMEDIA::pfnGetUuid */
    921 static DECLCALLBACK(int) vmdkGetUuid(PPDMIMEDIA pInterface, PRTUUID pUuid)
     921static DECLCALLBACK(int) drvVmdkGetUuid(PPDMIMEDIA pInterface, PRTUUID pUuid)
    922922{
    923923    PVMDKDISK pData = PDMIMEDIA_2_VMDKDISK(pInterface);
    … …  
    925925    int rc = VINF_SUCCESS;
    926926    NOREF(pData);
    927     LogFlow(("vmdkGetUuid: returns %Vrc ({%Vuuid})\n", rc, pUuid));
     927    LogFlow(("drvVmdkGetUuid: returns %Vrc ({%Vuuid})\n", rc, pUuid));
    928928    return rc;
    929929}
    930930
    931931/** @copydoc PDMIMEDIA::pfnIsReadOnly */
    932 static DECLCALLBACK(bool) vmdkIsReadOnly(PPDMIMEDIA pInterface)
     932static DECLCALLBACK(bool) drvVmdkIsReadOnly(PPDMIMEDIA pInterface)
    933933{
    934934    PVMDKDISK pData = PDMIMEDIA_2_VMDKDISK(pInterface);
    935     LogFlow(("vmdkIsReadOnly: returns %d\n", VMDKDiskIsReadOnly(pData)));
     935    LogFlow(("drvVmdkIsReadOnly: returns %d\n", VMDKDiskIsReadOnly(pData)));
    936936    return VMDKDiskIsReadOnly(pData);
    937937}
    938938
    939939/** @copydoc PDMIMEDIA::pfnBiosGetTranslation */
    940 static DECLCALLBACK(int) vmdkBiosGetTranslation(PPDMIMEDIA pInterface,
     940static DECLCALLBACK(int) drvVmdkBiosGetTranslation(PPDMIMEDIA pInterface,
    941941                                               PPDMBIOSTRANSLATION penmTranslation)
    942942{
    … …  
    945945    NOREF(pData);
    946946    *penmTranslation = PDMBIOSTRANSLATION_AUTO; /** @todo */
    947     LogFlow(("vmdkBiosGetTranslation: returns %Vrc (%d)\n", rc, *penmTranslation));
     947    LogFlow(("drvVmdkBiosGetTranslation: returns %Vrc (%d)\n", rc, *penmTranslation));
    948948    return rc;
    949949}
    950950
    951951/** @copydoc PDMIMEDIA::pfnBiosSetTranslation */
    952 static DECLCALLBACK(int) vmdkBiosSetTranslation(PPDMIMEDIA pInterface,
     952static DECLCALLBACK(int) drvVmdkBiosSetTranslation(PPDMIMEDIA pInterface,
    953953                                               PDMBIOSTRANSLATION enmTranslation)
    954954{
    … …  
    957957    int rc = VINF_SUCCESS;
    958958    NOREF(pData);
    959     LogFlow(("vmdkBiosSetTranslation: returns %Vrc (%d)\n", rc, enmTranslation));
     959    LogFlow(("drvVmdkBiosSetTranslation: returns %Vrc (%d)\n", rc, enmTranslation));
    960960    return rc;
    961961}
    … …  
    971971 * @thread  Any thread.
    972972 */
    973 static DECLCALLBACK(void *) vmdkQueryInterface(PPDMIBASE pInterface, PDMINTERFACE enmInterface)
     973static DECLCALLBACK(void *) drvVmdkQueryInterface(PPDMIBASE pInterface, PDMINTERFACE enmInterface)
    974974{
    975975    PPDMDRVINS pDrvIns = PDMIBASE_2_DRVINS(pInterface);
    … …  
    10071007    sizeof(VMDKDISK),
    10081008    /* pfnConstruct */
    1009     vmdkConstruct,
     1009    drvVmdkConstruct,
    10101010    /* pfnDestruct */
    1011     vmdkDestruct,
     1011    drvVmdkDestruct,
    10121012    /* pfnIOCtl */
    10131013    NULL,
    … …  
    10171017    NULL,
    10181018    /* pfnSuspend */
    1019     vmdkSuspend,
     1019    drvVmdkSuspend,
    10201020    /* pfnResume */
    1021     vmdkResume,
     1021    drvVmdkResume,
    10221022    /* pfnDetach */
    10231023    NULL
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