diff options
| author | VMware, Inc <> | 2013-09-17 20:36:27 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-09-22 22:26:42 -0700 |
| commit | 5ccfbb3cc3da0f026ed8628dbdb07bc187c3bc16 (patch) | |
| tree | a7d73c68bfc1da81ed5b64f9627c3916d43254e0 | |
| parent | 4a527c999422eaba9795b18e89b69fbeefda8583 (diff) | |
Changes in shared code that don't affect open-vm-tools functionality.
Signed-off-by: Dmitry Torokhov <dtor@vmware.com>
| -rw-r--r-- | open-vm-tools/lib/include/uuid.h | 5 | ||||
| -rw-r--r-- | open-vm-tools/lib/include/x86cpuid.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/open-vm-tools/lib/include/uuid.h b/open-vm-tools/lib/include/uuid.h index 7ab8abf1..4b400265 100644 --- 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 3b137c51..25dd3bb9 100644 --- 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) \ |