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_product_versions.h b/open-vm-tools/lib/include/vm_product_versions.h
index d14b999833592d58390acaac23d27c153c9b381d..a0613769d41932b811f848b8f67d51f308788873 100644 (file)
--- a/open-vm-tools/lib/include/vm_product_versions.h
+++ b/open-vm-tools/lib/include/vm_product_versions.h
@@ -210,6 +210,7 @@
 #define RECOVERYLIBS_VERSION "2.0.0"
 #define PRECHECK_VERSION "e.x.p"
 #define VIEW_FEATUREPACK_VERSION "5.2.0"
+#define VHSESDK_VERSION "1.0.0"
 
 
 #ifndef MAKESTR

diff --git a/open-vm-tools/lib/include/x86cpuid.h b/open-vm-tools/lib/include/x86cpuid.h
index 25dd3bb9777143ed5539aafc55a7a90aea72773f..47e84d6c3d5a5c5fa6546a06ed5aff14a450fb4e 100644 (file)
--- a/open-vm-tools/lib/include/x86cpuid.h
+++ b/open-vm-tools/lib/include/x86cpuid.h
@@ -940,7 +940,8 @@ CPUIDCheck(uint32 eaxIn, uint32 eaxInCheck,
 #define CPUID_FAMILY_K8MOBILE        17
 #define CPUID_FAMILY_LLANO           18
 #define CPUID_FAMILY_BOBCAT          20
-#define CPUID_FAMILY_BULLDOZER       21
+#define CPUID_FAMILY_BULLDOZER       21  // Bulldozer & Piledriver
+#define CPUID_FAMILY_KYOTO           22
 
 /* Effective VIA CPU Families */
 #define CPUID_FAMILY_C7               6
@@ -995,6 +996,7 @@ CPUIDCheck(uint32 eaxIn, uint32 eaxInCheck,
 #define CPUID_MODEL_PILEDRIVER_10     0x10 // family == CPUID_FAMILY_BULLDOZER
 #define CPUID_MODEL_PILEDRIVER_02     0x02 // family == CPUID_FAMILY_BULLDOZER
 #define CPUID_MODEL_OPTERON_REVF_41   0x41 // family == CPUID_FAMILY_K8
+#define CPUID_MODEL_KYOTO_00          0x00 // family == CPUID_FAMILY_KYOTO
 
 /* VIA model information */
 #define CPUID_MODEL_NANO       15     // Isaiah
@@ -1288,6 +1290,11 @@ CPUID_FAMILY_IS_BULLDOZER(uint32 eax)
    return CPUID_EFFECTIVE_FAMILY(eax) == CPUID_FAMILY_BULLDOZER;
 }
 
+static INLINE Bool
+CPUID_FAMILY_IS_KYOTO(uint32 eax)
+{
+   return CPUID_EFFECTIVE_FAMILY(eax) == CPUID_FAMILY_KYOTO;
+}
 
 /*
  * AMD Barcelona (of either Opteron or Phenom kind).
@@ -1353,6 +1360,13 @@ CPUID_MODEL_IS_PILEDRIVER(uint32 eax)
            CPUID_EFFECTIVE_MODEL(eax) == CPUID_MODEL_PILEDRIVER_02);
 }
 
+static INLINE Bool
+CPUID_MODEL_IS_KYOTO(uint32 eax)
+{
+   /* Kyoto is models 0x00 of family 0x16 (so far). */
+   return CPUID_EFFECTIVE_FAMILY(eax) == CPUID_FAMILY_KYOTO && 
+          CPUID_EFFECTIVE_MODEL(eax) == CPUID_MODEL_KYOTO_00;
+}
 
 #define CPUID_TYPE_PRIMARY     0
 #define CPUID_TYPE_OVERDRIVE   1