From: VMware, Inc <>
Date: Mon, 26 Jul 2010 19:13:06 +0000 (-0700)
Subject: Changes in shared code that don't affect open-vm-tools functionality.
X-Git-Tag: 2010.07.25-280253~23
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dad20f7d44ce4e6814a390bc402e4409584bbb7b;p=thirdparty%2Fopen-vm-tools.git

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

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/lib/file/file.c b/open-vm-tools/lib/file/file.c
index 764cf5a78..54ac6d02c 100644
--- a/open-vm-tools/lib/file/file.c
+++ b/open-vm-tools/lib/file/file.c
@@ -1253,7 +1253,16 @@ File_MakeTempEx2(ConstUnicode dir,                                // IN:
          break;
       }
 
+#if defined(_WIN32)
+      /*
+       * On windows, Posix_Open() fails with EACCES if a directory
+       * already exists with the same name. In such case, we need to
+       * ignore EACCES error and continue trying out.
+       */
+      if ((errno != EEXIST) && (errno != EACCES)) {
+#else
       if (errno != EEXIST) {
+#endif
          err = errno;
          Msg_Append(MSGID(file.maketemp.openFailed)
                  "Failed to create temporary file \"%s\": %s.\n",
diff --git a/open-vm-tools/lib/include/uuid.h b/open-vm-tools/lib/include/uuid.h
index d9333585b..4c5878f5b 100644
--- a/open-vm-tools/lib/include/uuid.h
+++ b/open-vm-tools/lib/include/uuid.h
@@ -33,6 +33,14 @@
 #define UUID_STRSIZE (2*UUID_SIZE + 1)
 #define	UUID_MAXLEN 48
 
+typedef enum {
+   UUID_WITH_PATH = 0,
+   UUID_RANDOM,
+   UUID_VPX_BIOS,
+   UUID_VPX_INSTANCE,
+   UUID_UNKNOWN
+} UUIDStyle;
+
 Bool UUID_ConvertToBin(uint8 dest_id[UUID_SIZE], const char *text);
 char *UUID_ConvertToText(const uint8 id[UUID_SIZE]);
 
@@ -45,11 +53,12 @@ char *UUID_ConvertToText(const uint8 id[UUID_SIZE]);
 char *UUID_Create(const char *configFileFullPath, int schemeControl);
 
 char *UUID_CreateRandom(void);
-char *UUID_CreateRandomVpxStyle(uint8 vpxdId);
+char *UUID_CreateRandomVpxStyle(uint8 vpxdId, UUIDStyle);
 Bool UUID_IsUUIDGeneratedByThatVpxd(const uint8 *id, int vpxdInstanceId);
 char *UUID_PackText(const char *text, char *pack, int packLen);
 char *UUID_ProperHostUUID(void);
 char *UUID_GetHostUUID(void);
+UUIDStyle UUID_GetStyle(const uint8 *id);
 /* like UUID_GetHostUUID, except gets actual host UUID */
 char *UUID_GetRealHostUUID(void);
 #endif
diff --git a/open-vm-tools/lib/include/vm_version.h b/open-vm-tools/lib/include/vm_version.h
index c2e0aa875..3921470ee 100644
--- a/open-vm-tools/lib/include/vm_version.h
+++ b/open-vm-tools/lib/include/vm_version.h
@@ -227,6 +227,8 @@
 #define VDM_VERSION "e.x.p"
 #define VMSAFE_VERSION        "1.1.0"
 #define VMSAFE_FILE_VERSION    1,1,0,PRODUCT_BUILD_NUMBER_NUMERIC
+#define NETDUMP_VERSION        "1.1.0"
+#define NETDUMP_FILE_VERSION    1,1,0,PRODUCT_BUILD_NUMBER_NUMERIC
 #define VDDK_VERSION          "1.1.0"
 #define VDDK_FILE_VERSION      1,1,0,PRODUCT_BUILD_NUMBER_NUMERIC
 #define OVFTOOL_VERSION "2.0.1"
diff --git a/open-vm-tools/lib/include/x86cpuid.h b/open-vm-tools/lib/include/x86cpuid.h
index fa36cd084..ede8cffb2 100644
--- a/open-vm-tools/lib/include/x86cpuid.h
+++ b/open-vm-tools/lib/include/x86cpuid.h
@@ -129,7 +129,8 @@ CPUIDQuery;
    CPUIDLEVEL(FALSE, B, 0xB)                    \
    CPUIDLEVEL(FALSE, D, 0xD)                    \
    CPUIDLEVEL(FALSE, 86, 0x80000006)		\
-   CPUIDLEVEL(FALSE, 81D, 0x8000001D)
+   CPUIDLEVEL(FALSE, 81D, 0x8000001D)           \
+   CPUIDLEVEL(FALSE, 81E, 0x8000001E)
 
 #define CPUID_ALL_LEVELS                        \
    CPUID_CACHED_LEVELS                          \
@@ -523,6 +524,9 @@ FIELDDEFA( 81D,EAX, AMD,     0,  5, CACHE_TYPE,          NA,  FALSE, AMD_CACHE_T
 FIELDDEFA( 81D,EAX, AMD,     5,  3, CACHE_LEVEL,         NA,  FALSE, AMD_CACHE_LEVEL) \
 FIELDDEFA( 81D,EBX, AMD,    22, 10, CACHE_WAYS,          NA,  FALSE, AMD_CACHE_WAYS)
 
+#define CPUID_FIELD_DATA_LEVEL_81E					       \
+FIELDDEFA( 81E,ECX, AMD,     8,  3, NODES_PER_PKG,       NA,  FALSE, AMD_NODES_PER_PKG)
+
 
 #define CPUID_FIELD_DATA                                              \
    CPUID_FIELD_DATA_LEVEL_0                                           \
@@ -539,7 +543,8 @@ FIELDDEFA( 81D,EBX, AMD,    22, 10, CACHE_WAYS,          NA,  FALSE, AMD_CACHE_W
    CPUID_FIELD_DATA_LEVEL_81                                          \
    CPUID_FIELD_DATA_LEVEL_8x                                          \
    CPUID_FIELD_DATA_LEVEL_8A_BD                                       \
-   CPUID_FIELD_DATA_LEVEL_81D
+   CPUID_FIELD_DATA_LEVEL_81D                                         \
+   CPUID_FIELD_DATA_LEVEL_81E
 
 
 /*
@@ -679,6 +684,7 @@ FIELD_FUNC(TOPOLOGY_X2APIC_ID,          CPUID_INTEL_IDBEDX_X2APIC_ID)
 FIELD_FUNC(AMD_CACHE_TYPE,      CPUID_AMD_ID81DEAX_CACHE_TYPE)
 FIELD_FUNC(AMD_CACHE_LEVEL,     CPUID_AMD_ID81DEAX_CACHE_LEVEL)
 FIELD_FUNC(AMD_CACHE_WAYS,      CPUID_AMD_ID81DEBX_CACHE_WAYS)
+FIELD_FUNC(AMD_NODES_PER_PKG,   CPUID_AMD_ID81EECX_NODES_PER_PKG)
 #undef FIELD_FUNC