Index: trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku-stubs.c
===================================================================
--- trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku-stubs.c	(revision 55979)
+++ trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku-stubs.c	(revision 55980)
@@ -331,7 +331,15 @@
     return g_VBoxGuest->_RTLogDefaultInstance();
 }
-RTDECL(PRTLOGGER) RTLogRelDefaultInstance(void)
-{
-    return g_VBoxGuest->_RTLogRelDefaultInstance();
+RTDECL(PRTLOGGER) RTLogDefaultInstanceEx(uint32_t fFlags, uint32_t iGroup)
+{
+    return g_VBoxGuest->_RTLogDefaultInstanceEx(fFlags, iGroup);
+}
+RTDECL(PRTLOGGER) RTLogRelGetDefaultInstance(void)
+{
+    return g_VBoxGuest->_RTLogRelGetDefaultInstance();
+}
+RTDECL(PRTLOGGER) RTLogRelGetDefaultInstance(uint32_t fFlags, uint32_t iGroup)
+{
+    return g_VBoxGuest->_RTLogRelGetDefaultInstanceEx(fFlags, iGroup);
 }
 RTDECL(int) RTErrConvertToErrno(int iErr)
Index: trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c
===================================================================
--- trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c	(revision 55979)
+++ trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c	(revision 55980)
@@ -177,5 +177,7 @@
     RTMemTmpFree,
     RTLogDefaultInstance,
-    RTLogRelDefaultInstance,
+    RTLogDefaultInstanceEx,
+    RTLogRelGetDefaultInstance,
+    RTLogRelGetDefaultInstanceEx,
     RTErrConvertToErrno,
     VbgdCommonIoCtl,
Index: trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.h
===================================================================
--- trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.h	(revision 55979)
+++ trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.h	(revision 55980)
@@ -180,5 +180,7 @@
     void (*_RTMemTmpFree)(void *pv);
     PRTLOGGER(*_RTLogDefaultInstance)(void);
-    PRTLOGGER(*_RTLogRelDefaultInstance)(void);
+    PRTLOGGER(*_RTLogDefaultInstanceEx)(uint32_t fFlags, uint32_t iGroup);
+    PRTLOGGER(*_RTLogRelGetDefaultInstance)(void);
+    PRTLOGGER(*_RTLogRelGetDefaultInstanceEx)(uint32_t fFlags, uint32_t iGroup);
     int (*_RTErrConvertToErrno)(int iErr);
     int (*_VbgdCommonIoCtl)(unsigned iFunction, PVBOXGUESTDEVEXT pDevExt, PVBOXGUESTSESSION pSession,
Index: trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c
===================================================================
--- trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c	(revision 55979)
+++ trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c	(revision 55980)
@@ -957,5 +957,5 @@
     if (g_fLoggerCreated)
     {
-        PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelDefaultInstance();
+        PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
         if (pLogger)
             RTLogGroupSettings(pLogger, pszValue);
@@ -970,5 +970,5 @@
 static int vboxguestLinuxParamLogGrpGet(char *pszBuf, struct kernel_param *pParam)
 {
-    PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelDefaultInstance();
+    PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
     *pszBuf = '\0';
     if (pLogger)
@@ -983,5 +983,5 @@
     if (g_fLoggerCreated)
     {
-        PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelDefaultInstance();
+        PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
         if (pLogger)
             RTLogFlags(pLogger, pszValue);
@@ -995,5 +995,5 @@
 static int vboxguestLinuxParamLogFlagsGet(char *pszBuf, struct kernel_param *pParam)
 {
-    PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelDefaultInstance();
+    PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
     *pszBuf = '\0';
     if (pLogger)
@@ -1008,5 +1008,5 @@
     if (g_fLoggerCreated)
     {
-        PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelDefaultInstance();
+        PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
         if (pLogger)
             RTLogDestinations(pLogger, pszValue);
@@ -1020,5 +1020,5 @@
 static int vboxguestLinuxParamLogDstGet(char *pszBuf, struct kernel_param *pParam)
 {
-    PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelDefaultInstance();
+    PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
     *pszBuf = '\0';
     if (pLogger)
Index: trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp
===================================================================
--- trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp	(revision 55979)
+++ trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp	(revision 55980)
@@ -65,6 +65,12 @@
 }
 
-RTDECL(PRTLOGGER) RTLogRelDefaultInstance(void)
+RTDECL(PRTLOGGER) RTLogRelGetDefaultInstance(void)
 {
+    return NULL;
+}
+
+RTDECL(PRTLOGGER) RTLogRelGetDefaultInstanceEx(uint32_t fFlags, uint32_t iGroup)
+{
+    NOREF(fFlags); NOREF(iGroup);
     return NULL;
 }
Index: trunk/src/VBox/Additions/solaris/DRM/vboxvideo_drm.c
===================================================================
--- trunk/src/VBox/Additions/solaris/DRM/vboxvideo_drm.c	(revision 55979)
+++ trunk/src/VBox/Additions/solaris/DRM/vboxvideo_drm.c	(revision 55980)
@@ -29,7 +29,4 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#ifdef DEBUG_ramshankar
-# define LOG_INSTANCE       RTLogRelDefaultInstance()
-#endif
 #undef offsetof     /* This gets redefined in drmP.h */
 #include "include/drmP.h"
Index: trunk/src/VBox/Additions/solaris/Virtio/Virtio-solaris.c
===================================================================
--- trunk/src/VBox/Additions/solaris/Virtio/Virtio-solaris.c	(revision 55979)
+++ trunk/src/VBox/Additions/solaris/Virtio/Virtio-solaris.c	(revision 55980)
@@ -28,7 +28,4 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#ifdef DEBUG_ramshankar
-# define LOG_INSTANCE       RTLogRelDefaultInstance()
-#endif
 #include "Virtio-solaris.h"
 
Index: trunk/src/VBox/Additions/solaris/Virtio/VirtioNet-solaris.c
===================================================================
--- trunk/src/VBox/Additions/solaris/Virtio/VirtioNet-solaris.c	(revision 55979)
+++ trunk/src/VBox/Additions/solaris/Virtio/VirtioNet-solaris.c	(revision 55980)
@@ -28,7 +28,4 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#ifdef DEBUG_ramshankar
-# define LOG_INSTANCE       RTLogRelDefaultInstance()
-#endif
 #include "Virtio-solaris.h"
 #include "VirtioPci-solaris.h"
Index: trunk/src/VBox/Additions/solaris/Virtio/VirtioPci-solaris.c
===================================================================
--- trunk/src/VBox/Additions/solaris/Virtio/VirtioPci-solaris.c	(revision 55979)
+++ trunk/src/VBox/Additions/solaris/Virtio/VirtioPci-solaris.c	(revision 55980)
@@ -28,7 +28,4 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#ifdef DEBUG_ramshankar
-# define LOG_INSTANCE       RTLogRelDefaultInstance()
-#endif
 #include "VirtioPci-solaris.h"
 
Index: trunk/src/VBox/Additions/solaris/Virtio/VirtioRing-solaris.c
===================================================================
--- trunk/src/VBox/Additions/solaris/Virtio/VirtioRing-solaris.c	(revision 55979)
+++ trunk/src/VBox/Additions/solaris/Virtio/VirtioRing-solaris.c	(revision 55980)
@@ -28,7 +28,4 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#ifdef DEBUG_ramshankar
-# define LOG_INSTANCE       RTLogRelDefaultInstance()
-#endif
 #include "Virtio-solaris.h"
 
Index: trunk/src/VBox/Additions/x11/VBoxClient/main.cpp
===================================================================
--- trunk/src/VBox/Additions/x11/VBoxClient/main.cpp	(revision 55979)
+++ trunk/src/VBox/Additions/x11/VBoxClient/main.cpp	(revision 55980)
@@ -301,6 +301,5 @@
             /* If the user is running in "no daemon" mode anyway, send critical
              * logging to stdout as well. */
-            PRTLOGGER pReleaseLog = RTLogRelDefaultInstance();
-
+            PRTLOGGER pReleaseLog = RTLogRelGetDefaultInstance();
             if (pReleaseLog)
                 rc = RTLogDestinations(pReleaseLog, "stdout");
Index: trunk/src/VBox/Debugger/DBGCCommands.cpp
===================================================================
--- trunk/src/VBox/Debugger/DBGCCommands.cpp	(revision 55979)
+++ trunk/src/VBox/Debugger/DBGCCommands.cpp	(revision 55980)
@@ -1218,5 +1218,5 @@
 {
     RTLogFlush(NULL);
-    PRTLOGGER pLogRel = RTLogRelDefaultInstance();
+    PRTLOGGER pLogRel = RTLogRelGetDefaultInstance();
     if (pLogRel)
         RTLogFlush(pLogRel);
Index: trunk/src/VBox/Devices/Network/DevE1000.cpp
===================================================================
--- trunk/src/VBox/Devices/Network/DevE1000.cpp	(revision 55979)
+++ trunk/src/VBox/Devices/Network/DevE1000.cpp	(revision 55980)
@@ -173,5 +173,5 @@
 #  define E1kLog2(a)              Log2(a)
 #  define E1kLog3(a)              Log3(a)
-#  define E1kLogX(x, a)           LogIt(LOG_INSTANCE, x, LOG_GROUP, a)
+#  define E1kLogX(x, a)           LogIt(x, LOG_GROUP, a)
 //#  define E1kLog(a)               do {} while (0)
 //#  define E1kLog2(a)              do {} while (0)
Index: trunk/src/VBox/Devices/Network/lwip-new/vbox/include/lwip-log.h
===================================================================
--- trunk/src/VBox/Devices/Network/lwip-new/vbox/include/lwip-log.h	(revision 55979)
+++ trunk/src/VBox/Devices/Network/lwip-new/vbox/include/lwip-log.h	(revision 55980)
@@ -73,18 +73,17 @@
 #ifdef LOG_ENABLED
 
-#define LWIP_DEBUGF(_when, _args)                                       \
-    do {                                                                \
+# define LWIP_DEBUGF(_when, _args) \
+    do { \
         const VBOX_LOGGROUP _group = (_when) >> LWIP_DEBUGF_LOG_GROUP_SHIFT; \
-        if (_group >= LOG_GROUP_DEFAULT) {                              \
+        if (_group >= LOG_GROUP_DEFAULT) { \
             /* severe => l1; serious => l2; warning => l3; default => l4 */ \
-            const unsigned int _level =                                 \
-                1 << (LWIP_DBG_MASK_LEVEL+1 - ((_when) & LWIP_DBG_MASK_LEVEL)); \
-            LogIt(LOG_INSTANCE, _level, _group, _args);                 \
-        }                                                               \
+            const unsigned int _level = 1U << (LWIP_DBG_MASK_LEVEL + 1 - ((_when) & LWIP_DBG_MASK_LEVEL)); \
+            LogIt(_level, _group, _args);  \
+        } \
     } while (0)
 
 #else  /* !LOG_ENABLED */
 
-#define LWIP_DEBUGF(_when, _args) do { } while (0)
+# define LWIP_DEBUGF(_when, _args) do { } while (0)
 
 #endif /* !LOG_ENABLED */
Index: trunk/src/VBox/Devices/USB/solaris/USBProxyDevice-solaris.cpp
===================================================================
--- trunk/src/VBox/Devices/USB/solaris/USBProxyDevice-solaris.cpp	(revision 55979)
+++ trunk/src/VBox/Devices/USB/solaris/USBProxyDevice-solaris.cpp	(revision 55980)
@@ -21,7 +21,4 @@
 *******************************************************************************/
 #define LOG_GROUP LOG_GROUP_DRV_USBPROXY
-#ifdef DEBUG_ramshankar
-# define LOG_INSTANCE       RTLogRelDefaultInstance()
-#endif
 #include <sys/poll.h>
 #include <errno.h>
Index: trunk/src/VBox/Devices/VMMDev/VMMDev.cpp
===================================================================
--- trunk/src/VBox/Devices/VMMDev/VMMDev.cpp	(revision 55979)
+++ trunk/src/VBox/Devices/VMMDev/VMMDev.cpp	(revision 55980)
@@ -2177,5 +2177,5 @@
                     ("not null terminated\n"), VERR_INVALID_PARAMETER);
 
-    LogIt(LOG_INSTANCE, RTLOGGRPFLAGS_LEVEL_1, LOG_GROUP_DEV_VMM_BACKDOOR, ("DEBUG LOG: %s", pReq->szString));
+    LogIt(RTLOGGRPFLAGS_LEVEL_1, LOG_GROUP_DEV_VMM_BACKDOOR, ("DEBUG LOG: %s", pReq->szString));
     return VINF_SUCCESS;
 }
@@ -2866,8 +2866,8 @@
         switch (u32)
         {
-            case '\r': LogIt(LOG_INSTANCE, RTLOGGRPFLAGS_LEVEL_2, LOG_GROUP_DEV_VMM_BACKDOOR, ("vmmdev: <return>\n")); break;
-            case '\n': LogIt(LOG_INSTANCE, RTLOGGRPFLAGS_LEVEL_2, LOG_GROUP_DEV_VMM_BACKDOOR, ("vmmdev: <newline>\n")); break;
-            case '\t': LogIt(LOG_INSTANCE, RTLOGGRPFLAGS_LEVEL_2, LOG_GROUP_DEV_VMM_BACKDOOR, ("vmmdev: <tab>\n")); break;
-            default:   LogIt(LOG_INSTANCE, RTLOGGRPFLAGS_LEVEL_2, LOG_GROUP_DEV_VMM_BACKDOOR, ("vmmdev: %c (%02x)\n", u32, u32)); break;
+            case '\r': LogIt(RTLOGGRPFLAGS_LEVEL_2, LOG_GROUP_DEV_VMM_BACKDOOR, ("vmmdev: <return>\n")); break;
+            case '\n': LogIt(RTLOGGRPFLAGS_LEVEL_2, LOG_GROUP_DEV_VMM_BACKDOOR, ("vmmdev: <newline>\n")); break;
+            case '\t': LogIt(RTLOGGRPFLAGS_LEVEL_2, LOG_GROUP_DEV_VMM_BACKDOOR, ("vmmdev: <tab>\n")); break;
+            default:   LogIt(RTLOGGRPFLAGS_LEVEL_2, LOG_GROUP_DEV_VMM_BACKDOOR, ("vmmdev: %c (%02x)\n", u32, u32)); break;
         }
 
@@ -2877,5 +2877,5 @@
             pThis->szMsg[pThis->iMsg] = '\0';
             if (pThis->iMsg)
-                LogRelIt(LOG_REL_INSTANCE, RTLOGGRPFLAGS_LEVEL_1, LOG_GROUP_DEV_VMM_BACKDOOR, ("VMMDev: Guest Log: %s\n", pThis->szMsg));
+                LogRelIt(RTLOGGRPFLAGS_LEVEL_1, LOG_GROUP_DEV_VMM_BACKDOOR, ("VMMDev: Guest Log: %s\n", pThis->szMsg));
             pThis->iMsg = 0;
         }
@@ -2885,5 +2885,5 @@
             {
                 pThis->szMsg[pThis->iMsg] = '\0';
-                LogRelIt(LOG_REL_INSTANCE, RTLOGGRPFLAGS_LEVEL_1, LOG_GROUP_DEV_VMM_BACKDOOR, ("VMMDev: Guest Log: %s\n", pThis->szMsg));
+                LogRelIt(RTLOGGRPFLAGS_LEVEL_1, LOG_GROUP_DEV_VMM_BACKDOOR, ("VMMDev: Guest Log: %s\n", pThis->szMsg));
                 pThis->iMsg = 0;
             }
Index: trunk/src/VBox/HostDrivers/Support/SUPDrv.cpp
===================================================================
--- trunk/src/VBox/HostDrivers/Support/SUPDrv.cpp	(revision 55979)
+++ trunk/src/VBox/HostDrivers/Support/SUPDrv.cpp	(revision 55980)
@@ -228,8 +228,12 @@
     { "RTHandleTableLookupWithCtx",             (void *)RTHandleTableLookupWithCtx },
     { "RTLogDefaultInstance",                   (void *)RTLogDefaultInstance },
+    { "RTLogDefaultInstanceEx",                 (void *)RTLogDefaultInstanceEx },
     { "RTLogGetDefaultInstance",                (void *)RTLogGetDefaultInstance },
+    { "RTLogGetDefaultInstanceEx",              (void *)RTLogGetDefaultInstanceEx },
     { "RTLogLoggerExV",                         (void *)RTLogLoggerExV },
     { "RTLogPrintfV",                           (void *)RTLogPrintfV },
-    { "RTLogRelDefaultInstance",                (void *)RTLogRelDefaultInstance },
+    { "RTLogRelDefaultInstance",                (void *)RTLogRelGetDefaultInstance },
+    { "RTLogRelGetDefaultInstance",             (void *)RTLogRelGetDefaultInstance },
+    { "RTLogRelGetDefaultInstanceEx",           (void *)RTLogRelGetDefaultInstanceEx },
     { "RTLogSetDefaultInstanceThread",          (void *)RTLogSetDefaultInstanceThread },
     { "RTMemAllocExTag",                        (void *)RTMemAllocExTag },
@@ -5328,5 +5332,5 @@
 
         case SUPLOGGERSETTINGS_WHICH_RELEASE:
-            pLogger = RTLogRelDefaultInstance();
+            pLogger = RTLogRelGetDefaultInstance();
             break;
 
Index: trunk/src/VBox/HostDrivers/Support/SUPDrvIOC.h
===================================================================
--- trunk/src/VBox/HostDrivers/Support/SUPDrvIOC.h	(revision 55979)
+++ trunk/src/VBox/HostDrivers/Support/SUPDrvIOC.h	(revision 55980)
@@ -213,7 +213,7 @@
  *
  * @todo Pending work on next major version change:
- *          - (nothing)
- */
-#define SUPDRV_IOC_VERSION                              0x00220000
+ *          - Remove RTLogRelDefaultInstance export from SUPDrv.cpp.
+ */
+#define SUPDRV_IOC_VERSION                              0x00220001
 
 /** SUP_IOCTL_COOKIE. */
Index: trunk/src/VBox/HostDrivers/Support/SUPLib.cpp
===================================================================
--- trunk/src/VBox/HostDrivers/Support/SUPLib.cpp	(revision 55979)
+++ trunk/src/VBox/HostDrivers/Support/SUPLib.cpp	(revision 55980)
@@ -280,5 +280,5 @@
         CookieReq.u.In.u32ReqVersion = SUPDRV_IOC_VERSION;
         const uint32_t uMinVersion = (SUPDRV_IOC_VERSION & 0xffff0000) == 0x00200000
-                                   ? 0x00200000
+                                   ? 0x00200001
                                    : SUPDRV_IOC_VERSION & 0xffff0000;
         CookieReq.u.In.u32MinVersion = uMinVersion;
@@ -493,5 +493,5 @@
         { "RTTimerCanDoHighResolution",             0xefef003a },
         { "RTLogDefaultInstance",                   0xefef003b },
-        { "RTLogRelDefaultInstance",                0xefef003c },
+        { "RTLogRelGetDefaultInstance",             0xefef003c },
         { "RTLogSetDefaultInstanceThread",          0xefef003d },
         { "RTLogLogger",                            0xefef003e },
Index: trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c
===================================================================
--- trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c	(revision 55979)
+++ trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c	(revision 55980)
@@ -29,8 +29,4 @@
 *******************************************************************************/
 #define LOG_GROUP LOG_GROUP_SUP_DRV
-#ifdef DEBUG_ramshankar
-# define LOG_ENABLED
-# define LOG_INSTANCE       RTLogRelDefaultInstance()
-#endif
 #include <sys/types.h>
 #include <sys/param.h>
Index: trunk/src/VBox/HostDrivers/VBoxNetAdp/solaris/VBoxNetAdp-solaris.c
===================================================================
--- trunk/src/VBox/HostDrivers/VBoxNetAdp/solaris/VBoxNetAdp-solaris.c	(revision 55979)
+++ trunk/src/VBox/HostDrivers/VBoxNetAdp/solaris/VBoxNetAdp-solaris.c	(revision 55980)
@@ -29,8 +29,4 @@
 *******************************************************************************/
 #define LOG_GROUP LOG_GROUP_NET_ADP_DRV
-#ifdef DEBUG_ramshankar
-# define LOG_ENABLED
-# define LOG_INSTANCE       RTLogRelDefaultInstance()
-#endif
 #include <VBox/log.h>
 #include <VBox/err.h>
Index: trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c
===================================================================
--- trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c	(revision 55979)
+++ trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c	(revision 55980)
@@ -29,8 +29,4 @@
 *******************************************************************************/
 #define LOG_GROUP LOG_GROUP_NET_FLT_DRV
-#ifdef DEBUG_ramshankar
-# define LOG_ENABLED
-# define LOG_INSTANCE       RTLogRelDefaultInstance()
-#endif
 #include <VBox/log.h>
 #include <VBox/err.h>
Index: trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFltBow-solaris.c
===================================================================
--- trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFltBow-solaris.c	(revision 55979)
+++ trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFltBow-solaris.c	(revision 55980)
@@ -29,8 +29,4 @@
 *******************************************************************************/
 #define LOG_GROUP LOG_GROUP_NET_FLT_DRV
-#ifdef DEBUG_ramshankar
-# define LOG_ENABLED
-# define LOG_INSTANCE       RTLogRelDefaultInstance()
-#endif
 #include <VBox/log.h>
 #include <VBox/err.h>
Index: trunk/src/VBox/HostDrivers/VBoxUSB/solaris/USBLib-solaris.cpp
===================================================================
--- trunk/src/VBox/HostDrivers/VBoxUSB/solaris/USBLib-solaris.cpp	(revision 55979)
+++ trunk/src/VBox/HostDrivers/VBoxUSB/solaris/USBLib-solaris.cpp	(revision 55980)
@@ -20,7 +20,4 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#ifdef DEBUG_ramshankar
-# define LOG_INSTANCE       RTLogRelDefaultInstance()
-#endif
 #include <VBox/usblib.h>
 #include <VBox/err.h>
Index: trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSB-solaris.c
===================================================================
--- trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSB-solaris.c	(revision 55979)
+++ trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSB-solaris.c	(revision 55980)
@@ -29,8 +29,4 @@
 *******************************************************************************/
 #define LOG_GROUP LOG_GROUP_USB_DRV
-#ifdef DEBUG_ramshankar
-# define LOG_ENABLED
-# define LOG_INSTANCE       RTLogRelDefaultInstance()
-#endif
 #include <VBox/version.h>
 #include <VBox/log.h>
Index: trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSBMon-solaris.c
===================================================================
--- trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSBMon-solaris.c	(revision 55979)
+++ trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSBMon-solaris.c	(revision 55980)
@@ -29,8 +29,4 @@
 *******************************************************************************/
 #define LOG_GROUP  LOG_GROUP_USB_DRV
-#ifdef DEBUG_ramshankar
-# define LOG_ENABLED
-# define LOG_INSTANCE       RTLogRelDefaultInstance()
-#endif
 #include "VBoxUSBFilterMgr.h"
 #include <VBox/usblib-solaris.h>
Index: trunk/src/VBox/Main/src-all/Logging.cpp
===================================================================
--- trunk/src/VBox/Main/src-all/Logging.cpp	(revision 55979)
+++ trunk/src/VBox/Main/src-all/Logging.cpp	(revision 55980)
@@ -1,5 +1,4 @@
 /* $Id$ */
 /** @file
- *
  * VirtualBox Main Logging
  */
@@ -19,6 +18,6 @@
 
 /*
- *  Main now always uses the default LOG_INSTANCE for logging,
- *  so nothing to do here for now.
+ *  Main now always uses the defaults for logging, so nothing to do
+ *  here for now.
  */
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */
Index: trunk/src/VBox/Main/src-client/MachineDebuggerImpl.cpp
===================================================================
--- trunk/src/VBox/Main/src-client/MachineDebuggerImpl.cpp	(revision 55979)
+++ trunk/src/VBox/Main/src-client/MachineDebuggerImpl.cpp	(revision 55980)
@@ -529,6 +529,5 @@
 HRESULT MachineDebugger::getLogRelFlags(com::Utf8Str &aLogRelFlags)
 {
-    HRESULT hrc = i_logStringProps(RTLogRelDefaultInstance(), RTLogGetFlags, "RTGetFlags", aLogRelFlags);
-
+    HRESULT hrc = i_logStringProps(RTLogRelGetDefaultInstance(), RTLogGetFlags, "RTGetFlags", aLogRelFlags);
     return hrc;
 }
@@ -536,6 +535,5 @@
 HRESULT MachineDebugger::getLogRelGroups(com::Utf8Str &aLogRelGroups)
 {
-    HRESULT hrc = i_logStringProps(RTLogRelDefaultInstance(), RTLogGetGroupSettings, "RTLogGetGroupSettings", aLogRelGroups);
-
+    HRESULT hrc = i_logStringProps(RTLogRelGetDefaultInstance(), RTLogGetGroupSettings, "RTLogGetGroupSettings", aLogRelGroups);
     return hrc;
 }
@@ -543,6 +541,5 @@
 HRESULT MachineDebugger::getLogRelDestinations(com::Utf8Str &aLogRelDestinations)
 {
-    HRESULT hrc = i_logStringProps(RTLogRelDefaultInstance(), RTLogGetDestinations, "RTLogGetDestinations", aLogRelDestinations);
-
+    HRESULT hrc = i_logStringProps(RTLogRelGetDefaultInstance(), RTLogGetDestinations, "RTLogGetDestinations", aLogRelDestinations);
     return hrc;
 }
Index: trunk/src/VBox/Main/src-server/SystemPropertiesImpl.cpp
===================================================================
--- trunk/src/VBox/Main/src-server/SystemPropertiesImpl.cpp	(revision 55979)
+++ trunk/src/VBox/Main/src-server/SystemPropertiesImpl.cpp	(revision 55980)
@@ -1183,5 +1183,5 @@
     if (useLoggingLevel.isEmpty())
         useLoggingLevel = VBOXSVC_LOG_DEFAULT;
-    int rc = RTLogGroupSettings(RTLogRelDefaultInstance(), useLoggingLevel.c_str());
+    int rc = RTLogGroupSettings(RTLogRelGetDefaultInstance(), useLoggingLevel.c_str());
     //  If failed and not the default logging level - try to use the default logging level.
     if (RT_FAILURE(rc))
@@ -1192,5 +1192,5 @@
         if (!useLoggingLevel.equals(VBOXSVC_LOG_DEFAULT))
         {
-            rc = RTLogGroupSettings(RTLogRelDefaultInstance(), VBOXSVC_LOG_DEFAULT);
+            rc = RTLogGroupSettings(RTLogRelGetDefaultInstance(), VBOXSVC_LOG_DEFAULT);
             // If failed report this to the release log.
             if (RT_FAILURE(rc))
Index: trunk/src/VBox/Main/src-server/win/svcmain.cpp
===================================================================
--- trunk/src/VBox/Main/src-server/win/svcmain.cpp	(revision 55979)
+++ trunk/src/VBox/Main/src-server/win/svcmain.cpp	(revision 55980)
@@ -99,5 +99,5 @@
              * running at this point which would rotate the logs concurrently,
              * creating a mess. */
-            PRTLOGGER pReleaseLogger = RTLogRelDefaultInstance();
+            PRTLOGGER pReleaseLogger = RTLogRelGetDefaultInstance();
             if (pReleaseLogger)
             {
Index: trunk/src/VBox/Runtime/VBox/VBoxRTImp.def
===================================================================
--- trunk/src/VBox/Runtime/VBox/VBoxRTImp.def	(revision 55979)
+++ trunk/src/VBox/Runtime/VBox/VBoxRTImp.def	(revision 55980)
@@ -610,4 +610,5 @@
     RTLogDefaultInit
     RTLogDefaultInstance
+    RTLogDefaultInstanceEx
     RTLogDestinations
     RTLogDestroy
@@ -618,4 +619,5 @@
     RTLogFormatV
     RTLogGetDefaultInstance
+    RTLogGetDefaultInstanceEx
     RTLogGetDestinations
     RTLogGetFlags
@@ -628,5 +630,6 @@
     RTLogPrintf
     RTLogPrintfV
-    RTLogRelDefaultInstance
+    RTLogRelGetDefaultInstance
+    RTLogRelGetDefaultInstanceEx
     RTLogRelLogger
     RTLogRelLoggerV
Index: trunk/src/VBox/Runtime/VBox/logbackdoor-redirect.cpp
===================================================================
--- trunk/src/VBox/Runtime/VBox/logbackdoor-redirect.cpp	(revision 55979)
+++ trunk/src/VBox/Runtime/VBox/logbackdoor-redirect.cpp	(revision 55980)
@@ -7,5 +7,5 @@
 
 /*
- * Copyright (C) 2007-2011 Oracle Corporation
+ * Copyright (C) 2007-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -27,4 +27,5 @@
  */
 
+
 /*******************************************************************************
 *   Header Files                                                               *
@@ -36,5 +37,12 @@
 
 /* All release logging goes to the backdoor logger anyway. */
-RTDECL(PRTLOGGER) RTLogRelDefaultInstance(void)
+RTDECL(PRTLOGGER) RTLogRelGetDefaultInstance(void)
+{
+    return NULL;
+}
+
+
+/* All release logging goes to the backdoor logger anyway. */
+RTDECL(PRTLOGGER) RTLogRelGetDefaultInstanceEx(uint32_t fFlags, uint32_t iGroup)
 {
     return NULL;
@@ -48,4 +56,12 @@
 }
 
+
+/* All logging goes to the backdoor logger anyway. */
+RTDECL(PRTLOGGER) RTLogDefaultInstanceEx(uint32_t fFlags, uint32_t iGroup)
+{
+    return NULL;
+}
+
+
 /* All logging goes to the backdoor logger anyway. */
 RTDECL(PRTLOGGER) RTLogRelSetDefaultInstance(PRTLOGGER pLogger)
@@ -53,4 +69,5 @@
     return NULL;
 }
+
 
 RTDECL(void) RTLogRelPrintf(const char *pszFormat, ...)
@@ -108,2 +125,3 @@
     return VERR_NOT_IMPLEMENTED;
 }
+
Index: trunk/src/VBox/Runtime/common/log/log.cpp
===================================================================
--- trunk/src/VBox/Runtime/common/log/log.cpp	(revision 55979)
+++ trunk/src/VBox/Runtime/common/log/log.cpp	(revision 55980)
@@ -2576,10 +2576,7 @@
 
 /**
- * Gets the default logger instance, creating it if necessary.
- *
- * @returns Pointer to default logger instance.
- * @returns NULL if no default logger instance available.
- */
-RTDECL(PRTLOGGER)   RTLogDefaultInstance(void)
+ * Common worker for RTLogDefaultInstance and RTLogDefaultInstanceEx.
+ */
+DECL_FORCE_INLINE(PRTLOGGER) rtLogDefaultInstanceCommon(void)
 {
 #ifdef IN_RC
@@ -2609,14 +2606,34 @@
 #endif /* !IN_RC */
 }
+
+
+RTDECL(PRTLOGGER)   RTLogDefaultInstance(void)
+{
+    return rtLogDefaultInstanceCommon();
+}
 RT_EXPORT_SYMBOL(RTLogDefaultInstance);
 
 
-/**
- * Gets the default logger instance.
- *
- * @returns Pointer to default logger instance.
- * @returns NULL if no default logger instance available.
- */
-RTDECL(PRTLOGGER)   RTLogGetDefaultInstance(void)
+RTDECL(PRTLOGGER)   RTLogDefaultInstanceEx(uint32_t fFlags, uint32_t iGroup)
+{
+    PRTLOGGER pLogger = rtLogDefaultInstanceCommon();
+    if (pLogger)
+    {
+        if (pLogger->fFlags & RTLOGFLAGS_DISABLED)
+            pLogger = NULL;
+        else if (   iGroup != UINT32_MAX
+                 && (   (pLogger->afGroups[iGroup < pLogger->cGroups ? iGroup : 0] & (fFlags | RTLOGGRPFLAGS_ENABLED))
+                     != (fFlags | RTLOGGRPFLAGS_ENABLED)))
+            pLogger = NULL;
+    }
+    return pLogger;
+}
+RT_EXPORT_SYMBOL(RTLogDefaultInstanceEx);
+
+
+/**
+ * Common worker for RTLogGetDefaultInstance and RTLogGetDefaultInstanceEx.
+ */
+DECL_FORCE_INLINE(PRTLOGGER) rtLogGetDefaultInstanceCommon(void)
 {
 #ifdef IN_RC
@@ -2640,5 +2657,28 @@
 #endif
 }
+
+
+RTDECL(PRTLOGGER) RTLogGetDefaultInstance(void)
+{
+    return rtLogGetDefaultInstanceCommon();
+}
 RT_EXPORT_SYMBOL(RTLogGetDefaultInstance);
+
+
+RTDECL(PRTLOGGER) RTLogGetDefaultInstanceEx(uint32_t fFlags, uint32_t iGroup)
+{
+    PRTLOGGER pLogger = rtLogGetDefaultInstanceCommon();
+    if (pLogger)
+    {
+        if (pLogger->fFlags & RTLOGFLAGS_DISABLED)
+            pLogger = NULL;
+        else if (   iGroup != UINT32_MAX
+                 && (   (pLogger->afGroups[iGroup < pLogger->cGroups ? iGroup : 0] & (fFlags | RTLOGGRPFLAGS_ENABLED))
+                     != (fFlags | RTLOGGRPFLAGS_ENABLED)))
+            pLogger = NULL;
+    }
+    return pLogger;
+}
+RT_EXPORT_SYMBOL(RTLogGetDefaultInstanceEx);
 
 
Index: trunk/src/VBox/Runtime/common/log/logrel.cpp
===================================================================
--- trunk/src/VBox/Runtime/common/log/logrel.cpp	(revision 55979)
+++ trunk/src/VBox/Runtime/common/log/logrel.cpp	(revision 55980)
@@ -70,11 +70,5 @@
 
 
-/**
- * Gets the default release logger instance.
- *
- * @returns Pointer to default release logger instance.
- * @returns NULL if no default release logger instance available.
- */
-RTDECL(PRTLOGGER)   RTLogRelDefaultInstance(void)
+RTDECL(PRTLOGGER)   RTLogRelGetDefaultInstance(void)
 {
 #ifdef IN_RC
@@ -84,5 +78,26 @@
 #endif /* !IN_RC */
 }
-RT_EXPORT_SYMBOL(RTLogRelDefaultInstance);
+RT_EXPORT_SYMBOL(RTLogRelGetDefaultInstance);
+
+
+RTDECL(PRTLOGGER)   RTLogRelGetDefaultInstanceEx(uint32_t fFlags, uint32_t iGroup)
+{
+#ifdef IN_RC
+    PRTLOGGER pLogger = &g_RelLogger;
+#else /* !IN_RC */
+    PRTLOGGER pLogger = g_pRelLogger;
+#endif /* !IN_RC */
+    if (pLogger)
+    {
+        if (pLogger->fFlags & RTLOGFLAGS_DISABLED)
+            pLogger = NULL;
+        else if (   iGroup != UINT32_MAX
+                 && (   (pLogger->afGroups[iGroup < pLogger->cGroups ? iGroup : 0] & (fFlags | RTLOGGRPFLAGS_ENABLED))
+                     != (fFlags | RTLOGGRPFLAGS_ENABLED)))
+            pLogger = NULL;
+    }
+    return pLogger;
+}
+RT_EXPORT_SYMBOL(RTLogRelGetDefaultInstanceEx);
 
 
@@ -123,5 +138,5 @@
     if (!pLogger)
     {
-        pLogger = RTLogRelDefaultInstance();
+        pLogger = RTLogRelGetDefaultInstance();
         if (!pLogger)
             return;
@@ -157,5 +172,5 @@
 RTDECL(bool) RTLogRelSetBuffering(bool fBuffered)
 {
-    PRTLOGGER pLogger = RTLogRelDefaultInstance();
+    PRTLOGGER pLogger = RTLogRelGetDefaultInstance();
     if (pLogger)
         return RTLogSetBuffering(pLogger, fBuffered);
Index: trunk/src/VBox/Runtime/common/misc/assert.cpp
===================================================================
--- trunk/src/VBox/Runtime/common/misc/assert.cpp	(revision 55979)
+++ trunk/src/VBox/Runtime/common/misc/assert.cpp	(revision 55980)
@@ -146,5 +146,5 @@
 # endif
 
-        PRTLOGGER pLog = RTLogRelDefaultInstance();
+        PRTLOGGER pLog = RTLogRelGetDefaultInstance();
         if (pLog)
         {
@@ -255,5 +255,5 @@
 # endif
 
-        PRTLOGGER pLog = RTLogRelDefaultInstance();
+        PRTLOGGER pLog = RTLogRelGetDefaultInstance();
         if (pLog)
         {
Index: trunk/src/VBox/Runtime/r3/init.cpp
===================================================================
--- trunk/src/VBox/Runtime/r3/init.cpp	(revision 55979)
+++ trunk/src/VBox/Runtime/r3/init.cpp	(revision 55980)
@@ -168,5 +168,5 @@
             RTLogFlush(pLogger);
 
-        pLogger = RTLogRelDefaultInstance();
+        pLogger = RTLogRelGetDefaultInstance();
         if (pLogger)
             RTLogFlush(pLogger);
Index: trunk/src/VBox/VMM/VMMR0/VMMR0.cpp
===================================================================
--- trunk/src/VBox/VMM/VMMR0/VMMR0.cpp	(revision 55979)
+++ trunk/src/VBox/VMM/VMMR0/VMMR0.cpp	(revision 55980)
@@ -2076,5 +2076,5 @@
         va_end(vaCopy);
     }
-    pLog = RTLogRelDefaultInstance();
+    pLog = RTLogRelGetDefaultInstance();
     if (pLog)
     {
Index: trunk/src/VBox/VMM/VMMR0/VMMR0.def
===================================================================
--- trunk/src/VBox/VMM/VMMR0/VMMR0.def	(revision 55979)
+++ trunk/src/VBox/VMM/VMMR0/VMMR0.def	(revision 55980)
@@ -39,5 +39,7 @@
     IOMMMIOMapMMIO2Page
     RTLogDefaultInstance
-    RTLogRelDefaultInstance
+    RTLogDefaultInstanceEx
+    RTLogRelGetDefaultInstance
+    RTLogRelGetDefaultInstanceEx
     RTLogLogger
     RTLogLoggerEx
Index: trunk/src/VBox/VMM/VMMR3/DBGFLog.cpp
===================================================================
--- trunk/src/VBox/VMM/VMMR3/DBGFLog.cpp	(revision 55979)
+++ trunk/src/VBox/VMM/VMMR3/DBGFLog.cpp	(revision 55980)
@@ -45,5 +45,5 @@
     {
         *ppsz += sizeof("release:") - 1;
-        pLogger = RTLogRelDefaultInstance();
+        pLogger = RTLogRelGetDefaultInstance();
     }
     else
Index: trunk/src/VBox/VMM/VMMR3/EMRaw.cpp
===================================================================
--- trunk/src/VBox/VMM/VMMR3/EMRaw.cpp	(revision 55979)
+++ trunk/src/VBox/VMM/VMMR3/EMRaw.cpp	(revision 55980)
@@ -1541,5 +1541,5 @@
             default:
                 if (PATMIsPatchGCAddr(pVM, pCtx->eip) && !(pCtx->eflags.u32 & X86_EFL_TF))
-                    LogIt(NULL, 0, LOG_GROUP_PATM, ("Patch code interrupted at %RRv for reason %Rrc\n", (RTRCPTR)CPUMGetGuestEIP(pVCpu), rc));
+                    LogIt(0, LOG_GROUP_PATM, ("Patch code interrupted at %RRv for reason %Rrc\n", (RTRCPTR)CPUMGetGuestEIP(pVCpu), rc));
                 break;
         }
Index: trunk/src/VBox/VMM/VMMR3/VMM.cpp
===================================================================
--- trunk/src/VBox/VMM/VMMR3/VMM.cpp	(revision 55979)
+++ trunk/src/VBox/VMM/VMMR3/VMM.cpp	(revision 55980)
@@ -382,5 +382,5 @@
     if (!HMIsEnabled(pVM))
     {
-        PRTLOGGER pRelLogger = RTLogRelDefaultInstance();
+        PRTLOGGER pRelLogger = RTLogRelGetDefaultInstance();
         if (pRelLogger)
         {
@@ -608,5 +608,5 @@
             PRTLOGGERRC pRelLogger = pVM->vmm.s.pRCRelLoggerR3;
             if (RT_UNLIKELY(pRelLogger && pRelLogger->offScratch > 0))
-                RTLogFlushRC(RTLogRelDefaultInstance(), pRelLogger);
+                RTLogFlushRC(RTLogRelGetDefaultInstance(), pRelLogger);
 #endif
             if (rc != VINF_VMM_CALL_HOST)
@@ -917,5 +917,5 @@
 
         pVM->vmm.s.pRCRelLoggerRC = MMHyperR3ToRC(pVM, pVM->vmm.s.pRCRelLoggerR3);
-        rc = RTLogCloneRC(RTLogRelDefaultInstance(), pVM->vmm.s.pRCRelLoggerR3, pVM->vmm.s.cbRCRelLogger,
+        rc = RTLogCloneRC(RTLogRelGetDefaultInstance(), pVM->vmm.s.pRCRelLoggerR3, pVM->vmm.s.cbRCRelLogger,
                           RCPtrLoggerWrapper, RCPtrLoggerFlush, RTLOGFLAGS_BUFFERED);
         AssertReleaseMsgRC(rc, ("RTLogCloneRC failed! rc=%Rra\n", rc));
@@ -1319,5 +1319,5 @@
         PRTLOGGERRC pRelLogger = pVM->vmm.s.pRCRelLoggerR3;
         if (RT_UNLIKELY(pRelLogger && pRelLogger->offScratch > 0))
-            RTLogFlushRC(RTLogRelDefaultInstance(), pRelLogger);
+            RTLogFlushRC(RTLogRelGetDefaultInstance(), pRelLogger);
 #endif
         if (rc != VINF_VMM_CALL_HOST)
@@ -2005,5 +2005,5 @@
         PRTLOGGERRC pRelLogger = pVM->vmm.s.pRCRelLoggerR3;
         if (RT_UNLIKELY(pRelLogger && pRelLogger->offScratch > 0))
-            RTLogFlushRC(RTLogRelDefaultInstance(), pRelLogger);
+            RTLogFlushRC(RTLogRelGetDefaultInstance(), pRelLogger);
 #endif
         if (rc == VERR_TRPM_PANIC || rc == VERR_TRPM_DONT_PANIC)
@@ -2115,5 +2115,5 @@
         PRTLOGGERRC pRelLogger = pVM->vmm.s.pRCRelLoggerR3;
         if (RT_UNLIKELY(pRelLogger && pRelLogger->offScratch > 0))
-            RTLogFlushRC(RTLogRelDefaultInstance(), pRelLogger);
+            RTLogFlushRC(RTLogRelGetDefaultInstance(), pRelLogger);
 # endif
         if (rc == VERR_TRPM_PANIC || rc == VERR_TRPM_DONT_PANIC)
Index: trunk/src/VBox/VMM/VMMR3/VMMGuruMeditation.cpp
===================================================================
--- trunk/src/VBox/VMM/VMMR3/VMMGuruMeditation.cpp	(revision 55979)
+++ trunk/src/VBox/VMM/VMMR3/VMMGuruMeditation.cpp	(revision 55980)
@@ -155,5 +155,5 @@
      * The loggers.
      */
-    pHlp->pRelLogger  = RTLogRelDefaultInstance();
+    pHlp->pRelLogger  = RTLogRelGetDefaultInstance();
 #ifdef LOG_ENABLED
     pHlp->pLogger     = RTLogDefaultInstance();
Index: trunk/src/VBox/VMM/VMMR3/VMMTests.cpp
===================================================================
--- trunk/src/VBox/VMM/VMMR3/VMMTests.cpp	(revision 55979)
+++ trunk/src/VBox/VMM/VMMR3/VMMTests.cpp	(revision 55980)
@@ -223,5 +223,5 @@
     PRTLOGGERRC pRelLogger = pVM->vmm.s.pRCRelLoggerR3;
     if (RT_UNLIKELY(pRelLogger && pRelLogger->offScratch > 0))
-        RTLogFlushRC(RTLogRelDefaultInstance(), pRelLogger);
+        RTLogFlushRC(RTLogRelGetDefaultInstance(), pRelLogger);
 # endif
 #endif
Index: trunk/src/VBox/VMM/VMMRC/VMMRC.def
===================================================================
--- trunk/src/VBox/VMM/VMMRC/VMMRC.def	(revision 55979)
+++ trunk/src/VBox/VMM/VMMRC/VMMRC.def	(revision 55980)
@@ -37,5 +37,7 @@
     PGMPhysSimpleDirtyWriteGCPtr
     RTLogDefaultInstance
-    RTLogRelDefaultInstance
+    RTLogDefaultInstanceEx
+    RTLogRelGetDefaultInstance
+    RTLogRelGetDefaultInstanceEx
     RTTimeMilliTS
     RTTraceBufAddMsgF
Index: trunk/src/recompiler/Sun/crt/stdio.h
===================================================================
--- trunk/src/recompiler/Sun/crt/stdio.h	(revision 55979)
+++ trunk/src/recompiler/Sun/crt/stdio.h	(revision 55980)
@@ -61,6 +61,6 @@
 
 #define fflush(file)            RTLogFlush(NULL)
-#define printf(...)             LogIt(LOG_INSTANCE, 0, LOG_GROUP_REM_PRINTF, (__VA_ARGS__))
-#define fprintf(logfile, ...)   LogIt(LOG_INSTANCE, 0, LOG_GROUP_REM_PRINTF, (__VA_ARGS__))
+#define printf(...)             LogIt(0, LOG_GROUP_REM_PRINTF, (__VA_ARGS__))
+#define fprintf(logfile, ...)   LogIt(0, LOG_GROUP_REM_PRINTF, (__VA_ARGS__))
 
 #ifdef DEBUG_TMP_LOGGING
Index: trunk/src/recompiler/VBoxREMWrapper.cpp
===================================================================
--- trunk/src/recompiler/VBoxREMWrapper.cpp	(revision 55979)
+++ trunk/src/recompiler/VBoxREMWrapper.cpp	(revision 55980)
@@ -1083,4 +1083,9 @@
     { REMPARMDESC_FLAGS_INT,        sizeof(const char *),       NULL },
     { REMPARMDESC_FLAGS_VALIST,     0,                          NULL }
+};
+static const REMPARMDESC g_aArgsRTLogGetDefaultInstanceEx[] =
+{
+    { REMPARMDESC_FLAGS_INT,        sizeof(uint32_t),           NULL },
+    { REMPARMDESC_FLAGS_INT,        sizeof(uint32_t),           NULL }
 };
 static const REMPARMDESC g_aArgsRTLogFlags[] =
@@ -1337,5 +1342,7 @@
     { "RTAssertShouldPanic",                    (void *)(uintptr_t)&RTAssertShouldPanic,            NULL,                                       0,                                                     REMFNDESC_FLAGS_RET_INT,    sizeof(bool),       NULL },
     { "RTLogDefaultInstance",                   (void *)(uintptr_t)&RTLogDefaultInstance,           NULL,                                       0,                                                     REMFNDESC_FLAGS_RET_INT,    sizeof(PRTLOGGER),  NULL },
-    { "RTLogRelDefaultInstance",                (void *)(uintptr_t)&RTLogRelDefaultInstance,        NULL,                                       0,                                                     REMFNDESC_FLAGS_RET_INT,    sizeof(PRTLOGGER),  NULL },
+    { "RTLogRelGetDefaultInstance",             (void *)(uintptr_t)&RTLogRelGetDefaultInstance,     NULL,                                       0,                                                     REMFNDESC_FLAGS_RET_INT,    sizeof(PRTLOGGER),  NULL },
+    { "RTLogDefaultInstanceEx",                 (void *)(uintptr_t)&RTLogDefaultInstance,           &g_aArgsRTLogGetDefaultInstanceEx[0],       RT_ELEMENTS(g_aArgsRTLogGetDefaultInstanceEx),         REMFNDESC_FLAGS_RET_INT,    sizeof(PRTLOGGER),  NULL },
+    { "RTLogRelGetDefaultInstanceEx",           (void *)(uintptr_t)&RTLogRelGetDefaultInstance,     &g_aArgsRTLogGetDefaultInstanceEx[0],       RT_ELEMENTS(g_aArgsRTLogGetDefaultInstanceEx),         REMFNDESC_FLAGS_RET_INT,    sizeof(PRTLOGGER),  NULL },
     { "RTLogFlags",                             (void *)(uintptr_t)&RTLogFlags,                     &g_aArgsRTLogFlags[0],                      RT_ELEMENTS(g_aArgsRTLogFlags),                        REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
     { "RTLogFlush",                             (void *)(uintptr_t)&RTLogFlush,                     &g_aArgsRTLogFlush[0],                      RT_ELEMENTS(g_aArgsRTLogFlush),                        REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
Index: trunk/src/recompiler/VBoxRecompiler.c
===================================================================
--- trunk/src/recompiler/VBoxRecompiler.c	(revision 55979)
+++ trunk/src/recompiler/VBoxRecompiler.c	(revision 55980)
@@ -1972,5 +1972,5 @@
 {
     LogFlow(("remR3TimersRun:\n"));
-    LogIt(LOG_INSTANCE, RTLOGGRPFLAGS_LEVEL_5, LOG_GROUP_TM, ("remR3TimersRun\n"));
+    LogIt(RTLOGGRPFLAGS_LEVEL_5, LOG_GROUP_TM, ("remR3TimersRun\n"));
     remR3ProfileStop(STATS_QEMU_RUN_EMULATED_CODE);
     remR3ProfileStart(STATS_QEMU_RUN_TIMERS);
@@ -4298,13 +4298,13 @@
         if (pVM->rem.s.Env.pVCpu == pVCpuDst)
         {
-            LogIt(LOG_INSTANCE, RTLOGGRPFLAGS_LEVEL_5, LOG_GROUP_TM, ("REMR3NotifyTimerPending: setting\n"));
+            LogIt(RTLOGGRPFLAGS_LEVEL_5, LOG_GROUP_TM, ("REMR3NotifyTimerPending: setting\n"));
             ASMAtomicOrS32((int32_t volatile *)&pVM->rem.s.Env.interrupt_request,
                            CPU_INTERRUPT_EXTERNAL_TIMER);
         }
         else
-            LogIt(LOG_INSTANCE, RTLOGGRPFLAGS_LEVEL_5, LOG_GROUP_TM, ("REMR3NotifyTimerPending: pVCpu:%p != pVCpuDst:%p\n", pVM->rem.s.Env.pVCpu, pVCpuDst));
+            LogIt(RTLOGGRPFLAGS_LEVEL_5, LOG_GROUP_TM, ("REMR3NotifyTimerPending: pVCpu:%p != pVCpuDst:%p\n", pVM->rem.s.Env.pVCpu, pVCpuDst));
     }
     else
-        LogIt(LOG_INSTANCE, RTLOGGRPFLAGS_LEVEL_5, LOG_GROUP_TM, ("REMR3NotifyTimerPending: !fInREM; cpu state=%d\n", VMCPU_GET_STATE(pVCpuDst)));
+        LogIt(RTLOGGRPFLAGS_LEVEL_5, LOG_GROUP_TM, ("REMR3NotifyTimerPending: !fInREM; cpu state=%d\n", VMCPU_GET_STATE(pVCpuDst)));
 #endif
 }
Index: trunk/src/recompiler/osdep.h
===================================================================
--- trunk/src/recompiler/osdep.h	(revision 55979)
+++ trunk/src/recompiler/osdep.h	(revision 55980)
@@ -30,8 +30,8 @@
 /* Misc wrappers */
 #define fflush(file)            RTLogFlush(NULL)
-#define printf(...)             LogIt(LOG_INSTANCE, 0, LOG_GROUP_REM_PRINTF, (__VA_ARGS__))
+#define printf(...)             LogIt(0, LOG_GROUP_REM_PRINTF, (__VA_ARGS__))
 /* If DEBUG_TMP_LOGGING - goes to QEMU log file */
 #ifndef DEBUG_TMP_LOGGING
-# define fprintf(logfile, ...)  LogIt(LOG_INSTANCE, 0, LOG_GROUP_REM_PRINTF, (__VA_ARGS__))
+# define fprintf(logfile, ...)  LogIt(0, LOG_GROUP_REM_PRINTF, (__VA_ARGS__))
 #endif
 
Index: trunk/src/recompiler/qemu-log.h
===================================================================
--- trunk/src/recompiler/qemu-log.h	(revision 55979)
+++ trunk/src/recompiler/qemu-log.h	(revision 55980)
@@ -50,5 +50,5 @@
 # define qemu_log_vprintf(fmt, va) do { \
         if (LogIsEnabled()) \
-            RTLogLoggerExV(LOG_INSTANCE, RTLOGGRPFLAGS_LEVEL_1, LOG_GROUP, fmt, va); \
+            RTLogLoggerExV(RTLOGGRPFLAGS_LEVEL_1, LOG_GROUP, fmt, va); \
     } while (0)
 #endif
@@ -100,5 +100,5 @@
 #define qemu_log_flush() fflush(logfile)
 #else
-# define qemu_log_flush()           RTLogFlush(LOG_INSTANCE)
+# define qemu_log_flush()           RTLogFlush(NULL)
 #endif
 
