Changeset 13818 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Nov 4, 2008 10:59:47 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

38809

Message:

VMM: %Vrc -> %Rrc, %Vra -> %Rra.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• EMAll.cpp (modified) (13 diffs)
• IOMAll.cpp (modified) (9 diffs)
• IOMAllMMIO.cpp (modified) (11 diffs)
• PDMAllCritSect.cpp (modified) (1 diff)
• PGMAll.cpp (modified) (3 diffs)
• PGMAllBth.h (modified) (10 diffs)
• PGMAllGst.h (modified) (1 diff)
• PGMAllHandler.cpp (modified) (2 diffs)
• PGMAllPhys.cpp (modified) (1 diff)
• PGMAllPool.cpp (modified) (6 diffs)
• TRPMAll.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMAll/EMAll.cpp

@@ -154 +154 @@
     if (RT_FAILURE(rc))
     {
-        Log(("EMInterpretDisasOne: Failed to convert %RTsel:%VGv (cpl=%d) - rc=%Vrc !!\n",
+        Log(("EMInterpretDisasOne: Failed to convert %RTsel:%VGv (cpl=%d) - rc=%Rrc !!\n",
              pCtxCore->cs, pCtxCore->rip, pCtxCore->ss & X86_SEL_RPL, rc));
         return rc;
@@ -184 +184 @@
     if (RT_SUCCESS(rc))
         return VINF_SUCCESS;
-    AssertMsgFailed(("DISCoreOne failed to GCPtrInstr=%VGv rc=%Vrc\n", GCPtrInstr, rc));
+    AssertMsgFailed(("DISCoreOne failed to GCPtrInstr=%VGv rc=%Rrc\n", GCPtrInstr, rc));
     return VERR_INTERNAL_ERROR;
 }
@@ -457 +457 @@
                 if (RT_FAILURE(rc))
                 {
-                    AssertMsgFailed(("MMGCRamRead %VGv size=%d failed with %Vrc\n", pParam1, param1.size, rc));
+                    AssertMsgFailed(("MMGCRamRead %VGv size=%d failed with %Rrc\n", pParam1, param1.size, rc));
                     return VERR_EM_INTERPRETER;
                 }
@@ -476 +476 @@
                 if (RT_FAILURE(rc))
                 {
-                    AssertMsgFailed(("MMGCRamRead %VGv size=%d failed with %Vrc\n", pParam1, param1.size, rc));
+                    AssertMsgFailed(("MMGCRamRead %VGv size=%d failed with %Rrc\n", pParam1, param1.size, rc));
                 }
                 break;
@@ -510 +510 @@
                 if (RT_FAILURE(rc))
                 {
-                    AssertMsgFailed(("emRamWrite %VGv size=%d failed with %Vrc\n", pParam1, param1.size, rc));
+                    AssertMsgFailed(("emRamWrite %VGv size=%d failed with %Rrc\n", pParam1, param1.size, rc));
                     return VERR_EM_INTERPRETER;
                 }
@@ -536 +536 @@
                 if (RT_FAILURE(rc))
                 {
-                    AssertMsgFailed(("emRamWrite %VGv size=%d failed with %Vrc\n", pParam1, param1.size, rc));
+                    AssertMsgFailed(("emRamWrite %VGv size=%d failed with %Rrc\n", pParam1, param1.size, rc));
                     return VERR_EM_INTERPRETER;
                 }
@@ -583 +583 @@
                 if (RT_FAILURE(rc))
                 {
-                    AssertMsgFailed(("emRamRead %VGv size=%d failed with %Vrc\n", pParam1, param1.size, rc));
+                    AssertMsgFailed(("emRamRead %VGv size=%d failed with %Rrc\n", pParam1, param1.size, rc));
                     return VERR_EM_INTERPRETER;
                 }
@@ -601 +601 @@
             if (RT_FAILURE(rc))
             {
-                AssertMsgFailed(("emRamWrite %VGv size=%d failed with %Vrc\n", pParam1, param1.size, rc));
+                AssertMsgFailed(("emRamWrite %VGv size=%d failed with %Rrc\n", pParam1, param1.size, rc));
                 return VERR_EM_INTERPRETER;
             }
@@ -653 +653 @@
             if (RT_FAILURE(rc))
             {
-                AssertMsgFailed(("emRamRead %VGv size=%d failed with %Vrc\n", pParam1, param1.size, rc));
+                AssertMsgFailed(("emRamRead %VGv size=%d failed with %Rrc\n", pParam1, param1.size, rc));
                 return VERR_EM_INTERPRETER;
             }
@@ -674 +674 @@
                 if (RT_FAILURE(rc))
                 {
-                    AssertMsgFailed(("emRamWrite %VGv size=%d failed with %Vrc\n", pParam1, param1.size, rc));
+                    AssertMsgFailed(("emRamWrite %VGv size=%d failed with %Rrc\n", pParam1, param1.size, rc));
                     return VERR_EM_INTERPRETER;
                 }
@@ -745 +745 @@
                 if (RT_FAILURE(rc))
                 {
-                    AssertMsgFailed(("emRamRead %VGv size=%d failed with %Vrc\n", pParam1, param1.size, rc));
+                    AssertMsgFailed(("emRamRead %VGv size=%d failed with %Rrc\n", pParam1, param1.size, rc));
                     return VERR_EM_INTERPRETER;
                 }
@@ -920 +920 @@
                 if (RT_FAILURE(rc))
                 {
-                    AssertMsgFailed(("emRamRead %VGv size=%d failed with %Vrc\n", pParam1, param1.size, rc));
+                    AssertMsgFailed(("emRamRead %VGv size=%d failed with %Rrc\n", pParam1, param1.size, rc));
                     return VERR_EM_INTERPRETER;
                 }
@@ -1029 +1029 @@
             if (RT_FAILURE(rc))
             {
-                AssertMsgFailed(("emRamRead %VGv size=%d failed with %Vrc\n", pParam1, param1.size, rc));
+                AssertMsgFailed(("emRamRead %VGv size=%d failed with %Rrc\n", pParam1, param1.size, rc));
                 return VERR_EM_INTERPRETER;
             }

trunk/src/VBox/VMM/VMMAll/IOMAll.cpp

@@ -277 +277 @@
             }
         }
-        Log3(("IOMIOPortRead: Port=%RTiop *pu32=%08RX32 cb=%d rc=%Vrc\n", Port, *pu32Value, cbValue, rc));
+        Log3(("IOMIOPortRead: Port=%RTiop *pu32=%08RX32 cb=%d rc=%Rrc\n", Port, *pu32Value, cbValue, rc));
         return rc;
     }
@@ -408 +408 @@
 # endif
 #endif
-        Log3(("IOMIOPortReadStr: Port=%RTiop pGCPtrDst=%p pcTransfer=%p:{%#x->%#x} cb=%d rc=%Vrc\n",
+        Log3(("IOMIOPortReadStr: Port=%RTiop pGCPtrDst=%p pcTransfer=%p:{%#x->%#x} cb=%d rc=%Rrc\n",
               Port, pGCPtrDst, pcTransfers, cTransfers, *pcTransfers, cb, rc));
         return rc;
@@ -528 +528 @@
 # endif
 #endif
-        Log3(("IOMIOPortWrite: Port=%RTiop u32=%08RX32 cb=%d rc=%Vrc\n", Port, u32Value, cbValue, rc));
+        Log3(("IOMIOPortWrite: Port=%RTiop u32=%08RX32 cb=%d rc=%Rrc\n", Port, u32Value, cbValue, rc));
         return rc;
     }
@@ -648 +648 @@
 # endif
 #endif
-        Log3(("IOMIOPortWriteStr: Port=%RTiop pGCPtrSrc=%p pcTransfer=%p:{%#x->%#x} cb=%d rc=%Vrc\n",
+        Log3(("IOMIOPortWriteStr: Port=%RTiop pGCPtrSrc=%p pcTransfer=%p:{%#x->%#x} cb=%d rc=%Rrc\n",
               Port, pGCPtrSrc, pcTransfers, cTransfers, *pcTransfers, cb, rc));
         return rc;
@@ -731 +731 @@
         if (RT_FAILURE(rc))
         {
-            Log(("iomInterpretCheckPortIOAccess: Port=%RTiop cb=%d %Vrc -> #GP(0)\n", Port, cb, rc));
+            Log(("iomInterpretCheckPortIOAccess: Port=%RTiop cb=%d %Rrc -> #GP(0)\n", Port, cb, rc));
             return TRPMRaiseXcptErr(pVM, pCtxCore, X86_XCPT_GP, 0);
         }
@@ -750 +750 @@
         if (rc != VINF_SUCCESS)
         {
-            Log(("iomInterpretCheckPortIOAccess: Port=%RTiop cb=%d GCPtrTss=%VGv %Vrc\n",
+            Log(("iomInterpretCheckPortIOAccess: Port=%RTiop cb=%d GCPtrTss=%VGv %Rrc\n",
                  Port, cb, GCPtrTss, rc));
             return rc;
@@ -769 +769 @@
         if (rc != VINF_SUCCESS)
         {
-            Log(("iomInterpretCheckPortIOAccess: Port=%RTiop cb=%d GCPtrTss=%VGv offTss=%#x -> %Vrc\n",
+            Log(("iomInterpretCheckPortIOAccess: Port=%RTiop cb=%d GCPtrTss=%VGv offTss=%#x -> %Rrc\n",
                  Port, cb, GCPtrTss, offTss, rc));
             return rc;
@@ -841 +841 @@
         }
         else
-            AssertMsg(rc == VINF_IOM_HC_IOPORT_READ || RT_FAILURE(rc), ("%Vrc\n", rc));
+            AssertMsg(rc == VINF_IOM_HC_IOPORT_READ || RT_FAILURE(rc), ("%Rrc\n", rc));
     }
     else
-        AssertMsg(rc == VINF_EM_RAW_GUEST_TRAP || rc == VINF_TRPM_XCPT_DISPATCHED || rc == VINF_TRPM_XCPT_DISPATCHED || RT_FAILURE(rc), ("%Vrc\n", rc));
+        AssertMsg(rc == VINF_EM_RAW_GUEST_TRAP || rc == VINF_TRPM_XCPT_DISPATCHED || rc == VINF_TRPM_XCPT_DISPATCHED || RT_FAILURE(rc), ("%Rrc\n", rc));
     return rc;
 }
@@ -892 +892 @@
          */
         rc = IOMIOPortWrite(pVM, uPort, u64Data, cbSize);
-        AssertMsg(rc == VINF_SUCCESS || rc == VINF_IOM_HC_IOPORT_WRITE || (rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST) || RT_FAILURE(rc), ("%Vrc\n", rc));
+        AssertMsg(rc == VINF_SUCCESS || rc == VINF_IOM_HC_IOPORT_WRITE || (rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST) || RT_FAILURE(rc), ("%Rrc\n", rc));
     }
     else
-        AssertMsg(rc == VINF_EM_RAW_GUEST_TRAP || rc == VINF_TRPM_XCPT_DISPATCHED || rc == VINF_TRPM_XCPT_DISPATCHED || RT_FAILURE(rc), ("%Vrc\n", rc));
+        AssertMsg(rc == VINF_EM_RAW_GUEST_TRAP || rc == VINF_TRPM_XCPT_DISPATCHED || rc == VINF_TRPM_XCPT_DISPATCHED || RT_FAILURE(rc), ("%Rrc\n", rc));
     return rc;
 }

trunk/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp

@@ -1278 +1278 @@
             case VINF_SUCCESS:
             default:
-                Log4(("IOMMMIORead: GCPhys=%RGp *pu32=%08RX32 cb=%d rc=%Vrc\n", GCPhys, *pu32Value, cbValue, rc));
+                Log4(("IOMMMIORead: GCPhys=%RGp *pu32=%08RX32 cb=%d rc=%Rrc\n", GCPhys, *pu32Value, cbValue, rc));
                 return rc;
 
@@ -1290 +1290 @@
                     default: AssertReleaseMsgFailed(("cbValue=%d GCPhys=%VGp\n", cbValue, GCPhys)); break;
                 }
-                Log4(("IOMMMIORead: GCPhys=%RGp *pu32=%08RX32 cb=%d rc=%Vrc\n", GCPhys, *pu32Value, cbValue, rc));
+                Log4(("IOMMMIORead: GCPhys=%RGp *pu32=%08RX32 cb=%d rc=%Rrc\n", GCPhys, *pu32Value, cbValue, rc));
                 return VINF_SUCCESS;
 
@@ -1302 +1302 @@
                     default: AssertReleaseMsgFailed(("cbValue=%d GCPhys=%VGp\n", cbValue, GCPhys)); break;
                 }
-                Log4(("IOMMMIORead: GCPhys=%RGp *pu32=%08RX32 cb=%d rc=%Vrc\n", GCPhys, *pu32Value, cbValue, rc));
+                Log4(("IOMMMIORead: GCPhys=%RGp *pu32=%08RX32 cb=%d rc=%Rrc\n", GCPhys, *pu32Value, cbValue, rc));
                 return VINF_SUCCESS;
         }
@@ -1378 +1378 @@
             STAM_COUNTER_INC(&pStats->CTX_SUFF_Z(Write));
 #endif
-        Log4(("IOMMMIOWrite: GCPhys=%RGp u32=%08RX32 cb=%d rc=%Vrc\n", GCPhys, u32Value, cbValue, rc));
+        Log4(("IOMMMIOWrite: GCPhys=%RGp u32=%08RX32 cb=%d rc=%Rrc\n", GCPhys, u32Value, cbValue, rc));
         return rc;
     }
@@ -1395 +1395 @@
     STAM_COUNTER_INC(&pStats->CTX_SUFF_Z(Write));
 #endif
-    Log4(("IOMMMIOWrite: GCPhys=%RGp u32=%08RX32 cb=%d rc=%Vrc\n", GCPhys, u32Value, cbValue, VINF_SUCCESS));
+    Log4(("IOMMMIOWrite: GCPhys=%RGp u32=%08RX32 cb=%d rc=%Rrc\n", GCPhys, u32Value, cbValue, VINF_SUCCESS));
     return VINF_SUCCESS;
 }
@@ -1514 +1514 @@
         pRegFrame->ecx = cTransfers;
 
-    AssertMsg(rc == VINF_SUCCESS || rc == VINF_IOM_HC_IOPORT_READ || (rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST) || RT_FAILURE(rc), ("%Vrc\n", rc));
+    AssertMsg(rc == VINF_SUCCESS || rc == VINF_IOM_HC_IOPORT_READ || (rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST) || RT_FAILURE(rc), ("%Rrc\n", rc));
     return rc;
 }
@@ -1554 +1554 @@
     if (RT_UNLIKELY(rc != VINF_SUCCESS))
     {
-        AssertMsg(rc == VINF_EM_RAW_GUEST_TRAP || rc == VINF_TRPM_XCPT_DISPATCHED || rc == VINF_TRPM_XCPT_DISPATCHED || RT_FAILURE(rc), ("%Vrc\n", rc));
+        AssertMsg(rc == VINF_EM_RAW_GUEST_TRAP || rc == VINF_TRPM_XCPT_DISPATCHED || rc == VINF_TRPM_XCPT_DISPATCHED || RT_FAILURE(rc), ("%Rrc\n", rc));
         return rc;
     }
@@ -1624 +1624 @@
     if (RT_FAILURE(rc))
     {
-        Log(("OUTS source address conversion failed -> fallback, rc=%Vrc\n", rc));
+        Log(("OUTS source address conversion failed -> fallback, rc=%Rrc\n", rc));
         return VINF_EM_RAW_EMULATE_INSTR;
     }
@@ -1634 +1634 @@
     if (rc != VINF_SUCCESS)
     {
-        Log(("OUTS will generate a trap -> fallback, rc=%Vrc\n", rc));
+        Log(("OUTS will generate a trap -> fallback, rc=%Rrc\n", rc));
         return VINF_EM_RAW_EMULATE_INSTR;
     }
@@ -1677 +1677 @@
         pRegFrame->ecx = cTransfers;
 
-    AssertMsg(rc == VINF_SUCCESS || rc == VINF_IOM_HC_IOPORT_WRITE || (rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST) || RT_FAILURE(rc), ("%Vrc\n", rc));
+    AssertMsg(rc == VINF_SUCCESS || rc == VINF_IOM_HC_IOPORT_WRITE || (rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST) || RT_FAILURE(rc), ("%Rrc\n", rc));
     return rc;
 }
@@ -1719 +1719 @@
     if (RT_UNLIKELY(rc != VINF_SUCCESS))
     {
-        AssertMsg(rc == VINF_EM_RAW_GUEST_TRAP || rc == VINF_TRPM_XCPT_DISPATCHED || rc == VINF_TRPM_XCPT_DISPATCHED || RT_FAILURE(rc), ("%Vrc\n", rc));
+        AssertMsg(rc == VINF_EM_RAW_GUEST_TRAP || rc == VINF_TRPM_XCPT_DISPATCHED || rc == VINF_TRPM_XCPT_DISPATCHED || RT_FAILURE(rc), ("%Rrc\n", rc));
         return rc;
     }

trunk/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp

@@ -95 +95 @@
      * Failed.
      */
-    LogFlow(("PDMCritSectEnter: locked => R3 (%Vrc)\n", rcBusy));
+    LogFlow(("PDMCritSectEnter: locked => R3 (%Rrc)\n", rcBusy));
     STAM_COUNTER_INC(&pCritSect->s.StatContentionRZLock);
     return rcBusy;

trunk/src/VBox/VMM/VMMAll/PGMAll.cpp

@@ -437 +437 @@
     int rc = PGM_BTH_PFN(PrefetchPage, pVM)(pVM, (RTGCUINTPTR)GCPtrPage);
     STAM_PROFILE_STOP(&pVM->pgm.s.CTX_MID_Z(Stat,Prefetch), a);
-    AssertMsg(rc == VINF_SUCCESS || rc == VINF_PGM_SYNC_CR3 || RT_FAILURE(rc), ("rc=%Vrc\n", rc));
+    AssertMsg(rc == VINF_SUCCESS || rc == VINF_PGM_SYNC_CR3 || RT_FAILURE(rc), ("rc=%Rrc\n", rc));
     return rc;
 }
@@ -581 +581 @@
         }
         else
-            AssertMsg(rc == VINF_SUCCESS, ("PGMShwGetPage %VGv failed with %Vrc\n", Addr, rc));
+            AssertMsg(rc == VINF_SUCCESS, ("PGMShwGetPage %VGv failed with %Rrc\n", Addr, rc));
     }
 
@@ -595 +595 @@
         || (fUser  && !(fPageShw & X86_PTE_US)) )
     {
-        AssertMsgFailed(("Unexpected access violation for %VGv! rc=%Vrc write=%d user=%d\n",
+        AssertMsgFailed(("Unexpected access violation for %VGv! rc=%Rrc write=%d user=%d\n",
                          Addr, rc, fWrite && !(fPageShw & X86_PTE_RW), fUser && !(fPageShw & X86_PTE_US)));
         return VINF_EM_RAW_GUEST_TRAP;

trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

@@ -605 +605 @@
                  * back to the recompiler to emulate the instruction.
                  */
-                LogFlow(("pgmPhysGetPageEx %VGp failed with %Vrc\n", GCPhys, rc));
+                LogFlow(("pgmPhysGetPageEx %VGp failed with %Rrc\n", GCPhys, rc));
                 STAM_COUNTER_INC(&pVM->pgm.s.StatRZTrap0eHandlersInvalid);
                 STAM_PROFILE_STOP(&pVM->pgm.s.StatRZTrap0eTimeHandlers, b);
@@ -759 +759 @@
                         uint64_t fPageShw;
                         rc = PGMShwGetPage(pVM, pvFault, &fPageShw, NULL);
-                        AssertMsg(RT_SUCCESS(rc) && fPageShw & X86_PTE_RW, ("rc=%Vrc fPageShw=%VX64\n", rc, fPageShw));
+                        AssertMsg(RT_SUCCESS(rc) && fPageShw & X86_PTE_RW, ("rc=%Rrc fPageShw=%VX64\n", rc, fPageShw));
 #   endif /* VBOX_STRICT */
                         STAM_PROFILE_STOP(&pVM->pgm.s.StatRZTrap0eTimeOutOfSync, c);
@@ -811 +811 @@
                     }
                     else
-                        AssertMsgFailed(("PGMGstGetPage rc=%Vrc\n", rc));
+                        AssertMsgFailed(("PGMGstGetPage rc=%Rrc\n", rc));
                 }
                 else
-                    AssertMsgFailed(("PGMGCGetPage rc=%Vrc\n", rc));
+                    AssertMsgFailed(("PGMGCGetPage rc=%Rrc\n", rc));
 #    endif /* VBOX_STRICT */
 #   endif /* PGM_WITH_PAGING(PGM_GST_TYPE, PGM_SHW_TYPE) */
@@ -921 +921 @@
     if (rc != VINF_SUCCESS)
     {
-        AssertMsg(rc == VERR_PAGE_DIRECTORY_PTR_NOT_PRESENT || rc == VERR_PAGE_MAP_LEVEL4_NOT_PRESENT, ("Unexpected rc=%Vrc\n", rc));
+        AssertMsg(rc == VERR_PAGE_DIRECTORY_PTR_NOT_PRESENT || rc == VERR_PAGE_MAP_LEVEL4_NOT_PRESENT, ("Unexpected rc=%Rrc\n", rc));
         STAM_COUNTER_INC(&pVM->pgm.s.CTX_MID_Z(Stat,InvalidatePageSkipped));
         if (!VM_FF_ISSET(pVM, VM_FF_PGM_SYNC_CR3))
@@ -1735 +1735 @@
                 else /* MMIO or invalid page: emulated in #PF handler. */
                 {
-                    LogFlow(("PGM_GCPHYS_2_PTR %VGp failed with %Vrc\n", GCPhys, rc));
+                    LogFlow(("PGM_GCPHYS_2_PTR %VGp failed with %Rrc\n", GCPhys, rc));
                     Assert(!pPTDst->a[(GCPtrPage >> SHW_PT_SHIFT) & SHW_PT_MASK].n.u1Present);
                 }
@@ -1808 +1808 @@
                 }
                 else
-                    LogFlow(("PGM_GCPHYS_2_PTR %VGp (big) failed with %Vrc\n", GCPhys, rc));
+                    LogFlow(("PGM_GCPHYS_2_PTR %VGp (big) failed with %Rrc\n", GCPhys, rc));
             }
             return VINF_SUCCESS;
@@ -2443 +2443 @@
         }
         else
-            AssertMsgFailedReturn(("rc=%Vrc\n", rc), VERR_INTERNAL_ERROR);
+            AssertMsgFailedReturn(("rc=%Rrc\n", rc), VERR_INTERNAL_ERROR);
         PdeDst.u &= X86_PDE_AVL_MASK;
         PdeDst.u |= pShwPage->Core.Key;
@@ -2761 +2761 @@
         pPTDst = (PSHWPT)PGMPOOL_PAGE_2_PTR(pVM, pShwPage);
     else
-        AssertMsgFailedReturn(("rc=%Vrc\n", rc), VERR_INTERNAL_ERROR);
+        AssertMsgFailedReturn(("rc=%Rrc\n", rc), VERR_INTERNAL_ERROR);
 
     PdeDst.u &= X86_PDE_AVL_MASK;
@@ -3270 +3270 @@
                     break; /* next PML4E */
 
-                AssertMsg(rc == VERR_PAGE_DIRECTORY_PTR_NOT_PRESENT, ("Unexpected rc=%Vrc\n", rc));
+                AssertMsg(rc == VERR_PAGE_DIRECTORY_PTR_NOT_PRESENT, ("Unexpected rc=%Rrc\n", rc));
                 continue;   /* next PDPTE */
             }
@@ -3778 +3778 @@
             if (rc != VINF_SUCCESS)
             {
-                AssertMsg(rc == VERR_PAGE_DIRECTORY_PTR_NOT_PRESENT, ("Unexpected rc=%Vrc\n", rc));
+                AssertMsg(rc == VERR_PAGE_DIRECTORY_PTR_NOT_PRESENT, ("Unexpected rc=%Rrc\n", rc));
                 GCPtr += 512 * _2M;
                 continue;   /* next PDPTE */

trunk/src/VBox/VMM/VMMAll/PGMAllGst.h

@@ -521 +521 @@
         }
         else
-            AssertMsgFailed(("rc=%Vrc GCPhysGuestPD=%VGp\n", rc, GCPhysCR3));
+            AssertMsgFailed(("rc=%Rrc GCPhysGuestPD=%VGp\n", rc, GCPhysCR3));
     }
     else
-        AssertMsgFailed(("rc=%Vrc GCPhysGuestPD=%VGp\n", rc, GCPhysCR3));
+        AssertMsgFailed(("rc=%Rrc GCPhysGuestPD=%VGp\n", rc, GCPhysCR3));
 
 #else /* prot/real stub */

trunk/src/VBox/VMM/VMMAll/PGMAllHandler.cpp

@@ -169 +169 @@
         pgmUnlock(pVM);
         if (rc != VINF_SUCCESS)
-            Log(("PGMHandlerPhysicalRegisterEx: returns %Vrc (%VGp-%VGp)\n", rc, GCPhys, GCPhysLast));
+            Log(("PGMHandlerPhysicalRegisterEx: returns %Rrc (%VGp-%VGp)\n", rc, GCPhys, GCPhysLast));
         return rc;
     }
@@ -267 +267 @@
     }
     else
-        Log(("pgmHandlerPhysicalSetRamFlagsAndFlushShadowPTs: doesn't flush guest TLBs. rc=%Vrc\n", rc));
+        Log(("pgmHandlerPhysicalSetRamFlagsAndFlushShadowPTs: doesn't flush guest TLBs. rc=%Rrc\n", rc));
     return rc;
 }

trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp

@@ -2390 +2390 @@
 
         default:
-            AssertMsgFailed(("rc=%Vrc GCPtrSrc=%VGv cb=%#x\n", rc, GCPtrSrc, cb));
+            AssertMsgFailed(("rc=%Rrc GCPtrSrc=%VGv cb=%#x\n", rc, GCPtrSrc, cb));
             return rc;
     }

trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp

@@ -859 +859 @@
     PGM_INVL_GUEST_TLBS();
 
-    LogFlow(("pgmPoolAccessHandlerPT: returns %Vrc (flushed)\n", rc));
+    LogFlow(("pgmPoolAccessHandlerPT: returns %Rrc (flushed)\n", rc));
     return rc;
 
@@ -975 +975 @@
     PGM_INVL_GUEST_TLBS();
 
-    LogFlow(("pgmPoolAccessHandlerSimple: returns %Vrc cb=%d\n", rc, cb));
+    LogFlow(("pgmPoolAccessHandlerSimple: returns %Rrc cb=%d\n", rc, cb));
     return rc;
 }
@@ -3979 +3979 @@
         {
             STAM_PROFILE_ADV_STOP(&pPool->StatAlloc, a);
-            LogFlow(("pgmPoolAlloc: cached returns %Vrc *ppPage=%p:{.Key=%VHp, .idx=%d}\n", rc2, *ppPage, (*ppPage)->Core.Key, (*ppPage)->idx));
+            LogFlow(("pgmPoolAlloc: cached returns %Rrc *ppPage=%p:{.Key=%VHp, .idx=%d}\n", rc2, *ppPage, (*ppPage)->Core.Key, (*ppPage)->idx));
             return rc2;
         }
@@ -3997 +3997 @@
             if (rc != VERR_PGM_POOL_CLEARED)
             {
-                Log(("pgmPoolAlloc: returns %Vrc (Free)\n", rc));
+                Log(("pgmPoolAlloc: returns %Rrc (Free)\n", rc));
                 STAM_PROFILE_ADV_STOP(&pPool->StatAlloc, a);
                 return rc;
             }
-            Log(("pgmPoolMakeMoreFreePages failed with %Vrc -> return VERR_PGM_POOL_FLUSHED\n", rc));
+            Log(("pgmPoolMakeMoreFreePages failed with %Rrc -> return VERR_PGM_POOL_FLUSHED\n", rc));
             rc = VERR_PGM_POOL_FLUSHED;
         }
@@ -4047 +4047 @@
             pPool->iFreeHead = pPage->idx;
             STAM_PROFILE_ADV_STOP(&pPool->StatAlloc, a);
-            Log(("pgmPoolAlloc: returns %Vrc (Insert)\n", rc3));
+            Log(("pgmPoolAlloc: returns %Rrc (Insert)\n", rc3));
             return rc3;
         }
-        Log(("pgmPoolTrackInsert failed with %Vrc -> return VERR_PGM_POOL_FLUSHED\n", rc3));
+        Log(("pgmPoolTrackInsert failed with %Rrc -> return VERR_PGM_POOL_FLUSHED\n", rc3));
         rc = VERR_PGM_POOL_FLUSHED;
     }
@@ -4072 +4072 @@
 
     *ppPage = pPage;
-    LogFlow(("pgmPoolAlloc: returns %Vrc *ppPage=%p:{.Key=%VHp, .idx=%d, .fCached=%RTbool, .fMonitored=%RTbool}\n",
+    LogFlow(("pgmPoolAlloc: returns %Rrc *ppPage=%p:{.Key=%VHp, .idx=%d, .fCached=%RTbool, .fMonitored=%RTbool}\n",
              rc, pPage, pPage->Core.Key, pPage->idx, pPage->fCached, pPage->fMonitored));
     STAM_PROFILE_ADV_STOP(&pPool->StatAlloc, a);

trunk/src/VBox/VMM/VMMAll/TRPMAll.cpp

@@ -461 +461 @@
             if (rc != VINF_SUCCESS)
             {
-                Log(("TRPMForwardTrap: PGMPrefetchPage failed with rc=%Vrc\n", rc));
+                Log(("TRPMForwardTrap: PGMPrefetchPage failed with rc=%Rrc\n", rc));
                 goto failure;
             }
@@ -521 +521 @@
                     if (rc != VINF_SUCCESS)
                     {
-                        Log(("PGMPrefetchPage failed with rc=%Vrc\n", rc));
+                        Log(("PGMPrefetchPage failed with rc=%Rrc\n", rc));
                         goto failure;
                     }
@@ -531 +531 @@
                     if (RT_FAILURE(rc))
                     {
-                        Log(("MMGCRamRead failed with %Vrc\n", rc));
+                        Log(("MMGCRamRead failed with %Rrc\n", rc));
                         goto failure;
                     }
@@ -714 +714 @@
                 }
                 else
-                    Log(("TRAP%02X: PGMVerifyAccess %VGv failed with %Vrc -> forward to REM\n", iGate, pTrapStackGC, rc));
+                    Log(("TRAP%02X: PGMVerifyAccess %VGv failed with %Rrc -> forward to REM\n", iGate, pTrapStackGC, rc));
             }
             else
-                Log(("SELMValidateAndConvertCSAddr failed with %Vrc\n", rc));
+                Log(("SELMValidateAndConvertCSAddr failed with %Rrc\n", rc));
         }
         else
-            Log(("MMRamRead %VGv size %d failed with %Vrc\n", (RTGCUINTPTR)GCPtrIDT + sizeof(VBOXIDTE) * iGate, sizeof(GuestIdte), rc));
+            Log(("MMRamRead %VGv size %d failed with %Rrc\n", (RTGCUINTPTR)GCPtrIDT + sizeof(VBOXIDTE) * iGate, sizeof(GuestIdte), rc));
     }
     else