From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 15 Sep 2017 18:23:39 +0000 (-0700)
Subject: Common source file changes; not directly applicable to open-vm-tools.
X-Git-Tag: stable-10.2.0~213
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db1c14fb0e23d0d400567ac1a90b5c4fb08b6665;p=thirdparty%2Fopen-vm-tools.git

Common source file changes; not directly applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/include/loglevel_user.h b/open-vm-tools/lib/include/loglevel_user.h
index 23e12b6bc..e0d2e952c 100644
--- a/open-vm-tools/lib/include/loglevel_user.h
+++ b/open-vm-tools/lib/include/loglevel_user.h
@@ -303,6 +303,8 @@
    LOGLEVEL_VAR(filtlib), \
    LOGLEVEL_VAR(epd), \
    LOGLEVEL_VAR(ddecomd), \
+   LOGLEVEL_VAR(vdfs), \
+   LOGLEVEL_VAR(vdfs_9p), \
    LOGLEVEL_VAR(hostctl), \
    LOGLEVEL_VAR(pmemobj), \
    LOGLEVEL_VAR(secureBoot), \
diff --git a/open-vm-tools/lib/include/vm_product_versions.h b/open-vm-tools/lib/include/vm_product_versions.h
index 176f32ff6..aabdbef1c 100644
--- a/open-vm-tools/lib/include/vm_product_versions.h
+++ b/open-vm-tools/lib/include/vm_product_versions.h
@@ -526,4 +526,17 @@
 #define PRODUCT_VERSION_MAC_DESKTOP_70 PRODUCT_MAC_DESKTOP_BRIEF_NAME " 7.x"
 #define PRODUCT_VERSION_MAC_DESKTOP_80 PRODUCT_MAC_DESKTOP_BRIEF_NAME " 8.x"
 #define PRODUCT_VERSION_MAC_DESKTOP_90 PRODUCT_MAC_DESKTOP_BRIEF_NAME " 2017"
+
+/*
+ * VDFS Versions
+ */
+#define VDFS_VERSION_MAJOR "0"
+#define VDFS_VERSION_MINOR "1"
+#define VDFS_VERSION_MAINT "0"
+#define VDFS_VERSION VDFS_VERSION_MAJOR "." VDFS_VERSION_MINOR "." \
+                    VDFS_VERSION_MAINT
+#define VDFS_RELEASE_UPDATE "0" /* 0 = Pre-release/GA, 1 = Update 1 */
+#define VDFS_RELEASE_PATCH "0"  /* 0 = experimental */
+#define VDFS_RELEASE VDFS_RELEASE_UPDATE "." VDFS_RELEASE_PATCH
+
 #endif
diff --git a/open-vm-tools/lib/misc/vthreadBase.c b/open-vm-tools/lib/misc/vthreadBase.c
index ea6edc5ec..ca8e69023 100644
--- a/open-vm-tools/lib/misc/vthreadBase.c
+++ b/open-vm-tools/lib/misc/vthreadBase.c
@@ -774,7 +774,11 @@ VThreadBase_CurName(void)
        * support for the platform.
        */
 
+#ifdef HAVE_TLS
+      static __thread char name[48];
+#else
       static char name[48];
+#endif
       VThreadBaseSafeName(name, sizeof name);
       return name;
    }