Changeset 6514 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Jan 25, 2008 12:49:05 PM (17 years ago)

Author:

vboxsync

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

27524

Message:

Use VBox/log.h.

File:

• trunk/src/VBox/HostDrivers/Support/SUPDRVShared.c (modified) (76 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDRVShared.c

@@ -356 +356 @@
             pSession->Bundle.cUsed      = 0 */
 
-            dprintf(("Created session %p initial cookie=%#x\n", pSession, pSession->u32Cookie));
+            LogFlow(("Created session %p initial cookie=%#x\n", pSession, pSession->u32Cookie));
             return VINF_SUCCESS;
         }
@@ -362 +362 @@
         RTMemFree(pSession);
         *ppSession = NULL;
-    }
-
-    dprintf(("Failed to create spinlock, rc=%d!\n", rc));
+        Log(("Failed to create spinlock, rc=%d!\n", rc));
+    }
+
     return rc;
 }
@@ -390 +390 @@
     pSession->pDevExt = NULL;
     RTMemFree(pSession);
-    dprintf2(("supdrvCloseSession: returns\n"));
+    LogFlow(("supdrvCloseSession: returns\n"));
 }
 
@@ -407 +407 @@
 {
     PSUPDRVBUNDLE       pBundle;
-    dprintf(("supdrvCleanupSession: pSession=%p\n", pSession));
+    LogFlow(("supdrvCleanupSession: pSession=%p\n", pSession));
 
     /*
      * Remove logger instances related to this session.
-     * (This assumes the dprintf and dprintf2 macros doesn't use the normal logging.)
      */
     RTLogSetDefaultInstanceThread(NULL, (uintptr_t)pSession);
@@ -426 +425 @@
      * In theory there should be noone racing us in this session.
      */
-    dprintf2(("release objects - start\n"));
+    Log2(("release objects - start\n"));
     if (pSession->pUsage)
     {
@@ -476 +475 @@
         AssertMsg(!pSession->pUsage, ("Some buster reregistered an object during desturction!\n"));
     }
-    dprintf2(("release objects - done\n"));
+    Log2(("release objects - done\n"));
 
     /*
@@ -484 +483 @@
      * not allocated memory while closing the file handle object.
      */
-    dprintf2(("freeing memory:\n"));
+    Log2(("freeing memory:\n"));
     pBundle = &pSession->Bundle;
     while (pBundle)
@@ -499 +498 @@
             {
                 int rc;
-                dprintf2(("eType=%d pvR0=%p pvR3=%p cb=%ld\n", pBundle->aMem[i].eType, RTR0MemObjAddress(pBundle->aMem[i].MemObj),
-                          (void *)RTR0MemObjAddressR3(pBundle->aMem[i].MapObjR3), (long)RTR0MemObjSize(pBundle->aMem[i].MemObj)));
+                Log2(("eType=%d pvR0=%p pvR3=%p cb=%ld\n", pBundle->aMem[i].eType, RTR0MemObjAddress(pBundle->aMem[i].MemObj),
+                      (void *)RTR0MemObjAddressR3(pBundle->aMem[i].MapObjR3), (long)RTR0MemObjSize(pBundle->aMem[i].MemObj)));
                 if (pBundle->aMem[i].MapObjR3 != NIL_RTR0MEMOBJ)
                 {
@@ -525 +524 @@
             RTMemFree(pToFree);
     }
-    dprintf2(("freeing memory - done\n"));
+    Log2(("freeing memory - done\n"));
 
     /*
@@ -531 +530 @@
      */
     RTSemFastMutexRequest(pDevExt->mtxLdr);
-    dprintf2(("freeing images:\n"));
+    Log2(("freeing images:\n"));
     if (pSession->pLdrUsage)
     {
@@ -550 +549 @@
     }
     RTSemFastMutexRelease(pDevExt->mtxLdr);
-    dprintf2(("freeing images - done\n"));
+    Log2(("freeing images - done\n"));
 
     /*
      * Unmap the GIP.
      */
-    dprintf2(("umapping GIP:\n"));
+    Log2(("umapping GIP:\n"));
 #ifdef USE_NEW_OS_INTERFACE_FOR_GIP
     if (pSession->GipMapObjR3 != NIL_RTR0MEMOBJ)
@@ -568 +567 @@
         pSession->fGipReferenced = 0;
     }
-    dprintf2(("umapping GIP - done\n"));
+    Log2(("umapping GIP - done\n"));
 }
 
@@ -1081 +1080 @@
 
         default:
-            dprintf(("Unknown IOCTL %#lx\n", (long)uIOCtl));
+            Log(("Unknown IOCTL %#lx\n", (long)uIOCtl));
             break;
     }
@@ -1163 +1162 @@
     pUsage->pObj        = pObj;
     pUsage->pNext       = pSession->pUsage;
-    dprintf(("SUPR0ObjRegister: pUsage=%p:{.pObj=%p, .pNext=%p}\n", pUsage, pUsage->pObj, pUsage->pNext));
+    Log2(("SUPR0ObjRegister: pUsage=%p:{.pObj=%p, .pNext=%p}\n", pUsage, pUsage->pObj, pUsage->pNext));
     pSession->pUsage    = pUsage;
 
     RTSpinlockRelease(pDevExt->Spinlock, &SpinlockTmp);
 
-    dprintf(("SUPR0ObjRegister: returns %p (pvUser1=%p, pvUser=%p)\n", pObj, pvUser1, pvUser2));
+    Log(("SUPR0ObjRegister: returns %p (pvUser1=%p, pvUser=%p)\n", pObj, pvUser1, pvUser2));
     return pObj;
 }
@@ -1224 +1223 @@
     for (pUsage = pSession->pUsage; pUsage; pUsage = pUsage->pNext)
     {
-        dprintf(("SUPR0AddRef: pUsage=%p:{.pObj=%p, .pNext=%p}\n", pUsage, pUsage->pObj, pUsage->pNext));
+        Log(("SUPR0AddRef: pUsage=%p:{.pObj=%p, .pNext=%p}\n", pUsage, pUsage->pObj, pUsage->pNext));
         if (pUsage->pObj == pObj)
             break;
@@ -1237 +1236 @@
         pUsagePre->pNext    = pSession->pUsage;
         pSession->pUsage    = pUsagePre;
-        dprintf(("SUPR0AddRef: pUsagePre=%p:{.pObj=%p, .pNext=%p}\n", pUsagePre, pUsagePre->pObj, pUsagePre->pNext));
+        Log(("SUPR0AddRef: pUsagePre=%p:{.pObj=%p, .pNext=%p}\n", pUsagePre, pUsagePre->pObj, pUsagePre->pNext));
 
         pUsagePre = NULL;
@@ -1292 +1291 @@
          pUsagePrev = pUsage, pUsage = pUsage->pNext)
     {
-        dprintf(("SUPR0ObjRelease: pUsage=%p:{.pObj=%p, .pNext=%p}\n", pUsage, pUsage->pObj, pUsage->pNext));
+        Log2(("SUPR0ObjRelease: pUsage=%p:{.pObj=%p, .pNext=%p}\n", pUsage, pUsage->pObj, pUsage->pNext));
         if (pUsage->pObj == pObj)
         {
@@ -1418 +1417 @@
     SUPDRVMEMREF    Mem = {0};
     const size_t    cb = (size_t)cPages << PAGE_SHIFT;
-    dprintf(("SUPR0LockMem: pSession=%p pvR3=%p cPages=%d paPages=%p\n", pSession, (void *)pvR3, cPages, paPages));
+    LogFlow(("SUPR0LockMem: pSession=%p pvR3=%p cPages=%d paPages=%p\n", pSession, (void *)pvR3, cPages, paPages));
 
     /*
@@ -1428 +1427 @@
         ||  !pvR3)
     {
-        dprintf(("pvR3 (%p) must be page aligned and not NULL!\n", (void *)pvR3));
+        Log(("pvR3 (%p) must be page aligned and not NULL!\n", (void *)pvR3));
         return VERR_INVALID_PARAMETER;
     }
@@ -1482 +1481 @@
 SUPR0DECL(int) SUPR0UnlockMem(PSUPDRVSESSION pSession, RTR3PTR pvR3)
 {
-    dprintf(("SUPR0UnlockMem: pSession=%p pvR3=%p\n", pSession, (void *)pvR3));
+    LogFlow(("SUPR0UnlockMem: pSession=%p pvR3=%p\n", pSession, (void *)pvR3));
     AssertReturn(SUP_IS_SESSION_VALID(pSession), VERR_INVALID_PARAMETER);
 #ifdef RT_OS_WINDOWS
@@ -1491 +1490 @@
     if (supdrvPageWasLockedByPageAlloc(pSession, pvR3))
     {
-        dprintf(("Page will be unlocked in SUPR0PageFree -> ignore\n"));
+        Log(("Page will be unlocked in SUPR0PageFree -> ignore\n"));
         return VINF_SUCCESS;
     }
@@ -1514 +1513 @@
     int             rc;
     SUPDRVMEMREF    Mem = {0};
-    dprintf(("SUPR0ContAlloc: pSession=%p cPages=%d ppvR0=%p ppvR3=%p pHCPhys=%p\n", pSession, cPages, ppvR0, ppvR3, pHCPhys));
+    LogFlow(("SUPR0ContAlloc: pSession=%p cPages=%d ppvR0=%p ppvR3=%p pHCPhys=%p\n", pSession, cPages, ppvR0, ppvR3, pHCPhys));
 
     /*
@@ -1522 +1521 @@
     if (!ppvR3 || !ppvR0 || !pHCPhys)
     {
-        dprintf(("Null pointer. All of these should be set: pSession=%p ppvR0=%p ppvR3=%p pHCPhys=%p\n",
-                 pSession, ppvR0, ppvR3, pHCPhys));
+        Log(("Null pointer. All of these should be set: pSession=%p ppvR0=%p ppvR3=%p pHCPhys=%p\n",
+             pSession, ppvR0, ppvR3, pHCPhys));
         return VERR_INVALID_PARAMETER;
 
@@ -1529 +1528 @@
     if (cPages < 1 || cPages >= 256)
     {
-        dprintf(("Illegal request cPages=%d, must be greater than 0 and smaller than 256\n", cPages));
+        Log(("Illegal request cPages=%d, must be greater than 0 and smaller than 256\n", cPages));
         return VERR_INVALID_PARAMETER;
     }
@@ -1574 +1573 @@
 SUPR0DECL(int) SUPR0ContFree(PSUPDRVSESSION pSession, RTHCUINTPTR uPtr)
 {
-    dprintf(("SUPR0ContFree: pSession=%p uPtr=%p\n", pSession, (void *)uPtr));
+    LogFlow(("SUPR0ContFree: pSession=%p uPtr=%p\n", pSession, (void *)uPtr));
     AssertReturn(SUP_IS_SESSION_VALID(pSession), VERR_INVALID_PARAMETER);
     return supdrvMemRelease(pSession, uPtr, MEMREF_TYPE_CONT);
@@ -1595 +1594 @@
     int             rc;
     SUPDRVMEMREF    Mem = {0};
-    dprintf(("SUPR0LowAlloc: pSession=%p cPages=%d ppvR3=%p ppvR0=%p paPages=%p\n", pSession, cPages, ppvR3, ppvR0, paPages));
+    LogFlow(("SUPR0LowAlloc: pSession=%p cPages=%d ppvR3=%p ppvR0=%p paPages=%p\n", pSession, cPages, ppvR3, ppvR0, paPages));
 
     /*
@@ -1603 +1602 @@
     if (!ppvR3 || !ppvR0 || !paPages)
     {
-        dprintf(("Null pointer. All of these should be set: pSession=%p ppvR3=%p ppvR0=%p paPages=%p\n",
-                 pSession, ppvR3, ppvR0, paPages));
+        Log(("Null pointer. All of these should be set: pSession=%p ppvR3=%p ppvR0=%p paPages=%p\n",
+             pSession, ppvR3, ppvR0, paPages));
         return VERR_INVALID_PARAMETER;
 
@@ -1610 +1609 @@
     if (cPages < 1 || cPages > 256)
     {
-        dprintf(("Illegal request cPages=%d, must be greater than 0 and smaller than 256.\n", cPages));
+        Log(("Illegal request cPages=%d, must be greater than 0 and smaller than 256.\n", cPages));
         return VERR_INVALID_PARAMETER;
     }
@@ -1660 +1659 @@
 SUPR0DECL(int) SUPR0LowFree(PSUPDRVSESSION pSession, RTHCUINTPTR uPtr)
 {
-    dprintf(("SUPR0LowFree: pSession=%p uPtr=%p\n", pSession, (void *)uPtr));
+    LogFlow(("SUPR0LowFree: pSession=%p uPtr=%p\n", pSession, (void *)uPtr));
     AssertReturn(SUP_IS_SESSION_VALID(pSession), VERR_INVALID_PARAMETER);
     return supdrvMemRelease(pSession, uPtr, MEMREF_TYPE_LOW);
@@ -1681 +1680 @@
     int             rc;
     SUPDRVMEMREF    Mem = {0};
-    dprintf(("SUPR0MemAlloc: pSession=%p cb=%d ppvR0=%p ppvR3=%p\n", pSession, cb, ppvR0, ppvR3));
+    LogFlow(("SUPR0MemAlloc: pSession=%p cb=%d ppvR0=%p ppvR3=%p\n", pSession, cb, ppvR0, ppvR3));
 
     /*
@@ -1691 +1690 @@
     if (cb < 1 || cb >= _4M)
     {
-        dprintf(("Illegal request cb=%u; must be greater than 0 and smaller than 4MB.\n", cb));
+        Log(("Illegal request cb=%u; must be greater than 0 and smaller than 4MB.\n", cb));
         return VERR_INVALID_PARAMETER;
     }
@@ -1738 +1737 @@
     PSUPDRVBUNDLE pBundle;
     RTSPINLOCKTMP SpinlockTmp = RTSPINLOCKTMP_INITIALIZER;
-    dprintf(("SUPR0MemGetPhys: pSession=%p uPtr=%p paPages=%p\n", pSession, (void *)uPtr, paPages));
+    LogFlow(("SUPR0MemGetPhys: pSession=%p uPtr=%p paPages=%p\n", pSession, (void *)uPtr, paPages));
 
     /*
@@ -1780 +1779 @@
     }
     RTSpinlockRelease(pSession->Spinlock, &SpinlockTmp);
-    dprintf(("Failed to find %p!!!\n", (void *)uPtr));
+    Log(("Failed to find %p!!!\n", (void *)uPtr));
     return VERR_INVALID_PARAMETER;
 }
@@ -1794 +1793 @@
 SUPR0DECL(int) SUPR0MemFree(PSUPDRVSESSION pSession, RTHCUINTPTR uPtr)
 {
-    dprintf(("SUPR0MemFree: pSession=%p uPtr=%p\n", pSession, (void *)uPtr));
+    LogFlow(("SUPR0MemFree: pSession=%p uPtr=%p\n", pSession, (void *)uPtr));
     AssertReturn(SUP_IS_SESSION_VALID(pSession), VERR_INVALID_PARAMETER);
     return supdrvMemRelease(pSession, uPtr, MEMREF_TYPE_MEM);
@@ -1814 +1813 @@
     int             rc;
     SUPDRVMEMREF    Mem = {0};
-    dprintf(("SUPR0PageAlloc: pSession=%p cb=%d ppvR3=%p\n", pSession, cPages, ppvR3));
+    LogFlow(("SUPR0PageAlloc: pSession=%p cb=%d ppvR3=%p\n", pSession, cPages, ppvR3));
 
     /*
@@ -1823 +1822 @@
     if (cPages < 1 || cPages > (128 * _1M)/PAGE_SIZE)
     {
-        dprintf(("SUPR0PageAlloc: Illegal request cb=%u; must be greater than 0 and smaller than 128MB.\n", cPages));
+        Log(("SUPR0PageAlloc: Illegal request cb=%u; must be greater than 0 and smaller than 128MB.\n", cPages));
         return VERR_INVALID_PARAMETER;
     }
@@ -1880 +1879 @@
     PSUPDRVBUNDLE pBundle;
     RTSPINLOCKTMP SpinlockTmp = RTSPINLOCKTMP_INITIALIZER;
-    dprintf(("SUPR0PageIsLockedByPageAlloc: pSession=%p pvR3=%p\n", pSession, (void *)pvR3));
+    LogFlow(("SUPR0PageIsLockedByPageAlloc: pSession=%p pvR3=%p\n", pSession, (void *)pvR3));
 
     /*
@@ -1925 +1924 @@
     PSUPDRVBUNDLE pBundle;
     RTSPINLOCKTMP SpinlockTmp = RTSPINLOCKTMP_INITIALIZER;
-    dprintf(("supdrvPageGetPhys: pSession=%p pvR3=%p cPages=%#lx paPages=%p\n", pSession, (void *)pvR3, (long)cPages, paPages));
+    LogFlow(("supdrvPageGetPhys: pSession=%p pvR3=%p cPages=%#lx paPages=%p\n", pSession, (void *)pvR3, (long)cPages, paPages));
 
     /*
@@ -1968 +1967 @@
 SUPR0DECL(int) SUPR0PageFree(PSUPDRVSESSION pSession, RTR3PTR pvR3)
 {
-    dprintf(("SUPR0PageFree: pSession=%p pvR3=%p\n", pSession, (void *)pvR3));
+    LogFlow(("SUPR0PageFree: pSession=%p pvR3=%p\n", pSession, (void *)pvR3));
     AssertReturn(SUP_IS_SESSION_VALID(pSession), VERR_INVALID_PARAMETER);
     return supdrvMemRelease(pSession, (RTHCUINTPTR)pvR3, MEMREF_TYPE_LOCKED_SUP);
@@ -1992 +1991 @@
     RTR3PTR         pGip = NIL_RTR3PTR;
     RTHCPHYS        HCPhys = NIL_RTHCPHYS;
-    dprintf(("SUPR0GipMap: pSession=%p ppGipR3=%p pHCPhysGip=%p\n", pSession, ppGipR3, pHCPhysGip));
+    LogFlow(("SUPR0GipMap: pSession=%p ppGipR3=%p pHCPhysGip=%p\n", pSession, ppGipR3, pHCPhysGip));
 
     /*
@@ -2044 +2043 @@
                 unsigned i;
 
-                dprintf(("SUPR0GipMap: Resumes GIP updating\n"));
+                LogFlow(("SUPR0GipMap: Resumes GIP updating\n"));
 
                 for (i = 0; i < RT_ELEMENTS(pGip->aCPUs); i++)
@@ -2062 +2061 @@
     {
         rc = SUPDRV_ERR_GENERAL_FAILURE;
-        dprintf(("SUPR0GipMap: GIP is not available!\n"));
+        Log(("SUPR0GipMap: GIP is not available!\n"));
     }
     RTSemFastMutexRelease(pDevExt->mtxGip);
@@ -2077 +2076 @@
     OSDBGPRINT(("SUPR0GipMap: returns %d *pHCPhysGip=%lx *ppGip=%p GipMapObjR3\n", rc, (unsigned long)HCPhys, pGip, pSession->GipMapObjR3));
 #else
-    dprintf(("SUPR0GipMap: returns %d *pHCPhysGip=%lx *ppGipR3=%p\n", rc, (unsigned long)HCPhys, (void *)(uintptr_t)pGip));
+    LogFlow(("SUPR0GipMap: returns %d *pHCPhysGip=%lx *ppGipR3=%p\n", rc, (unsigned long)HCPhys, (void *)(uintptr_t)pGip));
 #endif
     return rc;
@@ -2100 +2099 @@
                 pSession->GipMapObjR3));
 #else
-    dprintf(("SUPR0GipUnmap: pSession=%p\n", pSession));
+    LogFlow(("SUPR0GipUnmap: pSession=%p\n", pSession));
 #endif
     AssertReturn(SUP_IS_SESSION_VALID(pSession), VERR_INVALID_PARAMETER);
@@ -2135 +2134 @@
             &&  !--pDevExt->cGipUsers)
         {
-            dprintf(("SUPR0GipUnmap: Suspends GIP updating\n"));
+            LogFlow(("SUPR0GipUnmap: Suspends GIP updating\n"));
 #ifdef USE_NEW_OS_INTERFACE_FOR_GIP
             rc = RTTimerStop(pDevExt->pGipTimer); AssertRC(rc); rc = 0;
@@ -2227 +2226 @@
     if (!uPtr)
     {
-        dprintf(("Illegal address %p\n", (void *)uPtr));
+        Log(("Illegal address %p\n", (void *)uPtr));
         return VERR_INVALID_PARAMETER;
     }
@@ -2272 +2271 @@
     }
     RTSpinlockRelease(pSession->Spinlock, &SpinlockTmp);
-    dprintf(("Failed to find %p!!! (eType=%d)\n", (void *)uPtr, eType));
+    Log(("Failed to find %p!!! (eType=%d)\n", (void *)uPtr, eType));
     return VERR_INVALID_PARAMETER;
 }
@@ -2296 +2295 @@
     PSUPDRVPATCH        pPatch;
     RTSPINLOCKTMP       SpinlockTmp = RTSPINLOCKTMP_INITIALIZER;
-    dprintf(("supdrvIOCtl_IdtInstall\n"));
+    LogFlow(("supdrvIOCtl_IdtInstall\n"));
 
     /*
@@ -2421 +2420 @@
     RTIDTR      Idtr;
     PSUPDRVIDTE paIdt;
-    dprintf(("supdrvIOCtl_IdtPatchOne: pPatch=%p\n", pPatch));
+    LogFlow(("supdrvIOCtl_IdtPatchOne: pPatch=%p\n", pPatch));
 
     /*
@@ -2464 +2463 @@
         static int  s_iWobble = 0;
         unsigned    iMax = !(s_iWobble++ % 2) ? 0x80 : 0x100;
-        dprintf(("IDT: Idtr=%p:%#x\n", (void *)Idtr.pIdt, (unsigned)Idtr.cbIdt));
+        Log2(("IDT: Idtr=%p:%#x\n", (void *)Idtr.pIdt, (unsigned)Idtr.cbIdt));
         for (i = iMax - 0x80; i*16+15 < Idtr.cbIdt && i < iMax; i++)
         {
-            dprintf(("%#x: %04x:%08x%04x%04x P=%d DPL=%d IST=%d Type1=%#x u32Reserved=%#x u5Reserved=%#x\n",
-                     i, paIdt[i].u16SegSel, paIdt[i].u32OffsetTop, paIdt[i].u16OffsetHigh, paIdt[i].u16OffsetLow,
-                     paIdt[i].u1Present, paIdt[i].u2DPL, paIdt[i].u3IST, paIdt[i].u5Type2,
-                     paIdt[i].u32Reserved, paIdt[i].u5Reserved));
+            Log2(("%#x: %04x:%08x%04x%04x P=%d DPL=%d IST=%d Type1=%#x u32Reserved=%#x u5Reserved=%#x\n",
+                  i, paIdt[i].u16SegSel, paIdt[i].u32OffsetTop, paIdt[i].u16OffsetHigh, paIdt[i].u16OffsetLow,
+                  paIdt[i].u1Present, paIdt[i].u2DPL, paIdt[i].u3IST, paIdt[i].u5Type2,
+                  paIdt[i].u32Reserved, paIdt[i].u5Reserved));
         }
 #endif
@@ -2498 +2497 @@
             if (!u8Idt)
             {
-                dprintf(("Failed to find appropirate IDT entry!!\n"));
+                Log(("Failed to find appropirate IDT entry!!\n"));
                 return NULL;
             }
         }
         pDevExt->u8Idt = u8Idt;
-        dprintf(("supdrvIOCtl_IdtPatchOne: u8Idt=%x\n", u8Idt));
+        LogFlow(("supdrvIOCtl_IdtPatchOne: u8Idt=%x\n", u8Idt));
     }
 
@@ -2750 +2749 @@
 #if 0
     /* dump the patch code */
-    dprintf(("patch code: %p\n", &pPatch->auCode[0]));
+    Log2(("patch code: %p\n", &pPatch->auCode[0]));
     for (uFixCall.pb = &pPatch->auCode[0]; uFixCall.pb < u.pb; uFixCall.pb++)
-        dprintf(("0x%02x,\n", *uFixCall.pb));
+        Log2(("0x%02x,\n", *uFixCall.pb));
 #endif
   }
@@ -2784 +2783 @@
     PSUPDRVPATCHUSAGE   pUsage;
     RTSPINLOCKTMP       SpinlockTmp = RTSPINLOCKTMP_INITIALIZER;
-    dprintf(("supdrvIOCtl_IdtRemoveAll: pSession=%p\n", pSession));
+    LogFlow(("supdrvIOCtl_IdtRemoveAll: pSession=%p\n", pSession));
 
     /*
@@ -2841 +2840 @@
 static void supdrvIdtRemoveOne(PSUPDRVDEVEXT pDevExt, PSUPDRVPATCH pPatch)
 {
-    dprintf(("supdrvIdtRemoveOne: pPatch=%p\n", pPatch));
+    LogFlow(("supdrvIdtRemoveOne: pPatch=%p\n", pPatch));
 
     pPatch->cUsage = 0;
@@ -2955 +2954 @@
     unsigned        cb;
     void           *pv;
-    dprintf(("supdrvIOCtl_LdrOpen: szName=%s cbImage=%d\n", pReq->u.In.szName, pReq->u.In.cbImage));
+    LogFlow(("supdrvIOCtl_LdrOpen: szName=%s cbImage=%d\n", pReq->u.In.szName, pReq->u.In.cbImage));
 
     /*
@@ -2983 +2982 @@
     {
         RTSemFastMutexRelease(pDevExt->mtxLdr);
+        Log(("supdrvIOCtl_LdrOpen: RTMemExecAlloc(%u) failed\n", cb));
         return VERR_NO_MEMORY;
     }
@@ -3025 +3025 @@
     PSUPDRVLDRIMAGE pImage;
     int             rc;
-    dprintf(("supdrvIOCtl_LdrLoad: pvImageBase=%p cbImage=%d\n", pReq->u.In.pvImageBase, pReq->u.In.cbImage));
+    LogFlow(("supdrvIOCtl_LdrLoad: pvImageBase=%p cbImage=%d\n", pReq->u.In.pvImageBase, pReq->u.In.cbImage));
 
     /*
@@ -3037 +3037 @@
     {
         RTSemFastMutexRelease(pDevExt->mtxLdr);
-        dprintf(("SUP_IOCTL_LDR_LOAD: couldn't find image!\n"));
+        Log(("SUP_IOCTL_LDR_LOAD: couldn't find image!\n"));
         return VERR_INVALID_HANDLE;
     }
@@ -3044 +3044 @@
     {
         RTSemFastMutexRelease(pDevExt->mtxLdr);
-        dprintf(("SUP_IOCTL_LDR_LOAD: image size mismatch!! %d(prep) != %d(load)\n", pImage->cbImage, pReq->u.In.cbImage));
+        Log(("SUP_IOCTL_LDR_LOAD: image size mismatch!! %d(prep) != %d(load)\n", pImage->cbImage, pReq->u.In.cbImage));
         return VERR_INVALID_HANDLE;
     }
@@ -3066 +3066 @@
             {
                 RTSemFastMutexRelease(pDevExt->mtxLdr);
-                dprintf(("NULL pointer: pvVMMR0=%p pvVMMR0EntryInt=%p pvVMMR0EntryFast=%p pvVMMR0EntryEx=%p!\n",
-                         pReq->u.In.EP.VMMR0.pvVMMR0, pReq->u.In.EP.VMMR0.pvVMMR0EntryInt,
-                         pReq->u.In.EP.VMMR0.pvVMMR0EntryFast, pReq->u.In.EP.VMMR0.pvVMMR0EntryEx));
+                Log(("NULL pointer: pvVMMR0=%p pvVMMR0EntryInt=%p pvVMMR0EntryFast=%p pvVMMR0EntryEx=%p!\n",
+                     pReq->u.In.EP.VMMR0.pvVMMR0, pReq->u.In.EP.VMMR0.pvVMMR0EntryInt,
+                     pReq->u.In.EP.VMMR0.pvVMMR0EntryFast, pReq->u.In.EP.VMMR0.pvVMMR0EntryEx));
                 return VERR_INVALID_PARAMETER;
             }
@@ -3076 +3076 @@
             {
                 RTSemFastMutexRelease(pDevExt->mtxLdr);
-                dprintf(("Out of range (%p LB %#x): pvVMMR0EntryInt=%p, pvVMMR0EntryFast=%p or pvVMMR0EntryEx=%p is NULL!\n",
-                         pImage->pvImage, pReq->u.In.cbImage, pReq->u.In.EP.VMMR0.pvVMMR0EntryInt,
-                         pReq->u.In.EP.VMMR0.pvVMMR0EntryFast, pReq->u.In.EP.VMMR0.pvVMMR0EntryEx));
+                Log(("Out of range (%p LB %#x): pvVMMR0EntryInt=%p, pvVMMR0EntryFast=%p or pvVMMR0EntryEx=%p is NULL!\n",
+                     pImage->pvImage, pReq->u.In.cbImage, pReq->u.In.EP.VMMR0.pvVMMR0EntryInt,
+                     pReq->u.In.EP.VMMR0.pvVMMR0EntryFast, pReq->u.In.EP.VMMR0.pvVMMR0EntryEx));
                 return VERR_INVALID_PARAMETER;
             }
@@ -3084 +3084 @@
         default:
             RTSemFastMutexRelease(pDevExt->mtxLdr);
-            dprintf(("Invalid eEPType=%d\n", pReq->u.In.eEPType));
+            Log(("Invalid eEPType=%d\n", pReq->u.In.eEPType));
             return VERR_INVALID_PARAMETER;
     }
@@ -3091 +3091 @@
     {
         RTSemFastMutexRelease(pDevExt->mtxLdr);
-        dprintf(("SUP_IOCTL_LDR_LOAD: pfnModuleInit=%p is outside the image (%p %d bytes)\n",
-                 pReq->u.In.pfnModuleInit, pImage->pvImage, pReq->u.In.cbImage));
+        Log(("SUP_IOCTL_LDR_LOAD: pfnModuleInit=%p is outside the image (%p %d bytes)\n",
+             pReq->u.In.pfnModuleInit, pImage->pvImage, pReq->u.In.cbImage));
         return VERR_INVALID_PARAMETER;
     }
@@ -3099 +3099 @@
     {
         RTSemFastMutexRelease(pDevExt->mtxLdr);
-        dprintf(("SUP_IOCTL_LDR_LOAD: pfnModuleTerm=%p is outside the image (%p %d bytes)\n",
-                 pReq->u.In.pfnModuleTerm, pImage->pvImage, pReq->u.In.cbImage));
+        Log(("SUP_IOCTL_LDR_LOAD: pfnModuleTerm=%p is outside the image (%p %d bytes)\n",
+             pReq->u.In.pfnModuleTerm, pImage->pvImage, pReq->u.In.cbImage));
         return VERR_INVALID_PARAMETER;
     }
@@ -3135 +3135 @@
      * On success call the module initialization.
      */
-    dprintf(("supdrvIOCtl_LdrLoad: pfnModuleInit=%p\n", pImage->pfnModuleInit));
+    LogFlow(("supdrvIOCtl_LdrLoad: pfnModuleInit=%p\n", pImage->pfnModuleInit));
     if (RT_SUCCESS(rc) && pImage->pfnModuleInit)
     {
-        dprintf(("supdrvIOCtl_LdrLoad: calling pfnModuleInit=%p\n", pImage->pfnModuleInit));
+        Log(("supdrvIOCtl_LdrLoad: calling pfnModuleInit=%p\n", pImage->pfnModuleInit));
         rc = pImage->pfnModuleInit();
         if (rc && pDevExt->pvVMMR0 == pImage->pvImage)
@@ -3166 +3166 @@
     PSUPDRVLDRUSAGE pUsage;
     PSUPDRVLDRIMAGE pImage;
-    dprintf(("supdrvIOCtl_LdrFree: pvImageBase=%p\n", pReq->u.In.pvImageBase));
+    LogFlow(("supdrvIOCtl_LdrFree: pvImageBase=%p\n", pReq->u.In.pvImageBase));
 
     /*
@@ -3182 +3182 @@
     {
         RTSemFastMutexRelease(pDevExt->mtxLdr);
-        dprintf(("SUP_IOCTL_LDR_FREE: couldn't find image!\n"));
+        Log(("SUP_IOCTL_LDR_FREE: couldn't find image!\n"));
         return VERR_INVALID_HANDLE;
     }
@@ -3276 +3276 @@
     void           *pvSymbol = NULL;
     int             rc = VERR_GENERAL_FAILURE;
-    dprintf2(("supdrvIOCtl_LdrGetSymbol: pvImageBase=%p szSymbol=\"%s\"\n", pReq->u.In.pvImageBase, pReq->u.In.szSymbol));
+    Log3(("supdrvIOCtl_LdrGetSymbol: pvImageBase=%p szSymbol=\"%s\"\n", pReq->u.In.pvImageBase, pReq->u.In.szSymbol));
 
     /*
@@ -3288 +3288 @@
     {
         RTSemFastMutexRelease(pDevExt->mtxLdr);
-        dprintf(("SUP_IOCTL_LDR_GET_SYMBOL: couldn't find image!\n"));
+        Log(("SUP_IOCTL_LDR_GET_SYMBOL: couldn't find image!\n"));
         return VERR_INVALID_HANDLE;
     }
@@ -3296 +3296 @@
         unsigned uState = pImage->uState;
         RTSemFastMutexRelease(pDevExt->mtxLdr);
-        dprintf(("SUP_IOCTL_LDR_GET_SYMBOL: invalid image state %d (%#x)!\n", uState, uState)); NOREF(uState);
+        Log(("SUP_IOCTL_LDR_GET_SYMBOL: invalid image state %d (%#x)!\n", uState, uState)); NOREF(uState);
         return VERR_ALREADY_LOADED;
     }
@@ -3338 +3338 @@
 {
     int rc = VINF_SUCCESS;
-    dprintf(("supdrvLdrSetR0EP pvVMMR0=%p pvVMMR0EntryInt=%p\n", pvVMMR0, pvVMMR0EntryInt));
+    LogFlow(("supdrvLdrSetR0EP pvVMMR0=%p pvVMMR0EntryInt=%p\n", pvVMMR0, pvVMMR0EntryInt));
 
 
@@ -3427 +3427 @@
 {
     PSUPDRVLDRUSAGE pUsage;
-    dprintf(("supdrvLdrAddUsage: pImage=%p\n", pImage));
+    LogFlow(("supdrvLdrAddUsage: pImage=%p\n", pImage));
 
     /*
@@ -3470 +3470 @@
 {
     PSUPDRVLDRIMAGE pImagePrev;
-    dprintf(("supdrvLdrFree: pImage=%p\n", pImage));
+    LogFlow(("supdrvLdrFree: pImage=%p\n", pImage));
 
     /* find it - arg. should've used doubly linked list. */
@@ -3515 +3515 @@
         &&  pImage->uState == SUP_IOCTL_LDR_LOAD)
     {
-        dprintf(("supdrvIOCtl_LdrLoad: calling pfnModuleTerm=%p\n", pImage->pfnModuleTerm));
+        LogFlow(("supdrvIOCtl_LdrLoad: calling pfnModuleTerm=%p\n", pImage->pfnModuleTerm));
         pImage->pfnModuleTerm();
     }
@@ -3621 +3621 @@
     int rc;
 
-    dprintf(("supdrvGipCreate:\n"));
+    LogFlow(("supdrvGipCreate:\n"));
 
     /* assert order */
@@ -3761 +3761 @@
     OSDBGPRINT(("supdrvGipInit: pGip=%p HCPhys=%lx u64NanoTS=%llu uUpdateHz=%d\n", pGip, (long)HCPhys, u64NanoTS, uUpdateHz));
 #else
-    dprintf(("supdrvGipInit: pGip=%p HCPhys=%lx u64NanoTS=%llu uUpdateHz=%d\n", pGip, (long)HCPhys, u64NanoTS, uUpdateHz));
+    LogFlow(("supdrvGipInit: pGip=%p HCPhys=%lx u64NanoTS=%llu uUpdateHz=%d\n", pGip, (long)HCPhys, u64NanoTS, uUpdateHz));
 #endif