From: VMware, Inc <>
Date: Wed, 26 Dec 2012 21:16:15 +0000 (-0800)
Subject: Changes in shared code that don't affect open-vm-tools functionality.
X-Git-Tag: 2012.12.26-958366~41
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cfd52e4f067542831db812b35695915b50ffd8ff;p=thirdparty%2Fopen-vm-tools.git

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 d5b4bbce5..164921da3 100644
--- 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 e1bc25ec8..5a78f3ca2 100644
--- 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 4770c7e9e..954a948ce 100644
--- 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 */