Changeset 1578 in vbox for trunk/src

Timestamp:

Mar 20, 2007 8:02:06 PM (18 years ago)

Author:

vboxsync

Message:

style

File:

• trunk/src/VBox/VMM/PGMMap.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/PGMMap.cpp

@@ -101 +101 @@
             AssertMsgFailed(("Address is already in use by %s. req %#x-%#x take %#x-%#x\n",
                              pCur->pszDesc, GCPtr, GCPtrLast, pCur->GCPtr, pCur->GCPtrLast));
-            LogRel(("VERR_PGM_MAPPING_CONFLICT: Address is already in use by %s. req %#x-%#x take %#x-%#x\n",pCur->pszDesc, GCPtr, GCPtrLast, pCur->GCPtr, pCur->GCPtrLast));
+            LogRel(("VERR_PGM_MAPPING_CONFLICT: Address is already in use by %s. req %#x-%#x take %#x-%#x\n", 
+                    pCur->pszDesc, GCPtr, GCPtrLast, pCur->GCPtr, pCur->GCPtrLast));
             return VERR_PGM_MAPPING_CONFLICT;
         }
@@ -464 +465 @@
 PGMR3DECL(int) PGMR3MapIntermediate(PVM pVM, RTUINTPTR Addr, RTHCPHYS HCPhys, unsigned cbPages)
 {
-    size_t  cbHyper;
-    RTGCPTR pvHyperGC;
-
     LogFlow(("PGMR3MapIntermediate: Addr=%RTptr HCPhys=%VHp cbPages=%#x\n", Addr, HCPhys, cbPages));
 
@@ -503 +501 @@
 
     /* The intermediate mapping must not conflict with our default hypervisor address. */
-    pvHyperGC = MMHyperGetArea(pVM, &cbHyper);
-    if (   uAddress < pvHyperGC
-           ? uAddress + cbPages > pvHyperGC
-           : pvHyperGC + cbHyper > uAddress
+    size_t  cbHyper;
+    RTGCPTR pvHyperGC = MMHyperGetArea(pVM, &cbHyper);
+    if (uAddress < pvHyperGC
+        ? uAddress + cbPages > pvHyperGC
+        : pvHyperGC + cbHyper > uAddress
        )
     {
-        AssertMsgFailed(("Addr=%RTptr HyperGC=%VGv cbPages=%d\n", Addr, pvHyperGC, cbPages));
-        LogRel(("Addr=%RTptr HyperGC=%VGv cbPages=%d\n", Addr, pvHyperGC, cbPages));
+        AssertMsgFailed(("Addr=%RTptr HyperGC=%VGv cbPages=%zu\n", Addr, pvHyperGC, cbPages));
+        LogRel(("Addr=%RTptr HyperGC=%VGv cbPages=%zu\n", Addr, pvHyperGC, cbPages));
         return VERR_PGM_MAPPINGS_FIX_CONFLICT; /** @todo new error code */
     }