Internal branch sync. Included in this change:

. reduce Solaris vmxnet3 driver logspew.

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

diff --git a/open-vm-tools/lib/include/cpuid_info.h b/open-vm-tools/lib/include/cpuid_info.h
index 5cf4e19059de7f5c01084883dda632b2d30918fc..a6dcd0412a0cd49cef6961dd69a806de4f654339 100644 (file)
--- a/open-vm-tools/lib/include/cpuid_info.h
+++ b/open-vm-tools/lib/include/cpuid_info.h
@@ -126,8 +126,16 @@ CPUIDSummary_SafeToUseMC0_CTL(CPUIDSummary* cpuidSummary)
 }
 
 
-/* The following two functions return the number of cores per package
+/* The following functions return the number of cores per package
    and set *numThreadsPerCore to the number of hardware threads per core. */ 
+static INLINE uint32
+CPUIDSummary_VIACoresPerPackage(CPUIDSummary *cpuid,
+                                uint32 *numThreadsPerCore)
+{
+   *numThreadsPerCore = 1;
+   return 1;
+}
+
 static INLINE uint32 
 CPUIDSummary_AMDCoresPerPackage(CPUIDSummary *cpuid,
                                 uint32 *numThreadsPerCore)

diff --git a/open-vm-tools/lib/include/vm_version.h b/open-vm-tools/lib/include/vm_version.h
index f037df950eacc6d4a8e99147742f83f726d0dbc5..2f528fe48736c7c44c6b8c4d0e950f73fe0c7804 100644 (file)
--- a/open-vm-tools/lib/include/vm_version.h
+++ b/open-vm-tools/lib/include/vm_version.h
@@ -183,8 +183,8 @@
  * 4.0.0-1.7: update 1
  * 4.0.0-1.8: patch 3
  */
-#define ESX_VERSION_MAJOR "4"
-#define ESX_VERSION_MINOR "1"
+#define ESX_VERSION_MAJOR "5"
+#define ESX_VERSION_MINOR "0"
 #define ESX_VERSION_MAINT "0"
 #define ESX_VERSION ESX_VERSION_MAJOR "." ESX_VERSION_MINOR "." \
                     ESX_VERSION_MAINT
@@ -223,7 +223,7 @@
 #define DDK_VERSION "e.x.p"
 #define VIM_API_VERSION "4.0"
 #define VIPERL_VERSION "1.1.0"
-#define RCLI_VERSION "4.0.0"
+#define RCLI_VERSION "4.5.0"
 #define VDM_VERSION "e.x.p"
 #define VMSAFE_VERSION        "1.1.0"
 #define VMSAFE_FILE_VERSION    1,1,0,PRODUCT_BUILD_NUMBER_NUMERIC
@@ -415,9 +415,6 @@
 #define CONFIG_VERSION_MSNAP            "8"     /* Multiple Snapshots */
 #define CONFIG_VERSION_WS5              "8"     /* WS5.0 */
 
-#define VMVISOR_VERSION "4.1.0"
-
-
 /*
  * Product version strings allows UIs to refer to a single place for specific
  * versions of product names.  These do not include a "VMware" prefix.

diff --git a/open-vm-tools/lib/include/x86cpuid.h b/open-vm-tools/lib/include/x86cpuid.h
index 144ded33bb0e220a3c48756ea22d36466c889049..7c029e1fd7529cb9bdaa099e030609447f9a11ae 100644 (file)
--- a/open-vm-tools/lib/include/x86cpuid.h
+++ b/open-vm-tools/lib/include/x86cpuid.h
@@ -671,6 +671,9 @@ FIELD_FUNC(TOPOLOGY_X2APIC_ID,          CPUID_INTEL_IDBEDX_X2APIC_ID)
 #define CPUID_FAMILY_K8MOBILE 17
 #define CPUID_FAMILY_BULLDOZER 21
 
+/* Effective VIA CPU Families */
+#define CPUID_FAMILY_C7       6
+
 /* Intel model information */
 #define CPUID_MODEL_PPRO       1
 #define CPUID_MODEL_PII_03     3
@@ -693,15 +696,18 @@ FIELD_FUNC(TOPOLOGY_X2APIC_ID,          CPUID_INTEL_IDBEDX_X2APIC_ID)
 /* AMD model information */
 #define CPUID_MODEL_BARCELONA_02 0x02 // Barcelona (both Opteron & Phenom kind)
 
+/* VIA model information */
+#define CPUID_MODEL_NANO       15     // Isaiah
+
 /*
  *----------------------------------------------------------------------
  *
- * CPUID_IsVendor{AMD,Intel} --
+ * CPUID_IsVendor{AMD,Intel,VIA} --
  *
- *      Determines if the vendor string in cpuid id0 is from {AMD,Intel}.
+ *      Determines if the vendor string in cpuid id0 is from {AMD,Intel,VIA}.
  *
  * Results:
- *      True iff vendor string is CPUID_{AMD,INTEL}_VENDOR_STRING
+ *      True iff vendor string is CPUID_{AMD,INTEL,VIA}_VENDOR_STRING
  *
  * Side effects:
  *      None.
@@ -729,6 +735,11 @@ CPUID_IsVendorIntel(CPUIDRegs *id0)
    return CPUID_IsRawVendor(id0, CPUID_INTEL_VENDOR_STRING);
 }
 
+static INLINE Bool
+CPUID_IsVendorVIA(CPUIDRegs *id0)
+{
+   return CPUID_IsRawVendor(id0, CPUID_VIA_VENDOR_STRING);
+}
 
 static INLINE uint32
 CPUID_EFFECTIVE_FAMILY(uint32 v) /* %eax from CPUID with %eax=1. */

diff --git a/open-vm-tools/modules/solaris/vmxnet3/vmxnet3_main.c b/open-vm-tools/modules/solaris/vmxnet3/vmxnet3_main.c
index 164c72edfdca85b339b3d34ccd576f4ab674fcc8..a922e6f003c09c4eaf8876773be541e667cf91ea 100644 (file)
--- a/open-vm-tools/modules/solaris/vmxnet3/vmxnet3_main.c
+++ b/open-vm-tools/modules/solaris/vmxnet3/vmxnet3_main.c
@@ -90,7 +90,7 @@ vmxnet3_getstat(void *data, uint_t stat, uint64_t *val)
    UPT1_TxStats *txStats;
    UPT1_RxStats *rxStats;
 
-   VMXNET3_DEBUG(dp, 2, "getstat(%u)\n", stat);
+   VMXNET3_DEBUG(dp, 3, "getstat(%u)\n", stat);
 
    if (!dp->devEnabled) {
       return DDI_FAILURE;