From: John Wolfe <jwolfe@vmware.com>
Date: Tue, 22 Sep 2020 21:54:06 +0000 (-0700)
Subject: Changes to common header files not applicable to open-vm-tools.
X-Git-Tag: stable-11.3.0~324
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7b7ff477ca923833deebed645fec6b1612d4c5a;p=thirdparty%2Fopen-vm-tools.git

Changes to common header files not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/include/log.h b/open-vm-tools/lib/include/log.h
index b5c76b0ff..352d76d21 100644
--- a/open-vm-tools/lib/include/log.h
+++ b/open-vm-tools/lib/include/log.h
@@ -547,4 +547,31 @@ void Log_LoadModuleFilters(struct CfgInterface *cfgIf);
    #define LOG_ROUTING_BITS(level) (level)
 #endif
 
+#ifndef VMW_LOG_HELPER_FUNCTIONS
+#define VMW_LOG_HELPER_FUNCTIONS
 
+/*
+ * Helper functions for module level filtering.
+ */
+
+static INLINE void
+LogV_Module(int32 level,
+            const char *fmt,
+            va_list args)
+{
+   LogV(LOG_ROUTING_BITS(level), fmt, args);
+}
+
+static INLINE void PRINTF_DECL(2, 3)
+Log_LevelModule(int32 level,
+                const char *fmt,
+                ...)
+{
+   va_list ap;
+
+   va_start(ap, fmt);
+   LogV_Module(level, fmt, ap);
+   va_end(ap);
+}
+
+#endif
diff --git a/open-vm-tools/lib/include/loglevel_userVars.h b/open-vm-tools/lib/include/loglevel_userVars.h
index 2150c49ae..c993ba322 100644
--- a/open-vm-tools/lib/include/loglevel_userVars.h
+++ b/open-vm-tools/lib/include/loglevel_userVars.h
@@ -94,6 +94,7 @@
    LOGLEVEL_VAR(extcfgdevice), \
    LOGLEVEL_VAR(fakeDma), \
    LOGLEVEL_VAR(filtlib), \
+   LOGLEVEL_VAR(FiltLibTestLog), \
    LOGLEVEL_VAR(flashram), \
    LOGLEVEL_VAR(floppy), \
    LOGLEVEL_VAR(fsresx), \
@@ -120,6 +121,7 @@
    LOGLEVEL_VAR(hostctl), \
    LOGLEVEL_VAR(hostonly), \
    LOGLEVEL_VAR(hpet), \
+   LOGLEVEL_VAR(Heap), \
    LOGLEVEL_VAR(http), \
    LOGLEVEL_VAR(ich7m), \
    LOGLEVEL_VAR(inputdevtap), \