diff options
| author | VMware, Inc <> | 2013-09-17 20:39:28 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-09-22 22:26:42 -0700 |
| commit | 3869012deb7658b9aab10ab028d71b32b89a2a85 (patch) | |
| tree | 0ecc051d83de7fe5c86cb3e7567f3068bc2fc41e | |
| parent | cb790dbad75717d0ffb99bc268ee9ed6214c93ba (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/vm_product_versions.h | 1 | ||||
| -rw-r--r-- | open-vm-tools/lib/include/x86cpuid.h | 16 |
2 files changed, 16 insertions, 1 deletions
diff --git a/open-vm-tools/lib/include/vm_product_versions.h b/open-vm-tools/lib/include/vm_product_versions.h index d14b9998..a0613769 100644 --- 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 25dd3bb9..47e84d6c 100644 --- 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 |