From: VMware, Inc <>
Date: Tue, 24 Aug 2010 17:42:21 +0000 (-0700)
Subject: Changes in shared code that don't affect open-vm-tools functionality.
X-Git-Tag: 2010.08.24-292196~86
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=19c481a733ad7c7cb005157eea8844dfe84722ad;p=thirdparty%2Fopen-vm-tools.git

Changes in shared code that don't affect open-vm-tools functionality.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/lib/include/log.h b/open-vm-tools/lib/include/log.h
index c75a7d736..c78d043a5 100644
--- a/open-vm-tools/lib/include/log.h
+++ b/open-vm-tools/lib/include/log.h
@@ -43,7 +43,12 @@ typedef struct
    unsigned int throttleBytesPerSec; // BPS for throttle
    Bool switchFile;                  // Switch the initial log file
    unsigned int rotateSize;          // Size at which log should be rotated
-   Bool useSystemLogger;             // Use the system logger too
+
+#define LOG_NO_SYSTEM_LOGGER        0
+#define LOG_SYSTEM_LOGGER_ADJUNCT   1
+#define LOG_SYSTEM_LOGGER_ONLY      2
+
+   uint32 useSystemLogger;           // System logger options
    char *systemLoggerIDString;       // identifier for system logger
 } LogInitParams;
 
@@ -52,6 +57,15 @@ void Log_GetInitDefaults(const char *fileName,
                          const char *suffix,
                          LogInitParams *params);
 
+#if defined(VMX86_VMX)
+/*
+ * If this function shows up outside of the VMX, the originator of the
+ * use will be hunted down, bound and drawn and quartered!
+ */
+
+Bool Log_EarlyInitVMX(void);
+#endif
+
 Bool Log_Init(const char *fileName,
               const char *config,
               const char *suffix);