VirtualBox

Changeset 11287 in vbox


Ignore:
Timestamp:
Aug 8, 2008 10:35:40 PM (16 years ago)
Author:
vboxsync
Message:

Devices: %Vuuid -> %RTuuid (just preferred, not mandatory (yet))

Location:
trunk/src/VBox/Devices/Storage
Files:
8 edited

Legend:

Unmodified
Added
Removed

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

    r11286 r11287  
    314314    *pUuid = pThis->Uuid;
    315315
    316     LogFlow(("%s-%d: drvHostBaseGetUuid: returns VINF_SUCCESS *pUuid=%Vuuid\n", pThis->pDrvIns->pDrvReg->szDriverName, pThis->pDrvIns->iInstance, pUuid));
     316    LogFlow(("%s-%d: drvHostBaseGetUuid: returns VINF_SUCCESS *pUuid=%RTuuid\n", pThis->pDrvIns->pDrvReg->szDriverName, pThis->pDrvIns->iInstance, pUuid));
    317317    return VINF_SUCCESS;
    318318}
    … …  
    18631863
    18641864    /* log config summary */
    1865     Log(("%s-%d: pszDevice='%s' (%s) cMilliesPoller=%d fReadOnlyConfig=%d fLocked=%d fBIOSVisible=%d Uuid=%Vuuid\n",
     1865    Log(("%s-%d: pszDevice='%s' (%s) cMilliesPoller=%d fReadOnlyConfig=%d fLocked=%d fBIOSVisible=%d Uuid=%RTuuid\n",
    18661866         pDrvIns->pDrvReg->szDriverName, pDrvIns->iInstance, pThis->pszDevice, pThis->pszDeviceOpen, pThis->cMilliesPoller,
    18671867         pThis->fReadOnlyConfig, pThis->fLocked, pThis->fBiosVisible, &pThis->Uuid));

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

    r11284 r11287  
    394394    PVBOXDISK pThis = PDMIMEDIA_2_VBOXDISK(pInterface);
    395395    int rc = VDGetUuid(pThis->pDisk, 0, pUuid);
    396     LogFlow(("%s: returns %Rrc ({%Vuuid})\n", __FUNCTION__, rc, pUuid));
     396    LogFlow(("%s: returns %Rrc ({%RTuuid})\n", __FUNCTION__, rc, pUuid));
    397397    return rc;
    398398}

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

    r11284 r11287  
    828828        rc = VERR_VDI_NOT_OPENED;
    829829
    830     LogFlowFunc(("returns %Rrc (%Vuuid)\n", rc, pUuid));
     830    LogFlowFunc(("returns %Rrc (%RTuuid)\n", rc, pUuid));
    831831    return rc;
    832832}
    … …  
    835835static int rawSetUuid(void *pBackendData, PCRTUUID pUuid)
    836836{
    837     LogFlowFunc(("pBackendData=%#p Uuid=%Vuuid\n", pBackendData, pUuid));
    838     PRAWIMAGE pImage = (PRAWIMAGE)pBackendData;
    839     int rc;
    840 
    841     LogFlowFunc(("%Vuuid\n", pUuid));
     837    LogFlowFunc(("pBackendData=%#p Uuid=%RTuuid\n", pBackendData, pUuid));
     838    PRAWIMAGE pImage = (PRAWIMAGE)pBackendData;
     839    int rc;
     840
     841    LogFlowFunc(("%RTuuid\n", pUuid));
    842842    Assert(pImage);
    843843
    … …  
    870870        rc = VERR_VDI_NOT_OPENED;
    871871
    872     LogFlowFunc(("returns %Rrc (%Vuuid)\n", rc, pUuid));
     872    LogFlowFunc(("returns %Rrc (%RTuuid)\n", rc, pUuid));
    873873    return rc;
    874874}
    … …  
    877877static int rawSetModificationUuid(void *pBackendData, PCRTUUID pUuid)
    878878{
    879     LogFlowFunc(("pBackendData=%#p Uuid=%Vuuid\n", pBackendData, pUuid));
     879    LogFlowFunc(("pBackendData=%#p Uuid=%RTuuid\n", pBackendData, pUuid));
    880880    PRAWIMAGE pImage = (PRAWIMAGE)pBackendData;
    881881    int rc;
    … …  
    911911        rc = VERR_VDI_NOT_OPENED;
    912912
    913     LogFlowFunc(("returns %Rrc (%Vuuid)\n", rc, pUuid));
     913    LogFlowFunc(("returns %Rrc (%RTuuid)\n", rc, pUuid));
    914914    return rc;
    915915}
    … …  
    918918static int rawSetParentUuid(void *pBackendData, PCRTUUID pUuid)
    919919{
    920     LogFlowFunc(("pBackendData=%#p Uuid=%Vuuid\n", pBackendData, pUuid));
     920    LogFlowFunc(("pBackendData=%#p Uuid=%RTuuid\n", pBackendData, pUuid));
    921921    PRAWIMAGE pImage = (PRAWIMAGE)pBackendData;
    922922    int rc;
    … …  
    952952        rc = VERR_VDI_NOT_OPENED;
    953953
    954     LogFlowFunc(("returns %Rrc (%Vuuid)\n", rc, pUuid));
     954    LogFlowFunc(("returns %Rrc (%RTuuid)\n", rc, pUuid));
    955955    return rc;
    956956}
    … …  
    959959static int rawSetParentModificationUuid(void *pBackendData, PCRTUUID pUuid)
    960960{
    961     LogFlowFunc(("pBackendData=%#p Uuid=%Vuuid\n", pBackendData, pUuid));
     961    LogFlowFunc(("pBackendData=%#p Uuid=%RTuuid\n", pBackendData, pUuid));
    962962    PRAWIMAGE pImage = (PRAWIMAGE)pBackendData;
    963963    int rc;

  • trunk/src/VBox/Devices/Storage/VBoxHDD-new.cpp

    r11284 r11287  
    31403140    } while (0);
    31413141
    3142     LogFlowFunc(("returns %Rrc, Uuid={%Vuuid}\n", rc, pUuid));
     3142    LogFlowFunc(("returns %Rrc, Uuid={%RTuuid}\n", rc, pUuid));
    31433143    return rc;
    31443144}
    … …  
    31573157    int rc;
    31583158
    3159     LogFlowFunc(("pDisk=%#p nImage=%u pUuid=%#p {%Vuuid}\n",
     3159    LogFlowFunc(("pDisk=%#p nImage=%u pUuid=%#p {%RTuuid}\n",
    31603160                 pDisk, nImage, pUuid, pUuid));
    31613161    do
    … …  
    32173217    } while (0);
    32183218
    3219     LogFlowFunc(("returns %Rrc, Uuid={%Vuuid}\n", rc, pUuid));
     3219    LogFlowFunc(("returns %Rrc, Uuid={%RTuuid}\n", rc, pUuid));
    32203220    return rc;
    32213221}
    … …  
    32343234    int rc;
    32353235
    3236     LogFlowFunc(("pDisk=%#p nImage=%u pUuid=%#p {%Vuuid}\n",
     3236    LogFlowFunc(("pDisk=%#p nImage=%u pUuid=%#p {%RTuuid}\n",
    32373237                 pDisk, nImage, pUuid, pUuid));
    32383238    do
    … …  
    32963296    } while (0);
    32973297
    3298     LogFlowFunc(("returns %Rrc, Uuid={%Vuuid}\n", rc, pUuid));
     3298    LogFlowFunc(("returns %Rrc, Uuid={%RTuuid}\n", rc, pUuid));
    32993299    return rc;
    33003300}
    … …  
    33133313    int rc;
    33143314
    3315     LogFlowFunc(("pDisk=%#p nImage=%u pUuid=%#p {%Vuuid}\n",
     3315    LogFlowFunc(("pDisk=%#p nImage=%u pUuid=%#p {%RTuuid}\n",
    33163316                 pDisk, nImage, pUuid, pUuid));
    33173317    do

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

    r11284 r11287  
    178178    PVDIDISK pThis = PDMIMEDIA_2_VDIDISK(pInterface);
    179179    int rc = VDIDiskGetImageUuid(pThis, 0, pUuid);
    180     LogFlow(("vdiGetUuid: returns %Rrc ({%Vuuid})\n", rc, pUuid));
     180    LogFlow(("vdiGetUuid: returns %Rrc ({%RTuuid})\n", rc, pUuid));
    181181    return rc;
    182182}

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

    r11284 r11287  
    16971697    if (RT_SUCCESS(rc))
    16981698    {
    1699         Log(("VDICheckImage: filename=\"%s\" version=%08X type=%X cbDisk=%llu uuid={%Vuuid}\n",
     1699        Log(("VDICheckImage: filename=\"%s\" version=%08X type=%X cbDisk=%llu uuid={%RTuuid}\n",
    17001700             pszFilename,
    17011701             pImage->PreHeader.u32Version,
    … …  
    32443244    {
    32453245        *pUuid = *getImageCreationUUID(&pImage->Header);
    3246         LogFlow(("VDIDiskGetImageUuid: returns VINF_SUCCESS, uuid={%Vuuid} nImage=%d\n",
     3246        LogFlow(("VDIDiskGetImageUuid: returns VINF_SUCCESS, uuid={%RTuuid} nImage=%d\n",
    32473247                 pUuid, nImage));
    32483248        return VINF_SUCCESS;
    … …  
    32753275    {
    32763276        *pUuid = *getImageModificationUUID(&pImage->Header);
    3277         LogFlow(("VDIDiskGetImageModificationUuid: returns VINF_SUCCESS, uuid={%Vuuid} nImage=%d\n",
     3277        LogFlow(("VDIDiskGetImageModificationUuid: returns VINF_SUCCESS, uuid={%RTuuid} nImage=%d\n",
    32783278                 pUuid, nImage));
    32793279        return VINF_SUCCESS;
    … …  
    33043304    {
    33053305        *pUuid = *getImageParentUUID(&pImage->Header);
    3306         LogFlow(("VDIDiskGetParentImageUuid: returns VINF_SUCCESS, *pUuid={%Vuuid} nImage=%d\n",
     3306        LogFlow(("VDIDiskGetParentImageUuid: returns VINF_SUCCESS, *pUuid={%RTuuid} nImage=%d\n",
    33073307                 pUuid, nImage));
    33083308        return VINF_SUCCESS;
    … …  
    36843684        RTLogPrintf("Header: Geometry: C/H/S=%u/%u/%u cbSector=%u\n",
    36853685                    pg->cCylinders, pg->cHeads, pg->cSectors, pg->cbSector);
    3686     RTLogPrintf("Header: uuidCreation={%Vuuid}\n", getImageCreationUUID(&pImage->Header));
    3687     RTLogPrintf("Header: uuidModification={%Vuuid}\n", getImageModificationUUID(&pImage->Header));
    3688     RTLogPrintf("Header: uuidParent={%Vuuid}\n", getImageParentUUID(&pImage->Header));
     3686    RTLogPrintf("Header: uuidCreation={%RTuuid}\n", getImageCreationUUID(&pImage->Header));
     3687    RTLogPrintf("Header: uuidModification={%RTuuid}\n", getImageModificationUUID(&pImage->Header));
     3688    RTLogPrintf("Header: uuidParent={%RTuuid}\n", getImageParentUUID(&pImage->Header));
    36893689    if (GET_MAJOR_HEADER_VERSION(&pImage->Header) >= 1)
    3690         RTLogPrintf("Header: uuidParentModification={%Vuuid}\n", getImageParentModificationUUID(&pImage->Header));
     3690        RTLogPrintf("Header: uuidParentModification={%RTuuid}\n", getImageParentModificationUUID(&pImage->Header));
    36913691    RTLogPrintf("Image:  fFlags=%08X offStartBlocks=%u offStartData=%u\n",
    36923692                pImage->fFlags, pImage->offStartBlocks, pImage->offStartData);

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

    r11284 r11287  
    14651465        rc = VERR_VDI_NOT_OPENED;
    14661466
    1467     LogFlowFunc(("returns %Rrc (%Vuuid)\n", rc, pUuid));
     1467    LogFlowFunc(("returns %Rrc (%RTuuid)\n", rc, pUuid));
    14681468    return rc;
    14691469}
    … …  
    14721472static int vdiSetUuid(void *pBackendData, PCRTUUID pUuid)
    14731473{
    1474     LogFlowFunc(("pBackendData=%#p Uuid=%Vuuid\n", pBackendData, pUuid));
     1474    LogFlowFunc(("pBackendData=%#p Uuid=%RTuuid\n", pBackendData, pUuid));
    14751475    PVDIIMAGEDESC pImage = (PVDIIMAGEDESC)pBackendData;
    14761476    int rc = VINF_SUCCESS;
    … …  
    15201520        rc = VERR_VDI_NOT_OPENED;
    15211521
    1522     LogFlowFunc(("returns %Rrc (%Vuuid)\n", rc, pUuid));
     1522    LogFlowFunc(("returns %Rrc (%RTuuid)\n", rc, pUuid));
    15231523    return rc;
    15241524}
    … …  
    15271527static int vdiSetModificationUuid(void *pBackendData, PCRTUUID pUuid)
    15281528{
    1529     LogFlowFunc(("pBackendData=%#p Uuid=%Vuuid\n", pBackendData, pUuid));
     1529    LogFlowFunc(("pBackendData=%#p Uuid=%RTuuid\n", pBackendData, pUuid));
    15301530    PVDIIMAGEDESC pImage = (PVDIIMAGEDESC)pBackendData;
    15311531    int rc = VINF_SUCCESS;
    … …  
    15751575        rc = VERR_VDI_NOT_OPENED;
    15761576
    1577     LogFlowFunc(("returns %Rrc (%Vuuid)\n", rc, pUuid));
     1577    LogFlowFunc(("returns %Rrc (%RTuuid)\n", rc, pUuid));
    15781578    return rc;
    15791579}
    … …  
    15821582static int vdiSetParentUuid(void *pBackendData, PCRTUUID pUuid)
    15831583{
    1584     LogFlowFunc(("pBackendData=%#p Uuid=%Vuuid\n", pBackendData, pUuid));
     1584    LogFlowFunc(("pBackendData=%#p Uuid=%RTuuid\n", pBackendData, pUuid));
    15851585    PVDIIMAGEDESC pImage = (PVDIIMAGEDESC)pBackendData;
    15861586    int rc = VINF_SUCCESS;
    … …  
    16301630        rc = VERR_VDI_NOT_OPENED;
    16311631
    1632     LogFlowFunc(("returns %Rrc (%Vuuid)\n", rc, pUuid));
     1632    LogFlowFunc(("returns %Rrc (%RTuuid)\n", rc, pUuid));
    16331633    return rc;
    16341634}
    … …  
    16371637static int vdiSetParentModificationUuid(void *pBackendData, PCRTUUID pUuid)
    16381638{
    1639     LogFlowFunc(("pBackendData=%#p Uuid=%Vuuid\n", pBackendData, pUuid));
     1639    LogFlowFunc(("pBackendData=%#p Uuid=%RTuuid\n", pBackendData, pUuid));
    16401640    PVDIIMAGEDESC pImage = (PVDIIMAGEDESC)pBackendData;
    16411641    int rc = VINF_SUCCESS;
    … …  
    16921692        RTLogPrintf("Header: Geometry: C/H/S=%u/%u/%u cbSector=%u\n",
    16931693                    pg->cCylinders, pg->cHeads, pg->cSectors, pg->cbSector);
    1694     RTLogPrintf("Header: uuidCreation={%Vuuid}\n", getImageCreationUUID(&pImage->Header));
    1695     RTLogPrintf("Header: uuidModification={%Vuuid}\n", getImageModificationUUID(&pImage->Header));
    1696     RTLogPrintf("Header: uuidParent={%Vuuid}\n", getImageParentUUID(&pImage->Header));
     1694    RTLogPrintf("Header: uuidCreation={%RTuuid}\n", getImageCreationUUID(&pImage->Header));
     1695    RTLogPrintf("Header: uuidModification={%RTuuid}\n", getImageModificationUUID(&pImage->Header));
     1696    RTLogPrintf("Header: uuidParent={%RTuuid}\n", getImageParentUUID(&pImage->Header));
    16971697    if (GET_MAJOR_HEADER_VERSION(&pImage->Header) >= 1)
    1698         RTLogPrintf("Header: uuidParentModification={%Vuuid}\n", getImageParentModificationUUID(&pImage->Header));
     1698        RTLogPrintf("Header: uuidParentModification={%RTuuid}\n", getImageParentModificationUUID(&pImage->Header));
    16991699    RTLogPrintf("Image:  fFlags=%08X offStartBlocks=%u offStartData=%u\n",
    17001700                pImage->uImageFlags, pImage->offStartBlocks, pImage->offStartData);

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

    r11284 r11287  
    13711371    char *pszUuid;
    13721372
    1373     int rc = RTStrAPrintf(&pszUuid, "\"%Vuuid\"", pUuid);
     1373    int rc = RTStrAPrintf(&pszUuid, "\"%RTuuid\"", pUuid);
    13741374    if (RT_FAILURE(rc))
    13751375        return rc;
    … …  
    46064606        rc = VERR_VDI_NOT_OPENED;
    46074607
    4608     LogFlowFunc(("returns %Rrc (%Vuuid)\n", rc, pUuid));
     4608    LogFlowFunc(("returns %Rrc (%RTuuid)\n", rc, pUuid));
    46094609    return rc;
    46104610}
    … …  
    46134613static int vmdkSetUuid(void *pBackendData, PCRTUUID pUuid)
    46144614{
    4615     LogFlowFunc(("pBackendData=%#p Uuid=%Vuuid\n", pBackendData, pUuid));
     4615    LogFlowFunc(("pBackendData=%#p Uuid=%RTuuid\n", pBackendData, pUuid));
    46164616    PVMDKIMAGE pImage = (PVMDKIMAGE)pBackendData;
    46174617    int rc;
    46184618
    4619     LogFlowFunc(("%Vuuid\n", pUuid));
     4619    LogFlowFunc(("%RTuuid\n", pUuid));
    46204620    Assert(pImage);
    46214621
    … …  
    46584658        rc = VERR_VDI_NOT_OPENED;
    46594659
    4660     LogFlowFunc(("returns %Rrc (%Vuuid)\n", rc, pUuid));
     4660    LogFlowFunc(("returns %Rrc (%RTuuid)\n", rc, pUuid));
    46614661    return rc;
    46624662}
    … …  
    46654665static int vmdkSetModificationUuid(void *pBackendData, PCRTUUID pUuid)
    46664666{
    4667     LogFlowFunc(("pBackendData=%#p Uuid=%Vuuid\n", pBackendData, pUuid));
     4667    LogFlowFunc(("pBackendData=%#p Uuid=%RTuuid\n", pBackendData, pUuid));
    46684668    PVMDKIMAGE pImage = (PVMDKIMAGE)pBackendData;
    46694669    int rc;
    … …  
    47094709        rc = VERR_VDI_NOT_OPENED;
    47104710
    4711     LogFlowFunc(("returns %Rrc (%Vuuid)\n", rc, pUuid));
     4711    LogFlowFunc(("returns %Rrc (%RTuuid)\n", rc, pUuid));
    47124712    return rc;
    47134713}
    … …  
    47164716static int vmdkSetParentUuid(void *pBackendData, PCRTUUID pUuid)
    47174717{
    4718     LogFlowFunc(("pBackendData=%#p Uuid=%Vuuid\n", pBackendData, pUuid));
     4718    LogFlowFunc(("pBackendData=%#p Uuid=%RTuuid\n", pBackendData, pUuid));
    47194719    PVMDKIMAGE pImage = (PVMDKIMAGE)pBackendData;
    47204720    int rc;
    … …  
    47604760        rc = VERR_VDI_NOT_OPENED;
    47614761
    4762     LogFlowFunc(("returns %Rrc (%Vuuid)\n", rc, pUuid));
     4762    LogFlowFunc(("returns %Rrc (%RTuuid)\n", rc, pUuid));
    47634763    return rc;
    47644764}
    … …  
    47674767static int vmdkSetParentModificationUuid(void *pBackendData, PCRTUUID pUuid)
    47684768{
    4769     LogFlowFunc(("pBackendData=%#p Uuid=%Vuuid\n", pBackendData, pUuid));
     4769    LogFlowFunc(("pBackendData=%#p Uuid=%RTuuid\n", pBackendData, pUuid));
    47704770    PVMDKIMAGE pImage = (PVMDKIMAGE)pBackendData;
    47714771    int rc;
    … …  
    48064806                    pImage->LCHSGeometry.cCylinders, pImage->LCHSGeometry.cHeads, pImage->LCHSGeometry.cSectors,
    48074807                    VMDK_BYTE2SECTOR(pImage->cbSize));
    4808         RTLogPrintf("Header: uuidCreation={%Vuuid}\n", &pImage->ImageUuid);
    4809         RTLogPrintf("Header: uuidModification={%Vuuid}\n", &pImage->ModificationUuid);
    4810         RTLogPrintf("Header: uuidParent={%Vuuid}\n", &pImage->ParentUuid);
    4811         RTLogPrintf("Header: uuidParentModification={%Vuuid}\n", &pImage->ParentModificationUuid);
     4808        RTLogPrintf("Header: uuidCreation={%RTuuid}\n", &pImage->ImageUuid);
     4809        RTLogPrintf("Header: uuidModification={%RTuuid}\n", &pImage->ModificationUuid);
     4810        RTLogPrintf("Header: uuidParent={%RTuuid}\n", &pImage->ParentUuid);
     4811        RTLogPrintf("Header: uuidParentModification={%RTuuid}\n", &pImage->ParentModificationUuid);
    48124812    }
    48134813}
Note: See TracChangeset for help on using the changeset viewer.

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