Changeset 11285 in vbox for trunk/src

Timestamp:

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

Author:

vboxsync

Message:

Devices: %VGp -> %RGp (just preferred, not mandatory (yet))

Location:

trunk/src/VBox/Devices

Files:

• Graphics/DevVGA.cpp (modified) (7 diffs)
• VMMDev/VBoxDev.cpp (modified) (1 diff)
• VMMDev/VMMDevHGCM.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -1231 +1231 @@
             if (addr >= s->vram_size)
             {
-                AssertMsgFailed(("addr=%VGp - this needs to be done in HC! bank_offset=%08x memory_map_mode=%d\n",
+                AssertMsgFailed(("addr=%RGp - this needs to be done in HC! bank_offset=%08x memory_map_mode=%d\n",
                                  addr, s->bank_offset, memory_map_mode));
                 return VINF_SUCCESS;
@@ -1272 +1272 @@
             if (addr >= s->vram_size)
             {
-                AssertMsgFailed(("addr=%VGp - this needs to be done in HC! bank_offset=%08x memory_map_mode=%d\n",
+                AssertMsgFailed(("addr=%RGp - this needs to be done in HC! bank_offset=%08x memory_map_mode=%d\n",
                                  addr, s->bank_offset, memory_map_mode));
                 return VINF_SUCCESS;
@@ -1296 +1296 @@
         if (addr * 4 >= s->vram_size)
         {
-            AssertMsgFailed(("addr=%VGp - this needs to be done in HC! bank_offset=%08x memory_map_mode=%d\n",
+            AssertMsgFailed(("addr=%RGp - this needs to be done in HC! bank_offset=%08x memory_map_mode=%d\n",
                              addr * 4, s->bank_offset, memory_map_mode));
             return VINF_SUCCESS;
@@ -3255 +3255 @@
         if (GCPhysAddr + cItems * cbItem >= pThis->vram_size)
         {
-            AssertMsgFailed(("GCPhysAddr=%VGp cItems=%#x cbItem=%d\n", GCPhysAddr, cItems, cbItem));
+            AssertMsgFailed(("GCPhysAddr=%RGp cItems=%#x cbItem=%d\n", GCPhysAddr, cItems, cbItem));
             return VINF_SUCCESS;
         }
@@ -3278 +3278 @@
         if (GCPhysAddr * 2 + cItems * cbItem >= pThis->vram_size)
         {
-            AssertMsgFailed(("GCPhysAddr=%VGp cItems=%#x cbItem=%d\n", GCPhysAddr, cItems, cbItem));
+            AssertMsgFailed(("GCPhysAddr=%RGp cItems=%#x cbItem=%d\n", GCPhysAddr, cItems, cbItem));
             return VINF_SUCCESS;
         }
@@ -3300 +3300 @@
         if (GCPhysAddr + cItems * cbItem >= pThis->vram_size)
         {
-            AssertMsgFailed(("GCPhysAddr=%VGp cItems=%#x cbItem=%d\n", GCPhysAddr, cItems, cbItem));
+            AssertMsgFailed(("GCPhysAddr=%RGp cItems=%#x cbItem=%d\n", GCPhysAddr, cItems, cbItem));
             return VINF_SUCCESS;
         }
@@ -4776 +4776 @@
     PPDMDEVINS  pDevIns = pPciDev->pDevIns;
     PVGASTATE   pThis = PDMINS_2_DATA(pDevIns, PVGASTATE);
-    LogFlow(("vgaR3IORegionMap: iRegion=%d GCPhysAddress=%VGp cb=%#x enmType=%d\n", iRegion, GCPhysAddress, cb, enmType));
+    LogFlow(("vgaR3IORegionMap: iRegion=%d GCPhysAddress=%RGp cb=%#x enmType=%d\n", iRegion, GCPhysAddress, cb, enmType));
     AssertReturn(iRegion == 0 && enmType == PCI_ADDRESS_SPACE_MEM_PREFETCH, VERR_INTERNAL_ERROR);
 

trunk/src/VBox/Devices/VMMDev/VBoxDev.cpp

@@ -1601 +1601 @@
 static DECLCALLBACK(int) vmmdevIORAMRegionMap(PPCIDEVICE pPciDev, /*unsigned*/ int iRegion, RTGCPHYS GCPhysAddress, uint32_t cb, PCIADDRESSSPACE enmType)
 {
-    LogFlow(("vmmdevR3IORAMRegionMap: iRegion=%d GCPhysAddress=%VGp cb=%#x enmType=%d\n", iRegion, GCPhysAddress, cb, enmType));
+    LogFlow(("vmmdevR3IORAMRegionMap: iRegion=%d GCPhysAddress=%RGp cb=%#x enmType=%d\n", iRegion, GCPhysAddress, cb, enmType));
     VMMDevState *pThis = PCIDEV_2_VMMDEVSTATE(pPciDev);
     int rc;

trunk/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp

@@ -250 +250 @@
         rc = PDMDevHlpPhysGCPtr2GCPhys(pDevIns, GCPtr, &GCPhys);
 
-        Log(("vmmdevHGCMSaveLinPtr: Page %d: %VGv -> %VGp. %Rrc\n", iPage, GCPtr, GCPhys, rc));
+        Log(("vmmdevHGCMSaveLinPtr: Page %d: %VGv -> %RGp. %Rrc\n", iPage, GCPtr, GCPhys, rc));
 
         if (RT_FAILURE (rc))
@@ -296 +296 @@
                              PAGE_SIZE;
 
-        Log(("vmmdevHGCMWriteLinPtr: page %d: dst %VGp, src %p, cbWrite %d\n", iPage, GCPhysDst, pu8Src, cbWrite));
+        Log(("vmmdevHGCMWriteLinPtr: page %d: dst %RGp, src %p, cbWrite %d\n", iPage, GCPhysDst, pu8Src, cbWrite));
 
         iPage++;
@@ -597 +597 @@
                          /* rc = PDMDevHlpPhys2HCVirt (pVMMDevState->pDevIns, physAddr, size, &pHostParm->u.pointer.addr); */
 
-                         Log(("vmmdevHGCMCall: PhysAddr guest parameter %VGp\n", physAddr));
+                         Log(("vmmdevHGCMCall: PhysAddr guest parameter %RGp\n", physAddr));
                          break;
                      }
@@ -699 +699 @@
                          /* rc = PDMDevHlpPhys2HCVirt (pVMMDevState->pDevIns, physAddr, size, &pHostParm->u.pointer.addr); */
 
-                         Log(("vmmdevHGCMCall: PhysAddr guest parameter %VGp\n", physAddr));
+                         Log(("vmmdevHGCMCall: PhysAddr guest parameter %RGp\n", physAddr));
                          break;
                      }
@@ -1179 +1179 @@
             PVBOXHGCMCMD pNext = pIter->pNext;
 
-            LogFlowFunc (("Saving %VGp\n", pIter->GCPhys));
+            LogFlowFunc (("Saving %RGp\n", pIter->GCPhys));
             rc = SSMR3PutGCPhys(pSSM, pIter->GCPhys);
             AssertRCReturn(rc, rc);
@@ -1220 +1220 @@
         AssertRCReturn(rc, rc);
 
-        LogFlowFunc (("Restoring %VGp size %x bytes\n", GCPhys, cbSize));
+        LogFlowFunc (("Restoring %RGp size %x bytes\n", GCPhys, cbSize));
 
         PVBOXHGCMCMD pCmd = (PVBOXHGCMCMD)RTMemAllocZ (sizeof (struct VBOXHGCMCMD));