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 23e12b6bc46e077caf926907bb1ddbc174d362dd..e0d2e952c5abe81b3a5427426c713173fcb9cfee 100644 (file)
--- 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 176f32ff60e34afe620145413dbfacdac99c1ac7..aabdbef1c43d094a19274b116ba3f90301da23b3 100644 (file)
--- 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 ea6edc5ec1754f4abf1f17360e70337f46ffe934..ca8e690230379edffed5b3b7a1131005c9457e09 100644 (file)
--- 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;
    }