From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 13 Jul 2018 22:03:54 +0000 (-0700)
Subject: sync with stable-10.3.x branch
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a0205478e242bd672356d4eab6272d3b901fe6e;p=thirdparty%2Fopen-vm-tools.git

sync with stable-10.3.x branch
---

diff --git a/README.md b/README.md
index 7829a7902..bbe5386bc 100644
--- a/README.md
+++ b/README.md
@@ -113,7 +113,6 @@ You can get involved today in several different ways:
   * Oracle Linux 7 and later 
   * Fedora 19 and later releases
   * openSUSE 11.x and later releases
-  * FreeBSD 10.x and later releases
  
 ## Will external developers be allowed to become committers to the project?
 Yes. Initially, VMware engineers will be the only committers. As we roll out our development infrastructure, we will be looking to add external committers to the project as well.
diff --git a/open-vm-tools/LICENSE b/open-vm-tools/LICENSE
index 972d3ca0d..2fa926d46 100644
--- a/open-vm-tools/LICENSE
+++ b/open-vm-tools/LICENSE
@@ -243,7 +243,7 @@ SECTION 1: BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES
 ===================================================
 
 
---------------- SECTION 1: BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES ----------
+--------------- SECTION 1:  BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES ----------
 
 BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES are applicable to the following component(s).
 
diff --git a/open-vm-tools/common-agent/Cpp/ManagementAgent/Subsystems/MaIntegration/src/CMonitorListener.h b/open-vm-tools/common-agent/Cpp/ManagementAgent/Subsystems/MaIntegration/src/CMonitorListener.h
index eef3fede6..398e32415 100644
--- a/open-vm-tools/common-agent/Cpp/ManagementAgent/Subsystems/MaIntegration/src/CMonitorListener.h
+++ b/open-vm-tools/common-agent/Cpp/ManagementAgent/Subsystems/MaIntegration/src/CMonitorListener.h
@@ -23,9 +23,7 @@ public:
 
    bool preConfigureListener();
 
-   bool isListenerPreConfigured() {
-      return _listenerPreConfigured;
-   }
+   bool isListenerPreConfigured();
 
    bool followTunnel(std::string& listenerStartupType);
 
diff --git a/open-vm-tools/lib/include/guestStats.h b/open-vm-tools/lib/include/guestStats.h
index 75f8c1ce0..4f5fa6d88 100644
--- a/open-vm-tools/lib/include/guestStats.h
+++ b/open-vm-tools/lib/include/guestStats.h
@@ -52,7 +52,9 @@
 #define GUESTMEMINFO_V5 5
 
 /*
- * Flags for legacy GuestMemInfo
+ * Flags for GuestMemInfoLegacy
+ *
+ * !!! DON'T ADD/CHANGE FLAGS !!!
  *
  * This is deprecated. All new values are returned via a GuestStat list.
  */
@@ -70,16 +72,19 @@
 #define MEMINFO_HUGEPAGESTOTAL   (1 << 10)
 #define MEMINFO_DEPRECATED10     (1 << 11)
 #define MEMINFO_DEPRECATED11     (1 << 12)
+#define MEMINFO_MEMNEEDED        (1 << 13)
 
 /*
  * Legacy GuestMemInfo structure.
  *
+ * !!! DON'T CHANGE IT !!!
+ *
  * It should stay the same to ensure binary compatibility.
  */
 
 typedef
 #include "vmware_pack_begin.h"
-struct GuestMemInfo {
+struct GuestMemInfoLegacy {
    uint32 version;            ///< MemInfo structure version.
    uint32 flags;              ///< Indicates which stats are valid.
    uint64 memTotal;           ///< Total physical memory in Kb.
@@ -88,7 +93,7 @@ struct GuestMemInfo {
    uint64 deprecated2[2];     ///< No longer used.
 }
 #include "vmware_pack_end.h"
-GuestMemInfo;
+GuestMemInfoLegacy;
 
 /*
  * A stat begins with a header. The header has a mask which says what data
diff --git a/open-vm-tools/services/plugins/guestInfo/guestInfoInt.h b/open-vm-tools/services/plugins/guestInfo/guestInfoInt.h
index b586469b0..70f4bc1c0 100644
--- a/open-vm-tools/services/plugins/guestInfo/guestInfoInt.h
+++ b/open-vm-tools/services/plugins/guestInfo/guestInfoInt.h
@@ -32,25 +32,6 @@
 #include "nicInfo.h"
 #include "dynbuf.h"
 
-/*
- * Internal stat IDs used by intermediate stats collected
- * for computing derived stats.
- *
- * NOTE: These IDs should not be published to the host as
- * these may change.
- */
-#define GuestStatID_SwapSpaceUsed         ((GuestStatToolsID) (GuestStatID_Max + 0))
-#define GuestStatID_SwapFilesCurrent      ((GuestStatToolsID) (GuestStatID_Max + 1))
-#define GuestStatID_SwapFilesMax          ((GuestStatToolsID) (GuestStatID_Max + 2))
-#define GuestStatID_Linux_LowWaterMark    ((GuestStatToolsID) (GuestStatID_Max + 3))
-#define GuestStatID_Linux_MemAvailable    ((GuestStatToolsID) (GuestStatID_Max + 4))
-#define GuestStatID_Linux_MemBuffers      ((GuestStatToolsID) (GuestStatID_Max + 5))
-#define GuestStatID_Linux_MemCached       ((GuestStatToolsID) (GuestStatID_Max + 6))
-#define GuestStatID_Linux_MemInactiveFile ((GuestStatToolsID) (GuestStatID_Max + 7))
-#define GuestStatID_Linux_MemSlabReclaim  ((GuestStatToolsID) (GuestStatID_Max + 8))
-#define GuestStatID_Linux_MemTotal        ((GuestStatToolsID) (GuestStatID_Max + 9))
-#define GuestStatID_Linux_Internal_Max    ((GuestStatToolsID) (GuestStatID_Max + 10))
-
 extern int guestInfoPollInterval;
 
 Bool
diff --git a/open-vm-tools/services/plugins/guestInfo/perfMonLinux.c b/open-vm-tools/services/plugins/guestInfo/perfMonLinux.c
index 2e78d892b..b1323b7db 100644
--- a/open-vm-tools/services/plugins/guestInfo/perfMonLinux.c
+++ b/open-vm-tools/services/plugins/guestInfo/perfMonLinux.c
@@ -894,7 +894,7 @@ GuestInfoCollect(GuestInfoCollector *collector)  // IN/OUT:
 
 static void
 GuestInfoLegacy(GuestInfoCollector *current,  // IN: current collection
-                GuestMemInfo *legacy)         // OUT: data filled out
+                GuestMemInfoLegacy *legacy)   // OUT: data filled out
 {
    GuestInfoStat *stat;
 
@@ -1288,7 +1288,7 @@ GuestInfoEncodeStats(GuestInfoCollector *current,   // IN: current collection
                      DynBuf *statBuf)               // IN/OUT: stats data
 {
    uint32 i;
-   GuestMemInfo legacy;
+   GuestMemInfoLegacy legacy;
    Bool emitNameSpace = TRUE;
 
    /* Provide legacy data for backwards compatibility */