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

Timestamp:

Feb 18, 2009 5:14:26 PM (16 years ago)

Author:

vboxsync

Message:

Fixed wrong string usage

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllMap.cpp (modified) (6 diffs)

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

@@ -570 +570 @@
                     STAM_COUNTER_INC(&pVM->pgm.s.StatR3DetectedConflicts);
 
+#ifdef IN_RING3
                     Log(("PGMHasMappingConflicts: Conflict was detected at %08RX32 for mapping %s (32 bits)\n"
                          "                        iPDE=%#x iPT=%#x PDE=%RGp.\n",
                         (iPT + iPDE) << X86_PD_SHIFT, pCur->pszDesc,
                         iPDE, iPT, pPD->a[iPDE + iPT].au32[0]));
+#else
+                    Log(("PGMHasMappingConflicts: Conflict was detected at %08RX32 for mapping (32 bits)\n"
+                         "                        iPDE=%#x iPT=%#x PDE=%RGp.\n",
+                        (iPT + iPDE) << X86_PD_SHIFT,
+                        iPDE, iPT, pPD->a[iPDE + iPT].au32[0]));
+#endif
                     return true;
                 }
@@ -594 +601 @@
                 {
                     STAM_COUNTER_INC(&pVM->pgm.s.StatR3DetectedConflicts);
+#ifdef IN_RING3
                     Log(("PGMHasMappingConflicts: Conflict was detected at %RGv for mapping %s (PAE)\n"
                          "                        PDE=%016RX64.\n",
                         GCPtr, pCur->pszDesc, Pde.u));
+#else
+                    Log(("PGMHasMappingConflicts: Conflict was detected at %RGv for mapping (PAE)\n"
+                         "                        PDE=%016RX64.\n",
+                        GCPtr, Pde.u));
+#endif
                     return true;
                 }
@@ -649 +662 @@
                     STAM_COUNTER_INC(&pVM->pgm.s.StatR3DetectedConflicts);
 
+#ifdef IN_RING3
                     Log(("PGMHasMappingConflicts: Conflict was detected at %08RX32 for mapping %s (32 bits)\n"
                          "                        iPDE=%#x iPT=%#x PDE=%RGp.\n",
                         (iPT + iPDE) << X86_PD_SHIFT, pCur->pszDesc,
                         iPDE, iPT, pPD->a[iPDE + iPT].au32[0]));
-#ifdef IN_RING3
                     int rc = pgmR3SyncPTResolveConflict(pVM, pCur, pPD, iPDE << X86_PD_SHIFT);
                     AssertRCReturn(rc, rc);
@@ -665 +678 @@
                     break;
 #else
+                    Log(("PGMHasMappingConflicts: Conflict was detected at %08RX32 for mapping (32 bits)\n"
+                         "                        iPDE=%#x iPT=%#x PDE=%RGp.\n",
+                        (iPT + iPDE) << X86_PD_SHIFT,
+                        iPDE, iPT, pPD->a[iPDE + iPT].au32[0]));
                     return VINF_PGM_SYNC_CR3;
 #endif
@@ -689 +706 @@
                 {
                     STAM_COUNTER_INC(&pVM->pgm.s.StatR3DetectedConflicts);
+#ifdef IN_RING3
                     Log(("PGMHasMappingConflicts: Conflict was detected at %RGv for mapping %s (PAE)\n"
                          "                        PDE=%016RX64.\n",
                         GCPtr, pCur->pszDesc, Pde.u));
-#ifdef IN_RING3
                     int rc = pgmR3SyncPTResolveConflictPAE(pVM, pCur, GCPtr);
                     AssertRCReturn(rc, rc);
@@ -704 +721 @@
                     break;
 #else
+                    Log(("PGMHasMappingConflicts: Conflict was detected at %RGv for mapping (PAE)\n"
+                         "                        PDE=%016RX64.\n",
+                        GCPtr, Pde.u));
                     return VINF_PGM_SYNC_CR3;
 #endif