Changeset 90859 in vbox

Timestamp:

Aug 24, 2021 9:36:42 PM (3 years ago)

Author:

vboxsync

Message:

VMMR0,SUPDrv: Need to override RTLogDefaultInstanceEx rather than RTLogGetDefaultInstanceEx for debug logging. bugref:10086

Location:

trunk

Files:

• include/VBox/sup.h (modified) (1 diff)
• src/VBox/HostDrivers/Support/SUPDrv.cpp (modified) (3 diffs)
• src/VBox/HostDrivers/Support/SUPDrvIOC.h (modified) (1 diff)
• src/VBox/HostDrivers/Support/SUPLib.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (2 diffs)

trunk/include/VBox/sup.h

@@ -2227 +2227 @@
 SUPR0DECL(uint32_t) SUPR0GetKernelFeatures(void);
 
+/** @copydoc RTLogDefaultInstanceEx
+ * @remarks To allow overriding RTLogDefaultInstanceEx locally. */
+SUPR0DECL(struct RTLOGGER *) SUPR0DefaultLogInstanceEx(uint32_t fFlagsAndGroup);
 /** @copydoc RTLogGetDefaultInstanceEx
  * @remarks To allow overriding RTLogGetDefaultInstanceEx locally. */

trunk/src/VBox/HostDrivers/Support/SUPDrv.cpp

@@ -290 +290 @@
     { "RTLogDefaultInstance",                   (void *)(uintptr_t)RTLogDefaultInstance },
     { "RTLogDefaultInstanceEx",                 (void *)(uintptr_t)RTLogDefaultInstanceEx },
+    { "SUPR0DefaultLogInstanceEx",              (void *)(uintptr_t)SUPR0DefaultLogInstanceEx },
     { "RTLogGetDefaultInstance",                (void *)(uintptr_t)RTLogGetDefaultInstance },
     { "RTLogGetDefaultInstanceEx",              (void *)(uintptr_t)RTLogGetDefaultInstanceEx },
@@ -299 +300 @@
     { "SUPR0GetDefaultLogRelInstanceEx",        (void *)(uintptr_t)SUPR0GetDefaultLogRelInstanceEx },
     { "RTLogSetDefaultInstanceThread",          (void *)(uintptr_t)RTLogSetDefaultInstanceThread },
+    { "RTLogSetFlushCallback",                  (void *)(uintptr_t)RTLogSetFlushCallback },
     { "RTLogSetR0ThreadNameF",                  (void *)(uintptr_t)RTLogSetR0ThreadNameF },
     { "RTMemAllocExTag",                        (void *)(uintptr_t)RTMemAllocExTag },
@@ -3259 +3261 @@
 
 
+/** @copydoc RTLogDefaultInstanceEx
+ * @remarks To allow overriding RTLogDefaultInstanceEx locally. */
+SUPR0DECL(struct RTLOGGER *) SUPR0DefaultLogInstanceEx(uint32_t fFlagsAndGroup)
+{
+    return RTLogDefaultInstanceEx(fFlagsAndGroup);
+}
+SUPR0_EXPORT_SYMBOL(SUPR0DefaultLogInstanceEx);
+
+
 /** @copydoc RTLogGetDefaultInstanceEx
  * @remarks To allow overriding RTLogGetDefaultInstanceEx locally. */

trunk/src/VBox/HostDrivers/Support/SUPDrvIOC.h

@@ -223 +223 @@
  *          - Remove pvVMMR0 from SUPLDRLOAD.
  */
-#define SUPDRV_IOC_VERSION                              0x00300004
+#define SUPDRV_IOC_VERSION                              0x00300005
 
 /** SUP_IOCTL_COOKIE. */

trunk/src/VBox/HostDrivers/Support/SUPLib.cpp

@@ -279 +279 @@
         CookieReq.u.In.u32ReqVersion = SUPDRV_IOC_VERSION;
         const uint32_t uMinVersion = (SUPDRV_IOC_VERSION & 0xffff0000) == 0x00300000
-                                   ? 0x00300004
+                                   ? 0x00300005
                                    : SUPDRV_IOC_VERSION & 0xffff0000;
         CookieReq.u.In.u32MinVersion = uMinVersion;

trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

@@ -3052 +3052 @@
 
 /*
- * Override RTLogGetDefaultInstanceEx so we can do logging from EMTs in ring-0.
- */
-DECLEXPORT(PRTLOGGER) RTLogGetDefaultInstanceEx(uint32_t fFlagsAndGroup)
+ * Override RTLogDefaultInstanceEx so we can do logging from EMTs in ring-0.
+ */
+DECLEXPORT(PRTLOGGER) RTLogDefaultInstanceEx(uint32_t fFlagsAndGroup)
 {
 #ifdef LOG_ENABLED
@@ -3073 +3073 @@
     }
 #endif
-    return SUPR0GetDefaultLogInstanceEx(fFlagsAndGroup);
+    return SUPR0DefaultLogInstanceEx(fFlagsAndGroup);
 }