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

Timestamp:

Aug 8, 2008 10:32:08 PM (16 years ago)

Author:

vboxsync

Message:

Devices: %Vrc -> %Rrc (just preferred, not mandatory (yet))

Location:

trunk/src/VBox/Devices/Storage

Files:

• DevATA.cpp (modified) (8 diffs)
• DrvBlock.cpp (modified) (5 diffs)
• DrvHostBase.cpp (modified) (24 diffs)
• DrvHostDVD.cpp (modified) (6 diffs)
• DrvHostFloppy.cpp (modified) (3 diffs)
• DrvMediaISO.cpp (modified) (2 diffs)
• DrvRawImage.cpp (modified) (6 diffs)
• DrvVD.cpp (modified) (13 diffs)
• RawHDDCore.cpp (modified) (31 diffs)
• VBoxHDD-new.cpp (modified) (38 diffs)
• VBoxHDD.cpp (modified) (6 diffs)
• VDICore.cpp (modified) (46 diffs)
• VDIHDDCore.cpp (modified) (34 diffs)
• VmdkHDDCore.cpp (modified) (33 diffs)
• fdc.c (modified) (19 diffs)

trunk/src/VBox/Devices/Storage/DevATA.cpp

@@ -301 +301 @@
     if (RT_FAILURE(rc))
     {
-        LogBird(("ata: %x: schedule failed, rc=%Vrc\n", pCtl->IOPortBase1, rc));
+        LogBird(("ata: %x: schedule failed, rc=%Rrc\n", pCtl->IOPortBase1, rc));
         rc = RTSemEventSignal(pCtl->AsyncIOSem);
         AssertRC(rc);
@@ -1149 +1149 @@
         }
         if (s->cErrors++ < MAX_LOG_REL_ERRORS)
-            LogRel(("PIIX3 ATA: LUN#%d: disk read error (rc=%Vrc iSector=%#RX64 cSectors=%#RX32)\n",
+            LogRel(("PIIX3 ATA: LUN#%d: disk read error (rc=%Rrc iSector=%#RX64 cSectors=%#RX32)\n",
                     s->iLUN, rc, iLBA, cSectors));
         ataCmdError(s, ID_ERR);
@@ -1196 +1196 @@
         }
         if (s->cErrors++ < MAX_LOG_REL_ERRORS)
-            LogRel(("PIIX3 ATA: LUN#%d: disk write error (rc=%Vrc iSector=%#RX64 cSectors=%#RX32)\n",
+            LogRel(("PIIX3 ATA: LUN#%d: disk write error (rc=%Rrc iSector=%#RX64 cSectors=%#RX32)\n",
                     s->iLUN, rc, iLBA, cSectors));
         ataCmdError(s, ID_ERR);
@@ -1579 +1579 @@
                         || u8Cmd == SCSI_READ_TOC_PMA_ATIP))
                     break;
-                LogRel(("PIIX3 ATA: LUN#%d: CD-ROM passthrough command (%#04x) error %d %Vrc\n", s->iLUN, u8Cmd, uATAPISenseKey, rc));
+                LogRel(("PIIX3 ATA: LUN#%d: CD-ROM passthrough command (%#04x) error %d %Rrc\n", s->iLUN, u8Cmd, uATAPISenseKey, rc));
             } while (0);
         }
@@ -4269 +4269 @@
     pCtl->AsyncIOThread = NIL_RTTHREAD;
 
-    Log2(("%s: Ctl#%d: return %Vrc\n", __FUNCTION__, ATACONTROLLER_IDX(pCtl), rc));
+    Log2(("%s: Ctl#%d: return %Rrc\n", __FUNCTION__, ATACONTROLLER_IDX(pCtl), rc));
     return rc;
 }
@@ -5199 +5199 @@
         rc = ataConfigLun(pDevIns, pIf);
     else
-        AssertMsgFailed(("Failed to attach LUN#%d. rc=%Vrc\n", pIf->iLUN, rc));
+        AssertMsgFailed(("Failed to attach LUN#%d. rc=%Rrc\n", pIf->iLUN, rc));
 
     if (RT_FAILURE(rc))
@@ -5740 +5740 @@
     else if (rc != VERR_PDM_NO_ATTACHED_DRIVER)
     {
-        AssertMsgFailed(("Failed to attach to status driver. rc=%Vrc\n", rc));
+        AssertMsgFailed(("Failed to attach to status driver. rc=%Rrc\n", rc));
         return PDMDEV_SET_ERROR(pDevIns, rc, N_("PIIX3 cannot attach to status driver"));
     }
@@ -5797 +5797 @@
             else
             {
-                AssertMsgFailed(("Failed to attach LUN#%d. rc=%Vrc\n", pIf->iLUN, rc));
+                AssertMsgFailed(("Failed to attach LUN#%d. rc=%Rrc\n", pIf->iLUN, rc));
                 switch (rc)
                 {

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

@@ -346 +346 @@
     {
         *pPCHSGeometry = pThis->PCHSGeometry;
-        LogFlow(("%s: returns %Vrc {%d,%d,%d}\n", __FUNCTION__, rc, pThis->PCHSGeometry.cCylinders, pThis->PCHSGeometry.cHeads, pThis->PCHSGeometry.cSectors));
+        LogFlow(("%s: returns %Rrc {%d,%d,%d}\n", __FUNCTION__, rc, pThis->PCHSGeometry.cCylinders, pThis->PCHSGeometry.cHeads, pThis->PCHSGeometry.cSectors));
     }
     else if (rc == VERR_NOT_IMPLEMENTED)
     {
         rc = VERR_PDM_GEOMETRY_NOT_SET;
-        LogFlow(("%s: returns %Vrc\n", __FUNCTION__, rc));
+        LogFlow(("%s: returns %Rrc\n", __FUNCTION__, rc));
     }
     return rc;
@@ -418 +418 @@
     {
         *pLCHSGeometry = pThis->LCHSGeometry;
-        LogFlow(("%s: returns %Vrc {%d,%d,%d}\n", __FUNCTION__, rc, pThis->LCHSGeometry.cCylinders, pThis->LCHSGeometry.cHeads, pThis->LCHSGeometry.cSectors));
+        LogFlow(("%s: returns %Rrc {%d,%d,%d}\n", __FUNCTION__, rc, pThis->LCHSGeometry.cCylinders, pThis->LCHSGeometry.cHeads, pThis->LCHSGeometry.cSectors));
     }
     else if (rc == VERR_NOT_IMPLEMENTED)
     {
         rc = VERR_PDM_GEOMETRY_NOT_SET;
-        LogFlow(("%s: returns %Vrc\n", __FUNCTION__, rc));
+        LogFlow(("%s: returns %Rrc\n", __FUNCTION__, rc));
     }
     return rc;
@@ -507 +507 @@
         if (RT_FAILURE(rc))
         {
-            Log(("drvblockMount: Prepare failed for \"%s\" rc=%Vrc\n", pszFilename, rc));
+            Log(("drvblockMount: Prepare failed for \"%s\" rc=%Rrc\n", pszFilename, rc));
             return rc;
         }
@@ -519 +519 @@
     if (RT_FAILURE(rc))
     {
-        Log(("drvblockMount: Attach failed rc=%Vrc\n", rc));
+        Log(("drvblockMount: Attach failed rc=%Rrc\n", rc));
         return rc;
     }
@@ -590 +590 @@
     if (RT_FAILURE(rc))
     {
-        Log(("drvblockUnmount: Detach failed rc=%Vrc\n", rc));
+        Log(("drvblockUnmount: Detach failed rc=%Rrc\n", rc));
         return rc;
     }

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

@@ -176 +176 @@
             }
             else
-                Log(("%s-%d: drvHostBaseRead: RTFileRead(%d, %p, %#x) -> %Vrc (off=%#llx '%s')\n",
+                Log(("%s-%d: drvHostBaseRead: RTFileRead(%d, %p, %#x) -> %Rrc (off=%#llx '%s')\n",
                      pThis->pDrvIns->pDrvReg->szDriverName, pThis->pDrvIns->iInstance, pThis->FileDevice,
                      pvBuf, cbRead, rc, off, pThis->pszDevice));
         }
         else
-            Log(("%s-%d: drvHostBaseRead: RTFileSeek(%d,%#llx,) -> %Vrc\n", pThis->pDrvIns->pDrvReg->szDriverName,
+            Log(("%s-%d: drvHostBaseRead: RTFileSeek(%d,%#llx,) -> %Rrc\n", pThis->pDrvIns->pDrvReg->szDriverName,
                  pThis->pDrvIns->iInstance, pThis->FileDevice, off, rc));
 #endif
@@ -189 +189 @@
 
     RTCritSectLeave(&pThis->CritSect);
-    LogFlow(("%s-%d: drvHostBaseRead: returns %Vrc\n", pThis->pDrvIns->pDrvReg->szDriverName, pThis->pDrvIns->iInstance, rc));
+    LogFlow(("%s-%d: drvHostBaseRead: returns %Rrc\n", pThis->pDrvIns->pDrvReg->szDriverName, pThis->pDrvIns->iInstance, rc));
     return rc;
 }
@@ -226 +226 @@
                 rc = RTFileWrite(pThis->FileDevice, pvBuf, cbWrite, NULL);
                 if (RT_FAILURE(rc))
-                    Log(("%s-%d: drvHostBaseWrite: RTFileWrite(%d, %p, %#x) -> %Vrc (off=%#llx '%s')\n",
+                    Log(("%s-%d: drvHostBaseWrite: RTFileWrite(%d, %p, %#x) -> %Rrc (off=%#llx '%s')\n",
                          pThis->pDrvIns->pDrvReg->szDriverName, pThis->pDrvIns->iInstance, pThis->FileDevice,
                          pvBuf, cbWrite, rc, off, pThis->pszDevice));
             }
             else
-                Log(("%s-%d: drvHostBaseWrite: RTFileSeek(%d,%#llx,) -> %Vrc\n",
+                Log(("%s-%d: drvHostBaseWrite: RTFileSeek(%d,%#llx,) -> %Rrc\n",
                      pThis->pDrvIns->pDrvReg->szDriverName, pThis->pDrvIns->iInstance, pThis->FileDevice, off, rc));
 #endif
@@ -242 +242 @@
 
     RTCritSectLeave(&pThis->CritSect);
-    LogFlow(("%s-%d: drvHostBaseWrite: returns %Vrc\n", pThis->pDrvIns->pDrvReg->szDriverName, pThis->pDrvIns->iInstance, rc));
+    LogFlow(("%s-%d: drvHostBaseWrite: returns %Rrc\n", pThis->pDrvIns->pDrvReg->szDriverName, pThis->pDrvIns->iInstance, rc));
     return rc;
 }
@@ -269 +269 @@
 
     RTCritSectLeave(&pThis->CritSect);
-    LogFlow(("%s-%d: drvHostBaseFlush: returns %Vrc\n", pThis->pDrvIns->pDrvReg->szDriverName, pThis->pDrvIns->iInstance, rc));
+    LogFlow(("%s-%d: drvHostBaseFlush: returns %Rrc\n", pThis->pDrvIns->pDrvReg->szDriverName, pThis->pDrvIns->iInstance, rc));
     return rc;
 }
@@ -347 +347 @@
 
     RTCritSectLeave(&pThis->CritSect);
-    LogFlow(("%s-%d: %s: returns %Vrc CHS={%d,%d,%d}\n",
+    LogFlow(("%s-%d: %s: returns %Rrc CHS={%d,%d,%d}\n",
              pThis->pDrvIns->pDrvReg->szDriverName, pThis->pDrvIns->iInstance, __FUNCTION__, rc, pThis->PCHSGeometry.cCylinders, pThis->PCHSGeometry.cHeads, pThis->PCHSGeometry.cSectors));
     return rc;
@@ -399 +399 @@
 
     RTCritSectLeave(&pThis->CritSect);
-    LogFlow(("%s-%d: %s: returns %Vrc CHS={%d,%d,%d}\n",
+    LogFlow(("%s-%d: %s: returns %Rrc CHS={%d,%d,%d}\n",
              pThis->pDrvIns->pDrvReg->szDriverName, pThis->pDrvIns->iInstance, __FUNCTION__, rc, pThis->LCHSGeometry.cCylinders, pThis->LCHSGeometry.cHeads, pThis->LCHSGeometry.cSectors));
     return rc;
@@ -496 +496 @@
 
     RTCritSectLeave(&pThis->CritSect);
-    LogFlow(("%s-%d: drvHostBaseLock: returns %Vrc\n", pThis->pDrvIns->pDrvReg->szDriverName, pThis->pDrvIns->iInstance, rc));
+    LogFlow(("%s-%d: drvHostBaseLock: returns %Rrc\n", pThis->pDrvIns->pDrvReg->szDriverName, pThis->pDrvIns->iInstance, rc));
     return rc;
 }
@@ -519 +519 @@
 
     RTCritSectLeave(&pThis->CritSect);
-    LogFlow(("%s-%d: drvHostBaseUnlock: returns %Vrc\n", pThis->pDrvIns->pDrvReg->szDriverName, pThis->pDrvIns->iInstance, rc));
+    LogFlow(("%s-%d: drvHostBaseUnlock: returns %Rrc\n", pThis->pDrvIns->pDrvReg->szDriverName, pThis->pDrvIns->iInstance, rc));
     return rc;
 }
@@ -995 +995 @@
         if (!pThis->fReadOnlyConfig)
         {
-            LogFlow(("%s-%d: drvHostBaseReopen: '%s' - retry readonly (%Vrc)\n", pThis->pDrvIns->pDrvReg->szDriverName, pThis->pDrvIns->iInstance, pThis->pszDeviceOpen, rc));
+            LogFlow(("%s-%d: drvHostBaseReopen: '%s' - retry readonly (%Rrc)\n", pThis->pDrvIns->pDrvReg->szDriverName, pThis->pDrvIns->iInstance, pThis->pszDeviceOpen, rc));
 #ifdef RT_OS_SOLARIS
             rc = drvHostBaseOpen(pThis, &FileDevice, &FileRawDevice, false);
@@ -1004 +1004 @@
         if (RT_FAILURE(rc))
         {
-            LogFlow(("%s-%d: failed to open device '%s', rc=%Vrc\n",
+            LogFlow(("%s-%d: failed to open device '%s', rc=%Rrc\n",
                      pThis->pDrvIns->pDrvReg->szDriverName, pThis->pDrvIns->iInstance, pThis->pszDevice, rc));
             return rc;
@@ -1217 +1217 @@
                : VERR_WRITE_ERROR;
             if (pThis->cLogRelErrors++ < 10)
-                LogRel(("DVD scsi error: cmd={%.*Rhxs} TaskStatus=%#x key=%#x ASC=%#x ASCQ=%#x (%Vrc)\n",
+                LogRel(("DVD scsi error: cmd={%.*Rhxs} TaskStatus=%#x key=%#x ASC=%#x ASCQ=%#x (%Rrc)\n",
                         cbCmd, pbCmd, TaskStatus, SenseData.SENSE_KEY, SenseData.ADDITIONAL_SENSE_CODE,
                         SenseData.ADDITIONAL_SENSE_CODE_QUALIFIER, rc));
@@ -1254 +1254 @@
     if (RT_FAILURE(rc))
     {
-        LogFlow(("%s-%d: failed to figure media size of %s, rc=%Vrc\n",
+        LogFlow(("%s-%d: failed to figure media size of %s, rc=%Rrc\n",
                  pThis->pDrvIns->pDrvReg->szDriverName, pThis->pDrvIns->iInstance, pThis->pszDevice, rc));
         return rc;
@@ -1452 +1452 @@
             &&  rc != VERR_TIMEOUT)
         {
-            AssertMsgFailed(("rc=%Vrc\n", rc));
+            AssertMsgFailed(("rc=%Rrc\n", rc));
             pThis->ThreadPoller = NIL_RTTHREAD;
-            LogFlow(("drvHostBaseMediaThread: returns %Vrc\n", rc));
+            LogFlow(("drvHostBaseMediaThread: returns %Rrc\n", rc));
             return rc;
         }
@@ -1754 +1754 @@
     else if (RT_FAILURE(rc))
     {
-        AssertMsgFailed(("Configuration error: Query \"Mountable\" resulted in %Vrc.\n", rc));
+        AssertMsgFailed(("Configuration error: Query \"Mountable\" resulted in %Rrc.\n", rc));
         return rc;
     }
@@ -1764 +1764 @@
     else if (RT_FAILURE(rc))
     {
-        AssertMsgFailed(("Configuration error: Query \"ReadOnly\" resulted in %Vrc.\n", rc));
+        AssertMsgFailed(("Configuration error: Query \"ReadOnly\" resulted in %Rrc.\n", rc));
         return rc;
     }
@@ -1774 +1774 @@
     else if (RT_FAILURE(rc))
     {
-        AssertMsgFailed(("Configuration error: Query \"Locked\" resulted in %Vrc.\n", rc));
+        AssertMsgFailed(("Configuration error: Query \"Locked\" resulted in %Rrc.\n", rc));
         return rc;
     }
@@ -1784 +1784 @@
     else if (RT_FAILURE(rc))
     {
-        AssertMsgFailed(("Configuration error: Query \"BIOSVisible\" resulted in %Vrc.\n", rc));
+        AssertMsgFailed(("Configuration error: Query \"BIOSVisible\" resulted in %Rrc.\n", rc));
         return rc;
     }
@@ -1798 +1798 @@
         if (RT_FAILURE(rc))
         {
-            AssertMsgFailed(("Configuration error: Uuid from string failed on \"%s\", rc=%Vrc.\n", psz, rc));
+            AssertMsgFailed(("Configuration error: Uuid from string failed on \"%s\", rc=%Rrc.\n", psz, rc));
             MMR3HeapFree(psz);
             return rc;
@@ -1806 +1806 @@
     else
     {
-        AssertMsgFailed(("Configuration error: Failed to obtain the uuid, rc=%Vrc.\n", rc));
+        AssertMsgFailed(("Configuration error: Failed to obtain the uuid, rc=%Rrc.\n", rc));
         return rc;
     }
@@ -1874 +1874 @@
     if (rc != VERR_PDM_NO_ATTACHED_DRIVER)
     {
-        AssertMsgFailed(("Configuration error: No attached driver, please! (rc=%Vrc)\n", rc));
+        AssertMsgFailed(("Configuration error: No attached driver, please! (rc=%Rrc)\n", rc));
         return VERR_PDM_DRVINS_NO_ATTACH;
     }
@@ -1952 +1952 @@
          */
         pThis->IBlock.pfnSendCmd = NULL;
-        AssertMsgFailed(("Could not open host device %s, rc=%Vrc\n", pszDevice, rc));
+        AssertMsgFailed(("Could not open host device %s, rc=%Rrc\n", pszDevice, rc));
         switch (rc)
         {
@@ -1994 +1994 @@
         if (RT_FAILURE(rc))
         {
-            AssertMsgFailed(("Failed to lock the dvd drive. rc=%Vrc\n", rc));
+            AssertMsgFailed(("Failed to lock the dvd drive. rc=%Rrc\n", rc));
             return rc;
         }
@@ -2027 +2027 @@
         if (RT_FAILURE(rc))
         {
-            AssertMsgFailed(("Failed to create poller thread. rc=%Vrc\n", rc));
+            AssertMsgFailed(("Failed to create poller thread. rc=%Rrc\n", rc));
             return rc;
         }

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

@@ -199 +199 @@
 
      RTCritSectLeave(&pThis->CritSect);
-     LogFlow(("drvHostDvdUnmount: returns %Vrc\n", rc));
+     LogFlow(("drvHostDvdUnmount: returns %Rrc\n", rc));
      return rc;
 }
@@ -265 +265 @@
 #endif
 
-    LogFlow(("drvHostDvdDoLock(, fLock=%RTbool): returns %Vrc\n", fLock, rc));
+    LogFlow(("drvHostDvdDoLock(, fLock=%RTbool): returns %Rrc\n", fLock, rc));
     return rc;
 }
@@ -472 +472 @@
             *pbStat = cgc.sense->sense_key;
             rc = RTErrConvertFromErrno(errno);
-            Log2(("%s: error status %d, rc=%Vrc\n", __FUNCTION__, cgc.stat, rc));
+            Log2(("%s: error status %d, rc=%Rrc\n", __FUNCTION__, cgc.stat, rc));
         }
     }
@@ -541 +541 @@
             *pbStat = aSense[2] & 0x0f;
             rc = RTErrConvertFromErrno(errno);
-            Log2(("%s: error status. rc=%Vrc\n", __FUNCTION__, rc));
+            Log2(("%s: error status. rc=%Rrc\n", __FUNCTION__, rc));
         }
         else
@@ -609 +609 @@
 # error "Unsupported platform."
 #endif
-    LogFlow(("%s: rc=%Vrc\n", __FUNCTION__, rc));
+    LogFlow(("%s: rc=%Rrc\n", __FUNCTION__, rc));
     return rc;
 }
@@ -765 +765 @@
     }
 
-    LogFlow(("drvHostDvdConstruct: returns %Vrc\n", rc));
+    LogFlow(("drvHostDvdConstruct: returns %Rrc\n", rc));
     return rc;
 }

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

@@ -81 +81 @@
     {
         rc = RTErrConvertFromErrno (errno);
-        Log(("DrvHostFloppy: FDFLUSH ioctl(%s) failed, errno=%d rc=%Vrc\n", pThis->pszDevice, errno, rc));
+        Log(("DrvHostFloppy: FDFLUSH ioctl(%s) failed, errno=%d rc=%Rrc\n", pThis->pszDevice, errno, rc));
         return rc;
     }
@@ -90 +90 @@
     {
         rc = RTErrConvertFromErrno(errno);
-        Log(("DrvHostFloppy: FDGETDRVSTAT ioctl(%s) failed, errno=%d rc=%Vrc\n", pThis->pszDevice, errno, rc));
+        Log(("DrvHostFloppy: FDGETDRVSTAT ioctl(%s) failed, errno=%d rc=%Rrc\n", pThis->pszDevice, errno, rc));
         return rc;
     }
@@ -190 +190 @@
     }
 
-    LogFlow(("drvHostFloppyConstruct: returns %Vrc\n", rc));
+    LogFlow(("drvHostFloppyConstruct: returns %Rrc\n", rc));
     return rc;
 }

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

@@ -188 +188 @@
     }
 
-    AssertMsgFailed(("Error querying ISO file size, rc=%Vrc. (%s)\n", rc, pThis->pszFilename));
+    AssertMsgFailed(("Error querying ISO file size, rc=%Rrc. (%s)\n", rc, pThis->pszFilename));
     return 0;
 }
@@ -249 +249 @@
         }
         else
-            AssertMsgFailed(("RTFileRead(%d, %p, %#x) -> %Vrc (off=%#llx '%s')\n",
+            AssertMsgFailed(("RTFileRead(%d, %p, %#x) -> %Rrc (off=%#llx '%s')\n",
                              pThis->File, pvBuf, cbRead, rc, off, pThis->pszFilename));
     }
     else
-        AssertMsgFailed(("RTFileSeek(%d,%#llx,) -> %Vrc\n", pThis->File, off, rc));
-    LogFlow(("drvMediaISORead: returns %Vrc\n", rc));
+        AssertMsgFailed(("RTFileSeek(%d,%#llx,) -> %Rrc\n", pThis->File, off, rc));
+    LogFlow(("drvMediaISORead: returns %Rrc\n", rc));
     return rc;
 }

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

@@ -133 +133 @@
     if (RT_FAILURE(rc))
     {
-        AssertMsgFailed(("Configuration error: query for \"Path\" string return %Vrc.\n", rc));
+        AssertMsgFailed(("Configuration error: query for \"Path\" string return %Rrc.\n", rc));
         return rc;
     }
@@ -160 +160 @@
         else
         {
-            AssertMsgFailed(("Could not open Raw image file %s, rc=%Vrc\n", pszName, rc));
+            AssertMsgFailed(("Could not open Raw image file %s, rc=%Rrc\n", pszName, rc));
             MMR3HeapFree(pszName);
         }
@@ -206 +206 @@
     }
 
-    AssertMsgFailed(("Error querying Raw image file size, rc=%Vrc. (%s)\n", rc, pThis->pszFilename));
+    AssertMsgFailed(("Error querying Raw image file size, rc=%Rrc. (%s)\n", rc, pThis->pszFilename));
     return 0;
 }
@@ -267 +267 @@
         }
         else
-            AssertMsgFailed(("RTFileRead(%d, %p, %#x) -> %Vrc (off=%#llx '%s')\n",
+            AssertMsgFailed(("RTFileRead(%d, %p, %#x) -> %Rrc (off=%#llx '%s')\n",
                              pThis->File, pvBuf, cbRead, rc, off, pThis->pszFilename));
     }
     else
-        AssertMsgFailed(("RTFileSeek(%d,%#llx,) -> %Vrc\n", pThis->File, off, rc));
-    LogFlow(("drvRawImageRead: returns %Vrc\n", rc));
+        AssertMsgFailed(("RTFileSeek(%d,%#llx,) -> %Rrc\n", pThis->File, off, rc));
+    LogFlow(("drvRawImageRead: returns %Rrc\n", rc));
     return rc;
 }
@@ -301 +301 @@
         }
         else
-            AssertMsgFailed(("RTFileWrite(%d, %p, %#x) -> %Vrc (off=%#llx '%s')\n",
+            AssertMsgFailed(("RTFileWrite(%d, %p, %#x) -> %Rrc (off=%#llx '%s')\n",
                              pThis->File, pvBuf, cbWrite, rc, off, pThis->pszFilename));
     }
     else
-        AssertMsgFailed(("RTFileSeek(%d,%#llx,) -> %Vrc\n", pThis->File, off, rc));
-    LogFlow(("drvRawImageWrite: returns %Vrc\n", rc));
+        AssertMsgFailed(("RTFileSeek(%d,%#llx,) -> %Rrc\n", pThis->File, off, rc));
+    LogFlow(("drvRawImageWrite: returns %Rrc\n", rc));
     return rc;
 }
@@ -319 +319 @@
     Assert(pThis->File != NIL_RTFILE);
     int rc = RTFileFlush(pThis->File);
-    LogFlow(("drvRawImageFlush: returns %Vrc\n", rc));
+    LogFlow(("drvRawImageFlush: returns %Rrc\n", rc));
     return rc;
 }

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

@@ -281 +281 @@
         Log2(("%s: off=%#llx pvBuf=%p cbRead=%d %.*Vhxd\n", __FUNCTION__,
               off, pvBuf, cbRead, cbRead, pvBuf));
-    LogFlow(("%s: returns %Vrc\n", __FUNCTION__, rc));
+    LogFlow(("%s: returns %Rrc\n", __FUNCTION__, rc));
     return rc;
 }
@@ -296 +296 @@
           off, pvBuf, cbWrite, cbWrite, pvBuf));
     int rc = VDWrite(pThis->pDisk, off, pvBuf, cbWrite);
-    LogFlow(("%s: returns %Vrc\n", __FUNCTION__, rc));
+    LogFlow(("%s: returns %Rrc\n", __FUNCTION__, rc));
     return rc;
 }
@@ -306 +306 @@
     PVBOXDISK pThis = PDMIMEDIA_2_VBOXDISK(pInterface);
     int rc = VDFlush(pThis->pDisk);
-    LogFlow(("%s: returns %Vrc\n", __FUNCTION__, rc));
+    LogFlow(("%s: returns %Rrc\n", __FUNCTION__, rc));
     return rc;
 }
@@ -342 +342 @@
         rc = VERR_PDM_GEOMETRY_NOT_SET;
     }
-    LogFlow(("%s: returns %Vrc (CHS=%d/%d/%d)\n", __FUNCTION__,
+    LogFlow(("%s: returns %Rrc (CHS=%d/%d/%d)\n", __FUNCTION__,
              rc, pPCHSGeometry->cCylinders, pPCHSGeometry->cHeads, pPCHSGeometry->cSectors));
     return rc;
@@ -355 +355 @@
     PVBOXDISK pThis = PDMIMEDIA_2_VBOXDISK(pInterface);
     int rc = VDSetPCHSGeometry(pThis->pDisk, VD_LAST_IMAGE, pPCHSGeometry);
-    LogFlow(("%s: returns %Vrc\n", __FUNCTION__, rc));
+    LogFlow(("%s: returns %Rrc\n", __FUNCTION__, rc));
     return rc;
 }
@@ -371 +371 @@
         rc = VERR_PDM_GEOMETRY_NOT_SET;
     }
-    LogFlow(("%s: returns %Vrc (CHS=%d/%d/%d)\n", __FUNCTION__,
+    LogFlow(("%s: returns %Rrc (CHS=%d/%d/%d)\n", __FUNCTION__,
              rc, pLCHSGeometry->cCylinders, pLCHSGeometry->cHeads, pLCHSGeometry->cSectors));
     return rc;
@@ -384 +384 @@
     PVBOXDISK pThis = PDMIMEDIA_2_VBOXDISK(pInterface);
     int rc = VDSetLCHSGeometry(pThis->pDisk, VD_LAST_IMAGE, pLCHSGeometry);
-    LogFlow(("%s: returns %Vrc\n", __FUNCTION__, rc));
+    LogFlow(("%s: returns %Rrc\n", __FUNCTION__, rc));
     return rc;
 }
@@ -394 +394 @@
     PVBOXDISK pThis = PDMIMEDIA_2_VBOXDISK(pInterface);
     int rc = VDGetUuid(pThis->pDisk, 0, pUuid);
-    LogFlow(("%s: returns %Vrc ({%Vuuid})\n", __FUNCTION__, rc, pUuid));
+    LogFlow(("%s: returns %Rrc ({%Vuuid})\n", __FUNCTION__, rc, pUuid));
     return rc;
 }
@@ -410 +410 @@
     PVBOXDISK pThis = PDMIMEDIAASYNC_2_VBOXDISK(pInterface);
     int rc = VDAsyncRead(pThis->pDisk, uOffset, cbRead, paSeg, cSeg, pvUser);
-    LogFlow(("%s: returns %Vrc\n", __FUNCTION__, rc));
+    LogFlow(("%s: returns %Rrc\n", __FUNCTION__, rc));
     return rc;
 }
@@ -422 +422 @@
     PVBOXDISK pThis = PDMIMEDIAASYNC_2_VBOXDISK(pInterface);
     int rc = VDAsyncWrite(pThis->pDisk, uOffset, cbWrite, paSeg, cSeg, pvUser);
-    LogFlow(("%s: returns %Vrc\n", __FUNCTION__, rc));
+    LogFlow(("%s: returns %Rrc\n", __FUNCTION__, rc));
     return rc;
 }
@@ -600 +600 @@
         else if (RT_FAILURE(rc))
         {
-            AssertMsgFailed(("Failed to attach async transport driver below rc=%Vrc\n", rc));
+            AssertMsgFailed(("Failed to attach async transport driver below rc=%Rrc\n", rc));
         }
         else
@@ -748 +748 @@
         else
         {
-           AssertMsgFailed(("Failed to open image '%s' rc=%Vrc\n", pszName, rc));
+           AssertMsgFailed(("Failed to open image '%s' rc=%Rrc\n", pszName, rc));
            break;
         }
@@ -816 +816 @@
     {
         rc = RTCacheCreate(&pThis->pCache, 0, sizeof(DRVVDASYNCTASK), RTOBJCACHE_PROTECT_INSERT);
-        AssertMsg(RT_SUCCESS(rc), ("Failed to create cache rc=%Vrc\n", rc));
-    }
-
-    LogFlow(("%s: returns %Vrc\n", __FUNCTION__, rc));
+        AssertMsg(RT_SUCCESS(rc), ("Failed to create cache rc=%Rrc\n", rc));
+    }
+
+    LogFlow(("%s: returns %Rrc\n", __FUNCTION__, rc));
     return rc;
 }

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

@@ -302 +302 @@
 
 out:
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -350 +350 @@
 
 out:
-    LogFlowFunc(("returns %Vrc (pBackendData=%#p)\n", rc, *ppBackendData));
+    LogFlowFunc(("returns %Rrc (pBackendData=%#p)\n", rc, *ppBackendData));
     return rc;
 }
@@ -419 +419 @@
 
 out:
-    LogFlowFunc(("returns %Vrc (pBackendData=%#p)\n", rc, *ppBackendData));
+    LogFlowFunc(("returns %Rrc (pBackendData=%#p)\n", rc, *ppBackendData));
     return rc;
 }
@@ -429 +429 @@
     int rc = VERR_NOT_IMPLEMENTED;
 
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -445 +445 @@
         rawFreeImage(pImage, fDelete);
 
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -472 +472 @@
 
 out:
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -507 +507 @@
 
 out:
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -519 +519 @@
 
     rc = rawFlushImage(pImage);
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -552 +552 @@
         rc = VERR_VDI_NOT_OPENED;
 
-    LogFlowFunc(("returns %Vrc enmImageType=%u\n", rc, *penmImageType));
+    LogFlowFunc(("returns %Rrc enmImageType=%u\n", rc, *penmImageType));
     return rc;
 }
@@ -617 +617 @@
         rc = VERR_VDI_NOT_OPENED;
 
-    LogFlowFunc(("returns %Vrc (PCHS=%u/%u/%u)\n", rc, pPCHSGeometry->cCylinders, pPCHSGeometry->cHeads, pPCHSGeometry->cSectors));
+    LogFlowFunc(("returns %Rrc (PCHS=%u/%u/%u)\n", rc, pPCHSGeometry->cCylinders, pPCHSGeometry->cHeads, pPCHSGeometry->cSectors));
     return rc;
 }
@@ -646 +646 @@
 
 out:
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -673 +673 @@
         rc = VERR_VDI_NOT_OPENED;
 
-    LogFlowFunc(("returns %Vrc (LCHS=%u/%u/%u)\n", rc, pLCHSGeometry->cCylinders, pLCHSGeometry->cHeads, pLCHSGeometry->cSectors));
+    LogFlowFunc(("returns %Rrc (LCHS=%u/%u/%u)\n", rc, pLCHSGeometry->cCylinders, pLCHSGeometry->cHeads, pLCHSGeometry->cSectors));
     return rc;
 }
@@ -702 +702 @@
 
 out:
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -762 +762 @@
 
 out:
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -785 +785 @@
         rc = VERR_VDI_NOT_OPENED;
 
-    LogFlowFunc(("returns %Vrc comment='%s'\n", rc, pszComment));
+    LogFlowFunc(("returns %Rrc comment='%s'\n", rc, pszComment));
     return rc;
 }
@@ -810 +810 @@
 
 out:
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -828 +828 @@
         rc = VERR_VDI_NOT_OPENED;
 
-    LogFlowFunc(("returns %Vrc (%Vuuid)\n", rc, pUuid));
+    LogFlowFunc(("returns %Rrc (%Vuuid)\n", rc, pUuid));
     return rc;
 }
@@ -852 +852 @@
         rc = VERR_VDI_NOT_OPENED;
 
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -870 +870 @@
         rc = VERR_VDI_NOT_OPENED;
 
-    LogFlowFunc(("returns %Vrc (%Vuuid)\n", rc, pUuid));
+    LogFlowFunc(("returns %Rrc (%Vuuid)\n", rc, pUuid));
     return rc;
 }
@@ -893 +893 @@
         rc = VERR_VDI_NOT_OPENED;
 
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -911 +911 @@
         rc = VERR_VDI_NOT_OPENED;
 
-    LogFlowFunc(("returns %Vrc (%Vuuid)\n", rc, pUuid));
+    LogFlowFunc(("returns %Rrc (%Vuuid)\n", rc, pUuid));
     return rc;
 }
@@ -934 +934 @@
         rc = VERR_VDI_NOT_OPENED;
 
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -952 +952 @@
         rc = VERR_VDI_NOT_OPENED;
 
-    LogFlowFunc(("returns %Vrc (%Vuuid)\n", rc, pUuid));
+    LogFlowFunc(("returns %Rrc (%Vuuid)\n", rc, pUuid));
     return rc;
 }
@@ -975 +975 @@
         rc = VERR_VDI_NOT_OPENED;
 
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -997 +997 @@
 {
     int rc = VERR_NOT_IMPLEMENTED;
-    LogFlow(("%s: returned %Vrc\n", __FUNCTION__, rc));
+    LogFlow(("%s: returned %Rrc\n", __FUNCTION__, rc));
     return rc;
 }
@@ -1004 +1004 @@
 {
     int rc = VERR_NOT_IMPLEMENTED;
-    LogFlow(("%s: returned %Vrc\n", __FUNCTION__, rc));
+    LogFlow(("%s: returned %Rrc\n", __FUNCTION__, rc));
     return rc;
 }
@@ -1011 +1011 @@
 {
     int rc = VERR_NOT_IMPLEMENTED;
-    LogFlow(("%s: returned %Vrc\n", __FUNCTION__, rc));
+    LogFlow(("%s: returned %Rrc\n", __FUNCTION__, rc));
     return rc;
 }
@@ -1018 +1018 @@
 {
     int rc = VERR_NOT_IMPLEMENTED;
-    LogFlow(("%s: returned %Vrc\n", __FUNCTION__, rc));
+    LogFlow(("%s: returned %Rrc\n", __FUNCTION__, rc));
     return rc;
 }
@@ -1025 +1025 @@
 {
     int rc = VERR_NOT_IMPLEMENTED;
-    LogFlow(("%s: returned %Vrc\n", __FUNCTION__, rc));
+    LogFlow(("%s: returned %Rrc\n", __FUNCTION__, rc));
     return rc;
 }
@@ -1038 +1038 @@
 {
     int rc = VERR_NOT_IMPLEMENTED;
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -1046 +1046 @@
 {
     int rc = VERR_NOT_IMPLEMENTED;
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }

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

@@ -200 +200 @@
             if (RT_FAILURE(rc) || !pfnHDDFormatLoad)
             {
-                LogFunc(("error resolving the entry point %s in plugin %s, rc=%Vrc, pfnHDDFormat=%#p\n", VBOX_HDDFORMAT_LOAD_NAME, pszPluginName, rc, pfnHDDFormatLoad));
+                LogFunc(("error resolving the entry point %s in plugin %s, rc=%Rrc, pfnHDDFormat=%#p\n", VBOX_HDDFORMAT_LOAD_NAME, pszPluginName, rc, pfnHDDFormatLoad));
                 if (RT_SUCCESS(rc))
                     rc = VERR_SYMBOL_NOT_FOUND;
@@ -718 +718 @@
                 if (RT_FAILURE(rc) || !pfnHDDFormatLoad)
                 {
-                    LogFunc(("error resolving the entry point %s in plugin %s, rc=%Vrc, pfnHDDFormat=%#p\n", VBOX_HDDFORMAT_LOAD_NAME, pPluginDirEntry->szName, rc, pfnHDDFormatLoad));
+                    LogFunc(("error resolving the entry point %s in plugin %s, rc=%Rrc, pfnHDDFormat=%#p\n", VBOX_HDDFORMAT_LOAD_NAME, pPluginDirEntry->szName, rc, pfnHDDFormatLoad));
                     if (RT_SUCCESS(rc))
                         rc = VERR_SYMBOL_NOT_FOUND;
@@ -758 +758 @@
     } while (0);
 
-    LogFlowFunc(("returns %Vrc *pcEntriesUsed=%u\n", rc, cEntries));
+    LogFlowFunc(("returns %Rrc *pcEntriesUsed=%u\n", rc, cEntries));
     *pcEntriesUsed = cEntries;
     return rc;
@@ -827 +827 @@
     } while (0);
 
-    LogFlowFunc(("returns %Vrc (pDisk=%#p)\n", rc, pDisk));
+    LogFlowFunc(("returns %Rrc (pDisk=%#p)\n", rc, pDisk));
     return rc;
 }
@@ -962 +962 @@
                 if (RT_FAILURE(rc) || !pfnHDDFormatLoad)
                 {
-                    LogFunc(("error resolving the entry point %s in plugin %s, rc=%Vrc, pfnHDDFormat=%#p\n", VBOX_HDDFORMAT_LOAD_NAME, pPluginDirEntry->szName, rc, pfnHDDFormatLoad));
+                    LogFunc(("error resolving the entry point %s in plugin %s, rc=%Rrc, pfnHDDFormat=%#p\n", VBOX_HDDFORMAT_LOAD_NAME, pPluginDirEntry->szName, rc, pfnHDDFormatLoad));
                     if (RT_SUCCESS(rc))
                         rc = VERR_SYMBOL_NOT_FOUND;
@@ -1017 +1017 @@
     } while (0);
 
-    LogFlowFunc(("returns %Vrc *ppszFormat=\"%s\"\n", rc, *ppszFormat));
+    LogFlowFunc(("returns %Rrc *ppszFormat=\"%s\"\n", rc, *ppszFormat));
     return rc;
 }
@@ -1238 +1238 @@
     }
 
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -1443 +1443 @@
         pfnProgress(NULL /* WARNING! pVM=NULL  */, 100, pvUser);
 
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -1607 +1607 @@
         pfnProgress(NULL /* WARNING! pVM=NULL  */, 100, pvUser);
 
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -1826 +1826 @@
         pfnProgress(NULL /* WARNING! pVM=NULL */, 100, pvUser);
 
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -2066 +2066 @@
         pfnProgress(NULL /* WARNING! pVM=NULL  */, 100, pvUser);
 
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -2162 +2162 @@
     } while (0);
 
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -2206 +2206 @@
     } while (0);
 
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -2251 +2251 @@
     } while (0);
 
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -2298 +2298 @@
     } while (0);
 
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -2327 +2327 @@
     } while (0);
 
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -2485 +2485 @@
     } while (0);
 
-    LogFlowFunc(("%s: %Vrc (PCHS=%u/%u/%u)\n", __FUNCTION__, rc,
+    LogFlowFunc(("%s: %Rrc (PCHS=%u/%u/%u)\n", __FUNCTION__, rc,
                  pDisk->PCHSGeometry.cCylinders, pDisk->PCHSGeometry.cHeads,
                  pDisk->PCHSGeometry.cSectors));
@@ -2583 +2583 @@
     } while (0);
 
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -2631 +2631 @@
     } while (0);
 
-    LogFlowFunc((": %Vrc (LCHS=%u/%u/%u)\n", rc,
+    LogFlowFunc((": %Rrc (LCHS=%u/%u/%u)\n", rc,
                  pDisk->LCHSGeometry.cCylinders, pDisk->LCHSGeometry.cHeads,
                  pDisk->LCHSGeometry.cSectors));
@@ -2729 +2729 @@
     } while (0);
 
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -2766 +2766 @@
     } while (0);
 
-    LogFlowFunc(("returns %Vrc uVersion=%#x\n", rc, *puVersion));
+    LogFlowFunc(("returns %Rrc uVersion=%#x\n", rc, *puVersion));
     return rc;
 }
@@ -2810 +2810 @@
     } while (0);
 
-    LogFlowFunc(("returns %Vrc uenmType=%u\n", rc, *penmType));
+    LogFlowFunc(("returns %Rrc uenmType=%u\n", rc, *penmType));
     return rc;
 }
@@ -2856 +2856 @@
     } while (0);
 
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -2893 +2893 @@
     } while (0);
 
-    LogFlowFunc(("returns %Vrc uImageFlags=%#x\n", rc, *puImageFlags));
+    LogFlowFunc(("returns %Rrc uImageFlags=%#x\n", rc, *puImageFlags));
     return rc;
 }
@@ -2930 +2930 @@
     } while (0);
 
-    LogFlowFunc(("returns %Vrc uOpenFlags=%#x\n", rc, *puOpenFlags));
+    LogFlowFunc(("returns %Rrc uOpenFlags=%#x\n", rc, *puOpenFlags));
     return rc;
 }
@@ -2969 +2969 @@
     } while (0);
 
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -3024 +3024 @@
     } while (0);
 
-    LogFlowFunc(("returns %Vrc, pszFilename=\"%s\"\n", rc, pszFilename));
+    LogFlowFunc(("returns %Rrc, pszFilename=\"%s\"\n", rc, pszFilename));
     return rc;
 }
@@ -3067 +3067 @@
     } while (0);
 
-    LogFlowFunc(("returns %Vrc, pszComment=\"%s\"\n", rc, pszComment));
+    LogFlowFunc(("returns %Rrc, pszComment=\"%s\"\n", rc, pszComment));
     return rc;
 }
@@ -3104 +3104 @@
     } while (0);
 
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -3140 +3140 @@
     } while (0);
 
-    LogFlowFunc(("returns %Vrc, Uuid={%Vuuid}\n", rc, pUuid));
+    LogFlowFunc(("returns %Rrc, Uuid={%Vuuid}\n", rc, pUuid));
     return rc;
 }
@@ -3181 +3181 @@
     } while (0);
 
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -3217 +3217 @@
     } while (0);
 
-    LogFlowFunc(("returns %Vrc, Uuid={%Vuuid}\n", rc, pUuid));
+    LogFlowFunc(("returns %Rrc, Uuid={%Vuuid}\n", rc, pUuid));
     return rc;
 }
@@ -3260 +3260 @@
     } while (0);
 
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -3296 +3296 @@
     } while (0);
 
-    LogFlowFunc(("returns %Vrc, Uuid={%Vuuid}\n", rc, pUuid));
+    LogFlowFunc(("returns %Rrc, Uuid={%Vuuid}\n", rc, pUuid));
     return rc;
 }
@@ -3338 +3338 @@
     } while (0);
 
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -3400 +3400 @@
     } while (0);
 
-    LogFlowFunc(("returns %Vrc, fAIOSupported=%u\n", rc, *pfAIOSupported));
+    LogFlowFunc(("returns %Rrc, fAIOSupported=%u\n", rc, *pfAIOSupported));
     return rc;
 }
@@ -3472 +3472 @@
     } while (0);
 
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -3527 +3527 @@
     } while (0);
 
-    LogFlowFunc(("returns %Vrc\n", rc));
-    return rc;
-
-}
-
+    LogFlowFunc(("returns %Rrc\n", rc));
+    return rc;
+
+}
+

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

@@ -115 +115 @@
     PVDIDISK pThis = PDMIMEDIA_2_VDIDISK(pInterface);
     int rc = VDIDiskSetLCHSGeometry(pThis, pLCHSGeometry);
-    LogFlow(("%s: returns %Vrc (%d,%d,%d)\n", __FUNCTION__, rc, pLCHSGeometry->cCylinders, pLCHSGeometry->cHeads, pLCHSGeometry->cSectors));
+    LogFlow(("%s: returns %Rrc (%d,%d,%d)\n", __FUNCTION__, rc, pLCHSGeometry->cCylinders, pLCHSGeometry->cHeads, pLCHSGeometry->cSectors));
     return rc;
 }
@@ -134 +134 @@
               "%.*Vhxd\n",
               off, pvBuf, cbRead, cbRead, pvBuf));
-    LogFlow(("vdiRead: returns %Vrc\n", rc));
+    LogFlow(("vdiRead: returns %Rrc\n", rc));
     return rc;
 }
@@ -152 +152 @@
           off, pvBuf, cbWrite, cbWrite, pvBuf));
     int rc = VDIDiskWrite(pThis, off, pvBuf, cbWrite);
-    LogFlow(("vdiWrite: returns %Vrc\n", rc));
+    LogFlow(("vdiWrite: returns %Rrc\n", rc));
     return rc;
 }
@@ -168 +168 @@
     VDIFlushImage(pThis->pLast);
     int rc = VINF_SUCCESS;
-    LogFlow(("vdiFlush: returns %Vrc\n", rc));
+    LogFlow(("vdiFlush: returns %Rrc\n", rc));
     return rc;
 }
@@ -178 +178 @@
     PVDIDISK pThis = PDMIMEDIA_2_VDIDISK(pInterface);
     int rc = VDIDiskGetImageUuid(pThis, 0, pUuid);
-    LogFlow(("vdiGetUuid: returns %Vrc ({%Vuuid})\n", rc, pUuid));
+    LogFlow(("vdiGetUuid: returns %Rrc ({%Vuuid})\n", rc, pUuid));
     return rc;
 }
@@ -377 +377 @@
                  iLevel, pszName, VDIDiskIsReadOnly(pThis) ? "read-only" : "read-write"));
         else
-            AssertMsgFailed(("Failed to open image '%s' rc=%Vrc\n", pszName, rc));
+            AssertMsgFailed(("Failed to open image '%s' rc=%Rrc\n", pszName, rc));
         MMR3HeapFree(pszName);
 

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

@@ -560 +560 @@
         pfnProgress(NULL /* WARNING! pVM=NULL  */, 100, pvUser);
 
-    Log(("vdiCreateImage: done, filename=\"%s\", rc=%Vrc\n", pszFilename, rc));
+    Log(("vdiCreateImage: done, filename=\"%s\", rc=%Rrc\n", pszFilename, rc));
 
     return rc;
@@ -796 +796 @@
     RTFileClose(pImage->File);
     RTMemFree(pImage);
-    Log(("vdiOpenImage: failed, filename=\"%s\", rc=%Vrc\n", pszFilename, rc));
+    Log(("vdiOpenImage: failed, filename=\"%s\", rc=%Rrc\n", pszFilename, rc));
     return rc;
 }
@@ -833 +833 @@
         }
     }
-    AssertMsgRC(rc, ("vdiUpdateHeader failed, filename=\"%s\" rc=%Vrc\n", pImage->szFilename, rc));
+    AssertMsgRC(rc, ("vdiUpdateHeader failed, filename=\"%s\" rc=%Rrc\n", pImage->szFilename, rc));
     return rc;
 }
@@ -856 +856 @@
                              sizeof(VDIIMAGEBLOCKPOINTER),
                              NULL);
-        AssertMsgRC(rc, ("vdiUpdateBlockInfo failed to update block=%u, filename=\"%s\", rc=%Vrc\n",
+        AssertMsgRC(rc, ("vdiUpdateBlockInfo failed to update block=%u, filename=\"%s\", rc=%Rrc\n",
                          uBlock, pImage->szFilename, rc));
     }
@@ -878 +878 @@
                              sizeof(VDIIMAGEBLOCKPOINTER) * getImageBlocks(&pImage->Header),
                              NULL);
-        AssertMsgRC(rc, ("vdiUpdateBlocks failed, filename=\"%s\", rc=%Vrc\n",
+        AssertMsgRC(rc, ("vdiUpdateBlocks failed, filename=\"%s\", rc=%Rrc\n",
                          pImage->szFilename, rc));
     }
@@ -955 +955 @@
         /* Save header. */
         int rc = vdiUpdateHeader(pImage);
-        AssertMsgRC(rc, ("vdiUpdateHeader() failed, filename=\"%s\", rc=%Vrc\n",
+        AssertMsgRC(rc, ("vdiUpdateHeader() failed, filename=\"%s\", rc=%Rrc\n",
                          pImage->szFilename, rc));
         RTFileFlush(pImage->File);
@@ -1001 +1001 @@
             rc = RTFileRead(pImage->File, pvBuf, cbToRead, NULL);
         if (RT_FAILURE(rc))
-            Log(("vdiReadInBlock: rc=%Vrc filename=\"%s\" uBlock=%u offRead=%u cbToRead=%u u64Offset=%llu\n",
+            Log(("vdiReadInBlock: rc=%Rrc filename=\"%s\" uBlock=%u offRead=%u cbToRead=%u u64Offset=%llu\n",
                  rc, pImage->szFilename, uBlock, offRead, cbToRead, u64Offset));
         return rc;
@@ -1104 +1104 @@
     if (RT_FAILURE(rc))
     {
-        Log(("vdiFillBlockByZeroes: seek rc=%Vrc filename=\"%s\" uBlock=%u u64Offset=%llu\n",
+        Log(("vdiFillBlockByZeroes: seek rc=%Rrc filename=\"%s\" uBlock=%u u64Offset=%llu\n",
              rc, pImage->szFilename, uBlock, u64Offset));
         return rc;
@@ -1123 +1123 @@
         if (RT_FAILURE(rc))
         {
-            Log(("vdiFillBlockByZeroes: write rc=%Vrc filename=\"%s\" uBlock=%u u64Offset=%llu cbFill=%u to_fill=%u\n",
+            Log(("vdiFillBlockByZeroes: write rc=%Rrc filename=\"%s\" uBlock=%u u64Offset=%llu cbFill=%u to_fill=%u\n",
                  rc, pImage->szFilename, uBlock, u64Offset, cbFill, to_fill));
             break;
@@ -1180 +1180 @@
         if (RT_FAILURE(rc))
         {
-            Log(("vdiWriteInBlock: set size rc=%Vrc filename=\"%s\" uBlock=%u u64Size=%llu\n",
+            Log(("vdiWriteInBlock: set size rc=%Rrc filename=\"%s\" uBlock=%u u64Size=%llu\n",
                  rc, pImage->szFilename, uBlock, u64Size));
             return rc;
@@ -1215 +1215 @@
         rc = RTFileWrite(pImage->File, pvBuf, cbToWrite, NULL);
         if (RT_FAILURE(rc))
-            Log(("vdiWriteInBlock: write rc=%Vrc filename=\"%s\" uBlock=%u offWrite=%u u64Offset=%llu cbToWrite=%u\n",
+            Log(("vdiWriteInBlock: write rc=%Rrc filename=\"%s\" uBlock=%u offWrite=%u u64Offset=%llu cbToWrite=%u\n",
                  rc, pImage->szFilename, uBlock, offWrite, u64Offset, cbToWrite));
     }
     else
-        Log(("vdiWriteInBlock: seek rc=%Vrc filename=\"%s\" uBlock=%u offWrite=%u u64Offset=%llu\n",
+        Log(("vdiWriteInBlock: seek rc=%Rrc filename=\"%s\" uBlock=%u offWrite=%u u64Offset=%llu\n",
              rc, pImage->szFilename, uBlock, offWrite, u64Offset));
 
@@ -1641 +1641 @@
         {
             rc = rc2;
-            Log(("vdiCommitToImage: set size (truncate) rc=%Vrc filename=\"%s\"\n",
+            Log(("vdiCommitToImage: set size (truncate) rc=%Rrc filename=\"%s\"\n",
                  rc, pImage->szFilename));
         }
@@ -1650 +1650 @@
         {
             rc = rc2;
-            Log(("vdiCommitToImage: update blocks and header rc=%Vrc filename=\"%s\"\n",
+            Log(("vdiCommitToImage: update blocks and header rc=%Rrc filename=\"%s\"\n",
                  rc, pImage->szFilename));
         }
@@ -1661 +1661 @@
     }
 
-    Log(("vdiCommitToImage: done, rc=%Vrc\n", rc));
+    Log(("vdiCommitToImage: done, rc=%Rrc\n", rc));
 
     return rc;
@@ -1730 +1730 @@
     }
 
-    LogFlow(("VDICheckImage: returns %Vrc\n", rc));
+    LogFlow(("VDICheckImage: returns %Rrc\n", rc));
     return rc;
 }
@@ -1769 +1769 @@
     if (RT_FAILURE(rc))
     {
-        Log(("VDISetImageComment: vdiOpenImage rc=%Vrc filename=\"%s\"!\n", rc, pszFilename));
+        Log(("VDISetImageComment: vdiOpenImage rc=%Rrc filename=\"%s\"!\n", rc, pszFilename));
         return rc;
     }
@@ -1785 +1785 @@
             /* write out new the header */
             rc = vdiUpdateHeader(pImage);
-            AssertMsgRC(rc, ("vdiUpdateHeader() failed, filename=\"%s\", rc=%Vrc\n",
+            AssertMsgRC(rc, ("vdiUpdateHeader() failed, filename=\"%s\", rc=%Rrc\n",
                              pImage->szFilename, rc));
         }
@@ -1833 +1833 @@
     int rc = vdiCreateImage(pszFilename, enmType, VDI_IMAGE_FLAGS_DEFAULT, cbSize, pszComment, NULL,
                             pfnProgress, pvUser);
-    LogFlow(("VDICreateBaseImage: returns %Vrc for filename=\"%s\"\n", rc, pszFilename));
+    LogFlow(("VDICreateBaseImage: returns %Rrc for filename=\"%s\"\n", rc, pszFilename));
     return rc;
 }
@@ -1873 +1873 @@
         vdiCloseImage(pParent);
     }
-    LogFlow(("VDICreateDifferenceImage: returns %Vrc for filename=\"%s\"\n", rc, pszFilename));
+    LogFlow(("VDICreateDifferenceImage: returns %Rrc for filename=\"%s\"\n", rc, pszFilename));
     return rc;
 }
@@ -1898 +1898 @@
         rc = RTFileDelete(pszFilename);
 
-    LogFlow(("VDIDeleteImage: returns %Vrc for filename=\"%s\"\n", rc, pszFilename));
+    LogFlow(("VDIDeleteImage: returns %Rrc for filename=\"%s\"\n", rc, pszFilename));
     return rc;
 }
@@ -1941 +1941 @@
     if (RT_FAILURE(rc))
     {
-        Log(("VDICopyImage: src image \"%s\" open failed rc=%Vrc\n", pszSrcFilename, rc));
+        Log(("VDICopyImage: src image \"%s\" open failed rc=%Rrc\n", pszSrcFilename, rc));
         return rc;
     }
@@ -2065 +2065 @@
     vdiCloseImage(pImage);
 
-    LogFlow(("VDICopyImage: returns %Vrc for pszSrcFilename=\"%s\" pszDstFilename=\"%s\"\n",
+    LogFlow(("VDICopyImage: returns %Rrc for pszSrcFilename=\"%s\" pszDstFilename=\"%s\"\n",
              rc, pszSrcFilename, pszDstFilename));
     return rc;
@@ -2094 +2094 @@
     if (RT_FAILURE(rc))
     {
-        Log(("VDIShrinkImage: vdiOpenImage rc=%Vrc filename=\"%s\"\n", rc, pszFilename));
+        Log(("VDIShrinkImage: vdiOpenImage rc=%Rrc filename=\"%s\"\n", rc, pszFilename));
         return rc;
     }
@@ -2116 +2116 @@
     if (RT_FAILURE(rc))
     {
-        Log(("VDIShrinkImage: RTFileGetSize rc=%Vrc for file=\"%s\"\n", rc, pszFilename));
+        Log(("VDIShrinkImage: RTFileGetSize rc=%Rrc for file=\"%s\"\n", rc, pszFilename));
         vdiCloseImage(pImage);
         return rc;
@@ -2184 +2184 @@
                 if (RT_FAILURE(rc))
                 {
-                    Log(("VDIShrinkImage: seek rc=%Vrc filename=\"%s\" uBlock=%u cBlocks=%u cBlocksAllocated=%u cBlocksAllocated2=%u cbData=%llu\n",
+                    Log(("VDIShrinkImage: seek rc=%Rrc filename=\"%s\" uBlock=%u cBlocks=%u cBlocksAllocated=%u cBlocksAllocated2=%u cbData=%llu\n",
                          rc, pImage->szFilename, uBlock, cBlocks, cBlocksAllocated, cBlocksAllocated2, cbData));
                     break;
@@ -2191 +2191 @@
                 if (RT_FAILURE(rc))
                 {
-                    Log(("VDIShrinkImage: read rc=%Vrc filename=\"%s\" cbBlock=%u uBlock=%u cBlocks=%u cBlocksAllocated=%u cBlocksAllocated2=%u cbData=%llu\n",
+                    Log(("VDIShrinkImage: read rc=%Rrc filename=\"%s\" cbBlock=%u uBlock=%u cBlocks=%u cBlocksAllocated=%u cBlocksAllocated2=%u cbData=%llu\n",
                          rc, pImage->szFilename, cbBlock, uBlock, cBlocks, cBlocksAllocated, cBlocksAllocated2, cbData));
                     break;
@@ -2209 +2209 @@
                         if (RT_FAILURE(rc))
                         {
-                            Log(("VDIShrinkImage: seek(2) rc=%Vrc filename=\"%s\" uBlockWrite=%u cBlocks=%u cBlocksAllocated=%u cBlocksAllocated2=%u cbData=%llu\n",
+                            Log(("VDIShrinkImage: seek(2) rc=%Rrc filename=\"%s\" uBlockWrite=%u cBlocks=%u cBlocksAllocated=%u cBlocksAllocated2=%u cbData=%llu\n",
                                  rc, pImage->szFilename, uBlockWrite, cBlocks, cBlocksAllocated, cBlocksAllocated2, cbData));
                             break;
@@ -2216 +2216 @@
                         if (RT_FAILURE(rc))
                         {
-                            Log(("VDIShrinkImage: write rc=%Vrc filename=\"%s\" cbBlock=%u uBlockWrite=%u cBlocks=%u cBlocksAllocated=%u cBlocksAllocated2=%u cbData=%llu\n",
+                            Log(("VDIShrinkImage: write rc=%Rrc filename=\"%s\" cbBlock=%u uBlockWrite=%u cBlocks=%u cBlocksAllocated=%u cBlocksAllocated2=%u cbData=%llu\n",
                                  rc, pImage->szFilename, cbBlock, uBlockWrite, cBlocks, cBlocksAllocated, cBlocksAllocated2, cbData));
                             break;
@@ -2257 +2257 @@
                                pImage->offStartData + ((uint64_t)uBlockWrite << pImage->uShiftIndex2Offset));
             if (RT_FAILURE(rc))
-                Log(("VDIShrinkImage: RTFileSetSize rc=%Vrc\n", rc));
+                Log(("VDIShrinkImage: RTFileSetSize rc=%Rrc\n", rc));
         }
         cBlocksAllocated2 = uBlockWrite;
@@ -2283 +2283 @@
     vdiCloseImage(pImage);
 
-    LogFlow(("VDIShrinkImage: returns %Vrc for filename=\"%s\"\n", rc, pszFilename));
+    LogFlow(("VDIShrinkImage: returns %Rrc for filename=\"%s\"\n", rc, pszFilename));
     return rc;
 }
@@ -2312 +2312 @@
     if (RT_FAILURE(rc))
     {
-        Log(("VDIConvertImage: vdiOpenImage rc=%Vrc filename=\"%s\"\n", rc, pszFilename));
+        Log(("VDIConvertImage: vdiOpenImage rc=%Rrc filename=\"%s\"\n", rc, pszFilename));
         return rc;
     }
@@ -2486 +2486 @@
     vdiCloseImage(pImage);
 
-    LogFlow(("VDIConvertImage: returns %Vrc for filename=\"%s\"\n", rc, pszFilename));
+    LogFlow(("VDIConvertImage: returns %Rrc for filename=\"%s\"\n", rc, pszFilename));
     return rc;
 }
@@ -2521 +2521 @@
     if (RT_FAILURE(rc))
     {
-        Log(("VDIGetImageUUIDs: vdiOpenImage rc=%Vrc filename=\"%s\"\n", rc, pszFilename));
+        Log(("VDIGetImageUUIDs: vdiOpenImage rc=%Rrc filename=\"%s\"\n", rc, pszFilename));
         return rc;
     }
@@ -2597 +2597 @@
     if (RT_FAILURE(rc))
     {
-        Log(("VDISetImageUUIDs: vdiOpenImage rc=%Vrc filename=\"%s\"\n", rc, pszFilename));
+        Log(("VDISetImageUUIDs: vdiOpenImage rc=%Rrc filename=\"%s\"\n", rc, pszFilename));
         return rc;
     }
@@ -2618 +2618 @@
             /* write out new header */
             rc = vdiUpdateHeader(pImage);
-            AssertMsgRC(rc, ("vdiUpdateHeader() failed, filename=\"%s\", rc=%Vrc\n",
+            AssertMsgRC(rc, ("vdiUpdateHeader() failed, filename=\"%s\", rc=%Rrc\n",
                              pImage->szFilename, rc));
         }
@@ -2634 +2634 @@
             /* write out new header */
             rc = vdiUpdateHeader(pImage);
-            AssertMsgRC(rc, ("vdiUpdateHeader() failed, filename=\"%s\", rc=%Vrc\n",
+            AssertMsgRC(rc, ("vdiUpdateHeader() failed, filename=\"%s\", rc=%Rrc\n",
                              pImage->szFilename, rc));
         }
@@ -2681 +2681 @@
     if (RT_FAILURE(rc))
     {
-        Log(("VDIMergeImage: vdiOpenImage rc=%Vrc pstFilenameFrom=\"%s\"\n", rc, pszFilenameFrom));
+        Log(("VDIMergeImage: vdiOpenImage rc=%Rrc pstFilenameFrom=\"%s\"\n", rc, pszFilenameFrom));
         return rc;
     }
@@ -2689 +2689 @@
     if (RT_FAILURE(rc))
     {
-        Log(("VDIMergeImage: vdiOpenImage rc=%Vrc pszFilenameTo=\"%s\"\n", rc, pszFilenameTo));
+        Log(("VDIMergeImage: vdiOpenImage rc=%Rrc pszFilenameTo=\"%s\"\n", rc, pszFilenameTo));
         vdiCloseImage(pImageFrom);
         return rc;
@@ -2750 +2750 @@
     vdiCloseImage(pImageTo);
 
-    Log(("VDIMergeImage: done, returning with rc = %Vrc\n", rc));
+    Log(("VDIMergeImage: done, returning with rc = %Rrc\n", rc));
     return rc;
 }
@@ -2969 +2969 @@
             rc = VERR_VDI_GEOMETRY_NOT_SET;
 
-        LogFlow(("%s: returns %Vrc\n", __FUNCTION__, rc));
+        LogFlow(("%s: returns %Rrc\n", __FUNCTION__, rc));
         return rc;
     }
@@ -3008 +3008 @@
             rc = vdiUpdateReadOnlyHeader(pDisk->pBase);
         }
-        LogFlow(("%s: returns %Vrc\n", __FUNCTION__, rc));
+        LogFlow(("%s: returns %Rrc\n", __FUNCTION__, rc));
         return rc;
     }
@@ -3372 +3372 @@
 #endif
 
-    Log(("vdiChangeImageMode: Image \"%s\" mode change failed with rc=%Vrc, mode is %s\n",
+    Log(("vdiChangeImageMode: Image \"%s\" mode change failed with rc=%Rrc, mode is %s\n",
          pImage->szFilename, rc, (pImage->fReadOnly) ? "read-only" : "read/write"));
 
@@ -3466 +3466 @@
     }
 
-    LogFlow(("VDIDiskOpenImage: returns %Vrc\n", rc));
+    LogFlow(("VDIDiskOpenImage: returns %Rrc\n", rc));
     return rc;
 }
@@ -3585 +3585 @@
         if (RT_FAILURE(rc))
         {
-            Log(("VDIDiskCommitLastDiff: can't switch previous image into r/w mode, rc=%Vrc\n", rc));
+            Log(("VDIDiskCommitLastDiff: can't switch previous image into r/w mode, rc=%Rrc\n", rc));
             return rc;
         }
@@ -3601 +3601 @@
         /* Failed! Close all images, can't work with VHDD at all. */
         VDIDiskCloseAllImages(pDisk);
-        AssertMsgFailed(("Fatal: commit failed, rc=%Vrc\n", rc));
+        AssertMsgFailed(("Fatal: commit failed, rc=%Rrc\n", rc));
     }
 
@@ -3651 +3651 @@
             VDIDeleteImage(pszFilename);
     }
-    LogFlow(("VDIDiskCreateOpenDifferenceImage: returns %Vrc, filename=\"%s\"\n", rc, pszFilename));
+    LogFlow(("VDIDiskCreateOpenDifferenceImage: returns %Rrc, filename=\"%s\"\n", rc, pszFilename));
     return rc;
 }

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

@@ -648 +648 @@
             break;
     }
-    AssertMsgRC(rc, ("vdiUpdateHeader failed, filename=\"%s\" rc=%Vrc\n", pImage->pszFilename, rc));
+    AssertMsgRC(rc, ("vdiUpdateHeader failed, filename=\"%s\" rc=%Rrc\n", pImage->pszFilename, rc));
     return rc;
 }
@@ -667 +667 @@
                            sizeof(VDIIMAGEBLOCKPOINTER),
                            NULL);
-        AssertMsgRC(rc, ("vdiUpdateBlockInfo failed to update block=%u, filename=\"%s\", rc=%Vrc\n",
+        AssertMsgRC(rc, ("vdiUpdateBlockInfo failed to update block=%u, filename=\"%s\", rc=%Rrc\n",
                          uBlock, pImage->pszFilename, rc));
     }
@@ -682 +682 @@
         /* Save header. */
         int rc = vdiUpdateHeader(pImage);
-        AssertMsgRC(rc, ("vdiUpdateHeader() failed, filename=\"%s\", rc=%Vrc\n",
+        AssertMsgRC(rc, ("vdiUpdateHeader() failed, filename=\"%s\", rc=%Rrc\n",
                          pImage->pszFilename, rc));
         RTFileFlush(pImage->File);
@@ -742 +742 @@
 
 out:
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -791 +791 @@
 
 out:
-    LogFlowFunc(("returns %Vrc (pBackendData=%#p)\n", rc, *ppBackendData));
+    LogFlowFunc(("returns %Rrc (pBackendData=%#p)\n", rc, *ppBackendData));
     return rc;
 }
@@ -860 +860 @@
 
 out:
-    LogFlowFunc(("returns %Vrc (pBackendData=%#p)\n", rc, *ppBackendData));
+    LogFlowFunc(("returns %Rrc (pBackendData=%#p)\n", rc, *ppBackendData));
     return rc;
 }
@@ -905 +905 @@
 
 out:
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -921 +921 @@
         vdiFreeImage(pImage, fDelete);
 
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -974 +974 @@
 
 out:
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -1078 +1078 @@
 
 out:
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -1092 +1092 @@
 
     vdiFlushImage(pImage);
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -1131 +1131 @@
         rc = VERR_VDI_NOT_OPENED;
 
-    LogFlowFunc(("returns %Vrc enmImageType=%u\n", rc, *penmImageType));
+    LogFlowFunc(("returns %Rrc enmImageType=%u\n", rc, *penmImageType));
     return rc;
 }
@@ -1200 +1200 @@
         rc = VERR_VDI_NOT_OPENED;
 
-    LogFlowFunc(("returns %Vrc (PCHS=%u/%u/%u)\n", rc, pPCHSGeometry->cCylinders, pPCHSGeometry->cHeads, pPCHSGeometry->cSectors));
+    LogFlowFunc(("returns %Rrc (PCHS=%u/%u/%u)\n", rc, pPCHSGeometry->cCylinders, pPCHSGeometry->cHeads, pPCHSGeometry->cSectors));
     return rc;
 }
@@ -1229 +1229 @@
 
 out:
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -1265 +1265 @@
         rc = VERR_VDI_NOT_OPENED;
 
-    LogFlowFunc(("returns %Vrc (LCHS=%u/%u/%u)\n", rc, pLCHSGeometry->cCylinders, pLCHSGeometry->cHeads, pLCHSGeometry->cSectors));
+    LogFlowFunc(("returns %Rrc (LCHS=%u/%u/%u)\n", rc, pLCHSGeometry->cCylinders, pLCHSGeometry->cHeads, pLCHSGeometry->cSectors));
     return rc;
 }
@@ -1305 +1305 @@
 
 out:
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -1367 +1367 @@
 
 out:
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -1396 +1396 @@
         rc = VERR_VDI_NOT_OPENED;
 
-    LogFlowFunc(("returns %Vrc comment=\"%s\"\n", rc, pszComment));
+    LogFlowFunc(("returns %Rrc comment=\"%s\"\n", rc, pszComment));
     return rc;
 }
@@ -1444 +1444 @@
 
 out:
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -1465 +1465 @@
         rc = VERR_VDI_NOT_OPENED;
 
-    LogFlowFunc(("returns %Vrc (%Vuuid)\n", rc, pUuid));
+    LogFlowFunc(("returns %Rrc (%Vuuid)\n", rc, pUuid));
     return rc;
 }
@@ -1499 +1499 @@
         rc = VERR_VDI_NOT_OPENED;
 
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -1520 +1520 @@
         rc = VERR_VDI_NOT_OPENED;
 
-    LogFlowFunc(("returns %Vrc (%Vuuid)\n", rc, pUuid));
+    LogFlowFunc(("returns %Rrc (%Vuuid)\n", rc, pUuid));
     return rc;
 }
@@ -1554 +1554 @@
         rc = VERR_VDI_NOT_OPENED;
 
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -1575 +1575 @@
         rc = VERR_VDI_NOT_OPENED;
 
-    LogFlowFunc(("returns %Vrc (%Vuuid)\n", rc, pUuid));
+    LogFlowFunc(("returns %Rrc (%Vuuid)\n", rc, pUuid));
     return rc;
 }
@@ -1609 +1609 @@
         rc = VERR_VDI_NOT_OPENED;
 
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -1630 +1630 @@
         rc = VERR_VDI_NOT_OPENED;
 
-    LogFlowFunc(("returns %Vrc (%Vuuid)\n", rc, pUuid));
+    LogFlowFunc(("returns %Rrc (%Vuuid)\n", rc, pUuid));
     return rc;
 }
@@ -1661 +1661 @@
         rc = VERR_VDI_NOT_OPENED;
 
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -1730 +1730 @@
 {
     int rc = VERR_NOT_IMPLEMENTED;
-    LogFlow(("%s: returned %Vrc\n", __FUNCTION__, rc));
+    LogFlow(("%s: returned %Rrc\n", __FUNCTION__, rc));
     return rc;
 }
@@ -1737 +1737 @@
 {
     int rc = VERR_NOT_IMPLEMENTED;
-    LogFlow(("%s: returned %Vrc\n", __FUNCTION__, rc));
+    LogFlow(("%s: returned %Rrc\n", __FUNCTION__, rc));
     return rc;
 }
@@ -1744 +1744 @@
 {
     int rc = VERR_NOT_IMPLEMENTED;
-    LogFlow(("%s: returned %Vrc\n", __FUNCTION__, rc));
+    LogFlow(("%s: returned %Rrc\n", __FUNCTION__, rc));
     return rc;
 }
@@ -1751 +1751 @@
 {
     int rc = VERR_NOT_IMPLEMENTED;
-    LogFlow(("%s: returned %Vrc\n", __FUNCTION__, rc));
+    LogFlow(("%s: returned %Rrc\n", __FUNCTION__, rc));
     return rc;
 }
@@ -1758 +1758 @@
 {
     int rc = VERR_NOT_IMPLEMENTED;
-    LogFlow(("%s: returned %Vrc\n", __FUNCTION__, rc));
+    LogFlow(("%s: returned %Rrc\n", __FUNCTION__, rc));
     return rc;
 }
@@ -1771 +1771 @@
 {
     int rc = VERR_NOT_IMPLEMENTED;
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -1779 +1779 @@
 {
     int rc = VERR_NOT_IMPLEMENTED;
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }

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

@@ -3676 +3676 @@
 
 out:
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -3737 +3737 @@
 
 out:
-    LogFlowFunc(("returns %Vrc (pBackendData=%#p)\n", rc, *ppBackendData));
+    LogFlowFunc(("returns %Rrc (pBackendData=%#p)\n", rc, *ppBackendData));
     return rc;
 }
@@ -3824 +3824 @@
 
 out:
-    LogFlowFunc(("returns %Vrc (pBackendData=%#p)\n", rc, *ppBackendData));
+    LogFlowFunc(("returns %Rrc (pBackendData=%#p)\n", rc, *ppBackendData));
     return rc;
 }
@@ -4055 +4055 @@
     if (apszNewLines)
         RTMemTmpFree(apszNewLines);
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -4071 +4071 @@
         vmdkFreeImage(pImage, fDelete);
 
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -4145 +4145 @@
 
 out:
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -4256 +4256 @@
 
 out:
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -4270 +4270 @@
 
     rc = vmdkFlushImage(pImage);
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -4303 +4303 @@
         rc = VERR_VDI_NOT_OPENED;
 
-    LogFlowFunc(("returns %Vrc enmImageType=%u\n", rc, *penmImageType));
+    LogFlowFunc(("returns %Rrc enmImageType=%u\n", rc, *penmImageType));
     return rc;
 }
@@ -4374 +4374 @@
         rc = VERR_VDI_NOT_OPENED;
 
-    LogFlowFunc(("returns %Vrc (PCHS=%u/%u/%u)\n", rc, pPCHSGeometry->cCylinders, pPCHSGeometry->cHeads, pPCHSGeometry->cSectors));
+    LogFlowFunc(("returns %Rrc (PCHS=%u/%u/%u)\n", rc, pPCHSGeometry->cCylinders, pPCHSGeometry->cHeads, pPCHSGeometry->cSectors));
     return rc;
 }
@@ -4406 +4406 @@
 
 out:
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -4433 +4433 @@
         rc = VERR_VDI_NOT_OPENED;
 
-    LogFlowFunc(("returns %Vrc (LCHS=%u/%u/%u)\n", rc, pLCHSGeometry->cCylinders, pLCHSGeometry->cHeads, pLCHSGeometry->cSectors));
+    LogFlowFunc(("returns %Rrc (LCHS=%u/%u/%u)\n", rc, pLCHSGeometry->cCylinders, pLCHSGeometry->cHeads, pLCHSGeometry->cSectors));
     return rc;
 }
@@ -4465 +4465 @@
 
 out:
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -4525 +4525 @@
 
 out:
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -4560 +4560 @@
 
 out:
-    LogFlowFunc(("returns %Vrc comment='%s'\n", rc, pszComment));
+    LogFlowFunc(("returns %Rrc comment='%s'\n", rc, pszComment));
     return rc;
 }
@@ -4585 +4585 @@
 
 out:
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -4606 +4606 @@
         rc = VERR_VDI_NOT_OPENED;
 
-    LogFlowFunc(("returns %Vrc (%Vuuid)\n", rc, pUuid));
+    LogFlowFunc(("returns %Rrc (%Vuuid)\n", rc, pUuid));
     return rc;
 }
@@ -4637 +4637 @@
         rc = VERR_VDI_NOT_OPENED;
 
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -4658 +4658 @@
         rc = VERR_VDI_NOT_OPENED;
 
-    LogFlowFunc(("returns %Vrc (%Vuuid)\n", rc, pUuid));
+    LogFlowFunc(("returns %Rrc (%Vuuid)\n", rc, pUuid));
     return rc;
 }
@@ -4688 +4688 @@
         rc = VERR_VDI_NOT_OPENED;
 
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -4709 +4709 @@
         rc = VERR_VDI_NOT_OPENED;
 
-    LogFlowFunc(("returns %Vrc (%Vuuid)\n", rc, pUuid));
+    LogFlowFunc(("returns %Rrc (%Vuuid)\n", rc, pUuid));
     return rc;
 }
@@ -4739 +4739 @@
         rc = VERR_VDI_NOT_OPENED;
 
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -4760 +4760 @@
         rc = VERR_VDI_NOT_OPENED;
 
-    LogFlowFunc(("returns %Vrc (%Vuuid)\n", rc, pUuid));
+    LogFlowFunc(("returns %Rrc (%Vuuid)\n", rc, pUuid));
     return rc;
 }
@@ -4790 +4790 @@
         rc = VERR_VDI_NOT_OPENED;
 
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -4817 +4817 @@
 {
     int rc = VERR_NOT_IMPLEMENTED;
-    LogFlow(("%s: returned %Vrc\n", __FUNCTION__, rc));
+    LogFlow(("%s: returned %Rrc\n", __FUNCTION__, rc));
     return rc;
 }
@@ -4824 +4824 @@
 {
     int rc = VERR_NOT_IMPLEMENTED;
-    LogFlow(("%s: returned %Vrc\n", __FUNCTION__, rc));
+    LogFlow(("%s: returned %Rrc\n", __FUNCTION__, rc));
     return rc;
 }
@@ -4831 +4831 @@
 {
     int rc = VERR_NOT_IMPLEMENTED;
-    LogFlow(("%s: returned %Vrc\n", __FUNCTION__, rc));
+    LogFlow(("%s: returned %Rrc\n", __FUNCTION__, rc));
     return rc;
 }
@@ -4838 +4838 @@
 {
     int rc = VERR_NOT_IMPLEMENTED;
-    LogFlow(("%s: returned %Vrc\n", __FUNCTION__, rc));
+    LogFlow(("%s: returned %Rrc\n", __FUNCTION__, rc));
     return rc;
 }
@@ -4845 +4845 @@
 {
     int rc = VERR_NOT_IMPLEMENTED;
-    LogFlow(("%s: returned %Vrc\n", __FUNCTION__, rc));
+    LogFlow(("%s: returned %Rrc\n", __FUNCTION__, rc));
     return rc;
 }
@@ -4928 +4928 @@
                 if (RT_FAILURE(rc))
                 {
-                    AssertMsgFailed(("Preparing read failed rc=%Vrc\n", rc));
+                    AssertMsgFailed(("Preparing read failed rc=%Rrc\n", rc));
                     goto out;
                 }
@@ -5000 +5000 @@
                                                                 NULL, pvUser,
                                                                 NULL /* Nothing required after read. */);
-        AssertMsg(RT_SUCCESS(rc), ("Failed to enqueue tasks rc=%Vrc\n", rc));
+        AssertMsg(RT_SUCCESS(rc), ("Failed to enqueue tasks rc=%Rrc\n", rc));
     }
 
 out:
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
@@ -5064 +5064 @@
                 if (RT_FAILURE(rc))
                 {
-                    AssertMsgFailed(("Preparing read failed rc=%Vrc\n", rc));
+                    AssertMsgFailed(("Preparing read failed rc=%Rrc\n", rc));
                     goto out;
                 }
@@ -5136 +5136 @@
                                                                 NULL, pvUser,
                                                                 NULL /* Nothing required after read. */);
-        AssertMsg(RT_SUCCESS(rc), ("Failed to enqueue tasks rc=%Vrc\n", rc));
+        AssertMsg(RT_SUCCESS(rc), ("Failed to enqueue tasks rc=%Rrc\n", rc));
     }
 
 out:
-    LogFlowFunc(("returns %Vrc\n", rc));
+    LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 

trunk/src/VBox/Devices/Storage/fdc.c

@@ -1231 +1231 @@
             if (RT_FAILURE (rc)) {
                 AssertMsgFailed (
-                    ("Floppy: error getting sector %d, rc = %Vrc",
+                    ("Floppy: error getting sector %d, rc = %Rrc",
                      fd_sector (cur_drv), rc));
                 memset(fdctrl->fifo, 0, FD_SECTOR_LEN);
@@ -1248 +1248 @@
                                                  len, &read);
                 dump (fdctrl->fifo + rel_pos, len);
-                AssertMsgRC (rc, ("DMAWriteMemory -> %Vrc\n", rc));
+                AssertMsgRC (rc, ("DMAWriteMemory -> %Rrc\n", rc));
             }
 #else
@@ -1266 +1266 @@
                                                 fdctrl->data_pos,
                                                 len, &written);
-                AssertMsgRC (rc, ("DMAReadMemory -> %Vrc\n", rc));
+                AssertMsgRC (rc, ("DMAReadMemory -> %Rrc\n", rc));
             }
 #else
@@ -1295 +1295 @@
 
             if (RT_FAILURE (rc)) {
-                AssertMsgFailed (("Floppy: error writing sector %d. rc=%Vrc",
+                AssertMsgFailed (("Floppy: error writing sector %d. rc=%Rrc",
                                   fd_sector (cur_drv), rc));
                 fdctrl_stop_transfer (fdctrl, 0x60, 0x00, 0x00);
@@ -1313 +1313 @@
                 rc = PDMDevHlpDMAReadMemory (fdctrl->pDevIns, nchan, tmpbuf,
                                              fdctrl->data_pos, len, &read);
-                AssertMsg (RT_SUCCESS (rc), ("DMAReadMemory -> %Vrc\n", rc));
+                AssertMsg (RT_SUCCESS (rc), ("DMAReadMemory -> %Rrc\n", rc));
 #else
                 DMA_read_memory (nchan, tmpbuf, fdctrl->data_pos, len);
@@ -1453 +1453 @@
             if (RT_FAILURE (rc)) {
                 AssertMsgFailed (
-                    ("Floppy: error getting sector %d. rc=%Vrc\n",
+                    ("Floppy: error getting sector %d. rc=%Rrc\n",
                      fd_sector(cur_drv), rc));
                 /* Sure, image size is too small... */
@@ -1495 +1495 @@
                 if (RT_FAILURE (rc)) {
                     AssertMsgFailed (
-                        ("Floppy: error writting sector %d. rc=%Vrc\n",
+                        ("Floppy: error writting sector %d. rc=%Rrc\n",
                          fd_sector(cur_drv), rc));
                     fdctrl_stop_transfer(fdctrl, 0x60, 0x00, 0x00);
@@ -1630 +1630 @@
             if (RT_FAILURE (rc)) {
                 AssertMsgFailed (
-                    ("Floppy: Failure to read sector %d. rc=%Vrc",
+                    ("Floppy: Failure to read sector %d. rc=%Rrc",
                      fd_sector (cur_drv), rc));
             }
@@ -1720 +1720 @@
 
         if (RT_FAILURE (rc)) {
-            AssertMsgFailed (("Floppy: error formating sector %d. rc=%Vrc\n",
+            AssertMsgFailed (("Floppy: error formating sector %d. rc=%Rrc\n",
                               fd_sector (cur_drv), rc));
             fdctrl_stop_transfer(fdctrl, 0x60, 0x00, 0x00);
@@ -1789 +1789 @@
             if (RT_FAILURE (rc)) {
                 AssertMsgFailed (
-                    ("Floppy: failed to write sector %d. rc=%Vrc\n",
+                    ("Floppy: failed to write sector %d. rc=%Rrc\n",
                      fd_sector (cur_drv), rc));
             }
@@ -2621 +2621 @@
     } else {
         AssertMsg (rc == VERR_PDM_NO_ATTACHED_DRIVER,
-                   ("Failed to attach LUN#%d. rc=%Vrc\n", drv->iLUN, rc));
+                   ("Failed to attach LUN#%d. rc=%Rrc\n", drv->iLUN, rc));
         switch (rc) {
         case VERR_ACCESS_DENIED:
@@ -2642 +2642 @@
         drv->pDrvMount = NULL;
     }
-    LogFlow (("fdConfig: returns %Vrc\n", rc));
+    LogFlow (("fdConfig: returns %Rrc\n", rc));
     return rc;
 }
@@ -2686 +2686 @@
     rc = fdConfig (drv, pDevIns);
     AssertMsg (rc != VERR_PDM_NO_ATTACHED_DRIVER,
-               ("Configuration error: failed to configure drive %d, rc=%Vrc\n", rc));
+               ("Configuration error: failed to configure drive %d, rc=%Rrc\n", rc));
     if (RT_SUCCESS(rc)) {
         fd_revalidate (drv);
     }
 
-    LogFlow (("floppyAttach: returns %Vrc\n", rc));
+    LogFlow (("floppyAttach: returns %Rrc\n", rc));
     return rc;
 }
@@ -2792 +2792 @@
         irq_lvl = 6;
     else if (RT_FAILURE (rc)) {
-        AssertMsgFailed (("Configuration error: Failed to read U8 IRQ, rc=%Vrc\n", rc));
+        AssertMsgFailed (("Configuration error: Failed to read U8 IRQ, rc=%Rrc\n", rc));
         return rc;
     }
@@ -2800 +2800 @@
         dma_chann = 2;
     else if (RT_FAILURE (rc)) {
-        AssertMsgFailed (("Configuration error: Failed to read U8 DMA, rc=%Vrc\n", rc));
+        AssertMsgFailed (("Configuration error: Failed to read U8 DMA, rc=%Rrc\n", rc));
         return rc;
     }
@@ -2808 +2808 @@
         io_base = 0x3f0;
     else if (RT_FAILURE (rc)) {
-        AssertMsgFailed (("Configuration error: Failed to read U16 IOBase, rc=%Vrc\n", rc));
+        AssertMsgFailed (("Configuration error: Failed to read U16 IOBase, rc=%Rrc\n", rc));
         return rc;
     }
@@ -2816 +2816 @@
         mem_mapped = false;
     else if (RT_FAILURE (rc)) {
-        AssertMsgFailed (("Configuration error: Failed to read bool value MemMapped rc=%Vrc\n", rc));
+        AssertMsgFailed (("Configuration error: Failed to read bool value MemMapped rc=%Rrc\n", rc));
         return rc;
     }
@@ -2903 +2903 @@
             pBase->pfnQueryInterface (pBase, PDMINTERFACE_LED_CONNECTORS);
     } else if (rc != VERR_PDM_NO_ATTACHED_DRIVER) {
-        AssertMsgFailed (("Failed to attach to status driver. rc=%Vrc\n",
+        AssertMsgFailed (("Failed to attach to status driver. rc=%Rrc\n",
                           rc));
         return rc;
@@ -2916 +2916 @@
         if (    RT_FAILURE (rc)
             &&  rc != VERR_PDM_NO_ATTACHED_DRIVER) {
-            AssertMsgFailed (("Configuration error: failed to configure drive %d, rc=%Vrc\n", rc));
+            AssertMsgFailed (("Configuration error: failed to configure drive %d, rc=%Rrc\n", rc));
             return rc;
         }