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/include/hostinfo.h b/open-vm-tools/lib/include/hostinfo.h
index 81f797ca7c7feb97a934ffa54ac970fc43d59d00..39cdbdfc29c7008d66279cd29f1bab430cda7966 100644 (file)
--- a/open-vm-tools/lib/include/hostinfo.h
+++ b/open-vm-tools/lib/include/hostinfo.h
@@ -111,7 +111,7 @@ extern void Hostinfo_LogMemUsage(void);
  */
 
 typedef struct {
-   CpuidVendors vendor;
+   CpuidVendor vendor;
 
    uint32 version;
    uint8 family;

diff --git a/open-vm-tools/lib/include/x86cpuid.h b/open-vm-tools/lib/include/x86cpuid.h
index 7c029e1fd7529cb9bdaa099e030609447f9a11ae..4d4e45afba0c52944fca4f8df8d137959600c265 100644 (file)
--- a/open-vm-tools/lib/include/x86cpuid.h
+++ b/open-vm-tools/lib/include/x86cpuid.h
@@ -138,8 +138,8 @@ typedef enum {
 #define CPUIDLEVEL(t, s, v) CPUID_LEVEL_##s,
    CPUID_CACHED_LEVELS
 #undef CPUIDLEVEL
-   CPUID_NUM_LEVELS
-} CpuidLevels;
+   CPUID_NUM_CACHED_LEVELS
+} CpuidCachedLevel;
 
 
 /* SVM CPUID feature leaf */
@@ -161,7 +161,7 @@ typedef enum {
    CPUID_REGS
 #undef CPUIDREG
    CPUID_NUM_REGS
-} CpuidRegs;
+} CpuidReg;
 
 /*
  * CPU vendors
@@ -175,7 +175,7 @@ typedef enum {
    CPUID_VENDOR_CYRIX,
    CPUID_VENDOR_VIA,
    CPUID_NUM_VENDORS
-} CpuidVendors;
+} CpuidVendor;
 
 #define CPUID_INTEL_VENDOR_STRING       "GenuntelineI"
 #define CPUID_AMD_VENDOR_STRING         "AuthcAMDenti"
@@ -921,7 +921,7 @@ CPUID_MODEL_IS_BARCELONA(uint32 v) // IN: %eax from CPUID with %eax=1.
  */
 
 static INLINE Bool
-CPUID_VendorRequiresFence(CpuidVendors vendor)
+CPUID_VendorRequiresFence(CpuidVendor vendor)
 {
    return vendor == CPUID_VENDOR_AMD;
 }
@@ -949,7 +949,7 @@ CPUID_ID1RequiresFence(CPUIDRegs *id1)
 }
 
 static INLINE Bool
-CPUID_RequiresFence(CpuidVendors vendor, // IN
+CPUID_RequiresFence(CpuidVendor vendor, // IN
                     uint32 version)      // IN: %eax from CPUID with %eax=1.
 {
    return CPUID_VendorRequiresFence(vendor) &&