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

Signed-off-by: Dmitry Torokhov <dtor@vmware.com>

diff --git a/open-vm-tools/lib/include/vm_basic_math.h b/open-vm-tools/lib/include/vm_basic_math.h
index d5b4bbce581c0bfb7dbb4eff78b06ae9ce4ffaf2..164921da313b02bb5543c4431f4887a524ef8c1d 100644 (file)
--- a/open-vm-tools/lib/include/vm_basic_math.h
+++ b/open-vm-tools/lib/include/vm_basic_math.h
@@ -63,4 +63,11 @@ ExponentialAvg(uint32 avg, uint32 value, uint32 gainNumer, uint32 gainDenom)
    return (term1 + term2) / gainDenom;
 }
 
+static INLINE Bool
+IsPowerOfTwo(uint32 x)
+{
+   /* Does not check for zero. Callers depend on this. */
+   return !(x & (x - 1));
+}
+
 #endif // ifndef _VM_BASIC_MATH_H_

diff --git a/open-vm-tools/lib/include/vm_version.h b/open-vm-tools/lib/include/vm_version.h
index e1bc25ec8257f1adb37297309ab277aeba7c99b6..5a78f3ca287ba2abc024e1afc4069609d2cc8dd2 100644 (file)
--- a/open-vm-tools/lib/include/vm_version.h
+++ b/open-vm-tools/lib/include/vm_version.h
@@ -238,7 +238,7 @@
 #define VLICENSE_VERSION "1.1.5"
 #define DDK_VERSION "e.x.p"
 #define VIPERL_VERSION "1.1.0"
-#define RCLI_VERSION "5.1.0"
+#define RCLI_VERSION "6.0.0"
 #define VDM_VERSION "e.x.p"
 #define VMSAFE_VERSION        "1.2.0"
 #define VMSAFE_FILE_VERSION    1,2,0,PRODUCT_BUILD_NUMBER_NUMERIC

diff --git a/open-vm-tools/lib/include/vthreadBase.h b/open-vm-tools/lib/include/vthreadBase.h
index 4770c7e9ed3c29bd6b33dfe27cfea082893818b6..954a948ceb7bb21c2a0d8b8c50065a1e2e287e47 100644 (file)
--- a/open-vm-tools/lib/include/vthreadBase.h
+++ b/open-vm-tools/lib/include/vthreadBase.h
@@ -93,10 +93,11 @@ VThread_CurName(void)
 
 #else
 
-#define VTHREAD_VMX_ID         0
-#define VTHREAD_MKS_ID         1
-#define VTHREAD_OTHER_ID       2
-#define VTHREAD_ALLOCSTART_ID  3
+#define VTHREAD_VMX_ID          0
+#define VTHREAD_SVGA_ID         1
+#define VTHREAD_MKS_ID          2
+#define VTHREAD_OTHER_ID        3
+#define VTHREAD_ALLOCSTART_ID   4
 
 #define VTHREADBASE_MAX_NAME    32  /* Arbitrary */