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/mutexRankLib.h b/open-vm-tools/lib/include/mutexRankLib.h
index 490b79832b7187f4bb1a593a10be6d98b52c0126..44f6875e2c3bc4313509f7baff3c0ea90e58d08c 100644 (file)
--- a/open-vm-tools/lib/include/mutexRankLib.h
+++ b/open-vm-tools/lib/include/mutexRankLib.h
@@ -128,6 +128,7 @@
 #define RANK_usbEnumGlobalLock       (RANK_libLockBase + 0x6506)
 #define RANK_usbArbLibAsockLock      (RANK_libLockBase + 0x6507)
 #define RANK_usbEnumBackendLock      (RANK_libLockBase + 0x6508)
+#define RANK_sensorQueueLock         (RANK_libLockBase + 0x6509)
 
 /*
  * misc locks
@@ -138,15 +139,15 @@
  * At least:
  *    impersonate < pollDefault
  *    keyLocator < preference (for checking AESNI)
- *    keyLocator < ssl (bug 743010)
+ *    keyLocator < sslState (bug 743010)
  *    configDb < keyLocator (for unlocking dictionaries)
  *    battery/button < preference
  *    workerLib < something for sure under VThread_Create
  *    licenseCheck < preference
+ *    sslState < getSafeTmpDir
  */
 
 #define RANK_vigorTransportListLock  (RANK_libLockBase + 0x7010)
-#define RANK_getSafeTmpDirLock       (RANK_libLockBase + 0x7020)
 #define RANK_batteryLock             (RANK_libLockBase + 0x7030)
 #define RANK_buttonLock              (RANK_libLockBase + 0x7040)
 #define RANK_impersonateLock         (RANK_libLockBase + 0x7045)
@@ -155,6 +156,7 @@
 #define RANK_configDbLock            (RANK_libLockBase + 0x7070)
 #define RANK_keyLocatorLock          (RANK_libLockBase + 0x7080)
 #define RANK_sslStateLock            (RANK_libLockBase + 0x7085)
+#define RANK_getSafeTmpDirLock       (RANK_libLockBase + 0x7086)
 #define RANK_licenseCheckLock        (RANK_libLockBase + 0x7090)
 #define RANK_preferenceLock          (RANK_libLockBase + 0x7100)
 

diff --git a/open-vm-tools/lib/include/vm_basic_asm.h b/open-vm-tools/lib/include/vm_basic_asm.h
index c65ddbd979e99d48448e08d5a453773d5f936ecc..70c5a23cc1e96946bbd70a716793a76c54480dbb 100644 (file)
--- a/open-vm-tools/lib/include/vm_basic_asm.h
+++ b/open-vm-tools/lib/include/vm_basic_asm.h
@@ -611,16 +611,19 @@ static INLINE void *
 uint16set(void *dst, uint16 val, size_t count)
 {
 #ifdef __arm__
-   if (count <= 0)
-       return dst;
-   __asm__ __volatile__ ("\t"
-                         "1: strh %0, [%1]     \n\t"
-                         "   subs %2, %2, #1   \n\t"
-                         "   bne 1b                "
-                         :: "r" (val), "r" (dst), "r" (count)
-                         : "memory"
-        );
-   return dst;
+   void *tmpDst = dst;
+
+   __asm__ __volatile__ (
+      "cmp     %1, #0\n\t"
+      "beq     2f\n"
+      "1:\n\t"
+      "strh    %2, [%0], #2\n\t"
+      "subs    %1, %1, #1\n\t"
+      "bne     1b\n"
+      "2:"
+      : "+r" (tmpDst), "+r" (count)
+      : "r" (val)
+      : "memory");
 #else
    size_t dummy0;
    void *dummy1;
@@ -632,25 +635,27 @@ uint16set(void *dst, uint16 val, size_t count)
                         : "0" (count), "1" (dst), "a" (val)
                         : "memory", "cc"
       );
-
-   return dst;
 #endif
+   return dst;
 }
 
 static INLINE void *
 uint32set(void *dst, uint32 val, size_t count)
 {
 #ifdef __arm__
-   if (count <= 0)
-       return dst;
-   __asm__ __volatile__ ("\t"
-                         "1: str %0, [%1]     \n\t"
-                         "   subs %2, %2, #1  \n\t"
-                         "   bne 1b               "
-                         :: "r" (val), "r" (dst), "r" (count)
-                         : "memory"
-        );
-   return dst;
+   void *tmpDst = dst;
+
+   __asm__ __volatile__ (
+      "cmp     %1, #0\n\t"
+      "beq     2f\n"
+      "1:\n\t"
+      "str     %2, [%0], #4\n\t"
+      "subs    %1, %1, #1\n\t"
+      "bne     1b\n"
+      "2:"
+      : "+r" (tmpDst), "+r" (count)
+      : "r" (val)
+      : "memory");
 #else
    size_t dummy0;
    void *dummy1;
@@ -662,9 +667,8 @@ uint32set(void *dst, uint32 val, size_t count)
                         : "0" (count), "1" (dst), "a" (val)
                         : "memory", "cc"
       );
-
-   return dst;
 #endif
+   return dst;
 }
 
 #else /* unknown system: rely on C to write */

diff --git a/open-vm-tools/lib/include/vm_product_versions.h b/open-vm-tools/lib/include/vm_product_versions.h
index 0c6affdc7846324cf882c517261a58af0efceec5..c30c0ebe1f1a92b84314e78ef123d5c170e74a73 100644 (file)
--- a/open-vm-tools/lib/include/vm_product_versions.h
+++ b/open-vm-tools/lib/include/vm_product_versions.h
@@ -434,7 +434,7 @@
 #define PRODUCT_VERSION_WORKSTATION_7 PRODUCT_WORKSTATION_BRIEF_NAME " 7.x"
 #define PRODUCT_VERSION_WORKSTATION_80 PRODUCT_WORKSTATION_BRIEF_NAME " 8.0"
 #define PRODUCT_VERSION_WORKSTATION_90 PRODUCT_WORKSTATION_BRIEF_NAME " 9.0"
-#define PRODUCT_VERSION_WORKSTATION_2013 PRODUCT_WORKSTATION_BRIEF_NAME " Bendezium"
+#define PRODUCT_VERSION_WORKSTATION_100 PRODUCT_WORKSTATION_BRIEF_NAME " 10.0"
 #define PRODUCT_VERSION_WORKSTATION_ENTERPRISE_1 "ACE 1.x"
 #define PRODUCT_VERSION_WORKSTATION_ENTERPRISE_2 "ACE 2.0"
 #define PRODUCT_VERSION_WORKSTATION_ENTERPRISE_25 "ACE 2.5"
@@ -444,5 +444,5 @@
 #define PRODUCT_VERSION_MAC_DESKTOP_3 PRODUCT_MAC_DESKTOP_BRIEF_NAME " 3.x"
 #define PRODUCT_VERSION_MAC_DESKTOP_40 PRODUCT_MAC_DESKTOP_BRIEF_NAME " 4.0"
 #define PRODUCT_VERSION_MAC_DESKTOP_50 PRODUCT_MAC_DESKTOP_BRIEF_NAME " 5.0"
-#define PRODUCT_VERSION_MAC_DESKTOP_2013 PRODUCT_MAC_DESKTOP_BRIEF_NAME " Boo Berry"
+#define PRODUCT_VERSION_MAC_DESKTOP_60 PRODUCT_MAC_DESKTOP_BRIEF_NAME " 6.0"
 #endif