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/uuid.h b/open-vm-tools/lib/include/uuid.h
index 7ab8abf13ad179d5a768791feaa532f0266851cc..4b40026560197792379ba8aa356527b4dbae1a81 100644 (file)
--- a/open-vm-tools/lib/include/uuid.h
+++ b/open-vm-tools/lib/include/uuid.h
@@ -25,9 +25,9 @@
 #ifndef _UUID_H_
 #define _UUID_H_
 
-#define INCLUDE_ALLOW_USERLEVEL 
+#define INCLUDE_ALLOW_USERLEVEL
 #define INCLUDE_ALLOW_VMCORE
-#include "includeCheck.h" 
+#include "includeCheck.h"
 
 #define UUID_SIZE 16
 #define UUID_STRSIZE (2*UUID_SIZE + 1)
@@ -56,6 +56,7 @@ char *UUID_ConvertToText(const uint8 id[UUID_SIZE]);
 char *UUID_Create(const char *configFileFullPath, int schemeControl);
 
 char *UUID_CreateRandom(void);
+char *UUID_CreateRandomRFC4122V4(void);
 char *UUID_CreateRandomVpxStyle(uint8 vpxdId, UUIDStyle);
 Bool UUID_IsUUIDGeneratedByThatVpxd(const uint8 *id, int vpxdInstanceId);
 char *UUID_PackText(const char *text, char *pack, int packLen);

diff --git a/open-vm-tools/lib/include/x86cpuid.h b/open-vm-tools/lib/include/x86cpuid.h
index 3b137c51ca6a23e53e7f598f69da258d9a50929b..25dd3bb9777143ed5539aafc55a7a90aea72773f 100644 (file)
--- a/open-vm-tools/lib/include/x86cpuid.h
+++ b/open-vm-tools/lib/include/x86cpuid.h
@@ -326,7 +326,7 @@ FLAG(   1,  0, ECX, 20,  1, SSE42,                                 YES, TRUE)  \
 FLAG(   1,  0, ECX, 21,  1, x2APIC,                                ANY, FALSE) \
 FLAG(   1,  0, ECX, 22,  1, MOVBE,                                 YES, TRUE)  \
 FLAG(   1,  0, ECX, 23,  1, POPCNT,                                YES, TRUE)  \
-FLAG(   1,  0, ECX, 24,  1, TSC_DEADLINE,                          NO,  FALSE) \
+FLAG(   1,  0, ECX, 24,  1, TSC_DEADLINE,                          ANY, FALSE) \
 FLAG(   1,  0, ECX, 25,  1, AES,                                   YES, TRUE)  \
 FLAG(   1,  0, ECX, 26,  1, XSAVE,                                 YES, FALSE) \
 FLAG(   1,  0, ECX, 27,  1, OSXSAVE,                               ANY, FALSE) \