From: John Wolfe <jwolfe@vmware.com>
Date: Tue, 27 Oct 2020 00:29:55 +0000 (-0700)
Subject: Common header file change not directly applicable to open-vm-tools.
X-Git-Tag: stable-11.3.0~274
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4c1458c67a291c2a2d69d2a7f829daac00face1;p=thirdparty%2Fopen-vm-tools.git

Common header file change not directly applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/include/log.h b/open-vm-tools/lib/include/log.h
index fc7cab802..cdf1476af 100644
--- a/open-vm-tools/lib/include/log.h
+++ b/open-vm-tools/lib/include/log.h
@@ -124,6 +124,14 @@ typedef enum {
    #define LOG_FILTER_DEFAULT_LEVEL VMW_LOG_INFO
 #endif
 
+#ifdef VMX86_SERVER
+/* WORLD_MAX_OPID_STRING_SIZE */
+#define LOG_MAX_OPID_LENGTH (128 + 1)
+#else
+/* We do not expect long opIDs in non-ESX environments. 32 should be enough. */
+#define LOG_MAX_OPID_LENGTH (32 + 1)
+#endif
+
 /*
  * The "routing" parameter contains the level in the low order bits; the
  * higher order bits specify the module where the log call came from.
@@ -644,5 +652,3 @@ Log_OffsetUtc(void);
 
 #define Log_IsEnabledModule(level) \
    Log_IsEnabled(LOG_ROUTING_BITS(level))
-
-