From: VMware, Inc <>
Date: Wed, 18 Sep 2013 03:15:46 +0000 (-0700)
Subject: Changes in shared code that don't affect open-vm-tools functionality.
X-Git-Tag: 2013.09.16-1328054~106
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e5da80487fa58c637bfe01426383164754283db;p=thirdparty%2Fopen-vm-tools.git

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/asyncsocket/asyncSocketInt.h b/open-vm-tools/lib/asyncsocket/asyncSocketInt.h
index 6a0732fab..b637627a1 100644
--- a/open-vm-tools/lib/asyncsocket/asyncSocketInt.h
+++ b/open-vm-tools/lib/asyncsocket/asyncSocketInt.h
@@ -112,7 +112,6 @@ typedef struct WebSocketHandshakeState {
    char *handshakeBuffer;
    int32 numValidBytes;    // The number of bytes in the buffer that constitute the header
    int32 httpHeaderLength;
-   int32 maxMessageBufferSize;
 } WebSocketHandshakeState;
 
 typedef enum {
diff --git a/open-vm-tools/lib/include/poll.h b/open-vm-tools/lib/include/poll.h
index 7cb4d475b..4c9c048e6 100644
--- a/open-vm-tools/lib/include/poll.h
+++ b/open-vm-tools/lib/include/poll.h
@@ -103,7 +103,7 @@ typedef enum PollClass {
    POLL_CLASS_CPT,
    POLL_CLASS_MKS,
    POLL_FIXED_CLASSES,
-   POLL_MAX_CLASSES = 256 /* Size enum to maximum */
+   POLL_MAX_CLASSES = 320 /* Size enum to maximum */
 } PollClass;
 
 
diff --git a/open-vm-tools/lib/include/vm_basic_types.h b/open-vm-tools/lib/include/vm_basic_types.h
index fdb17336b..d3d14748d 100644
--- a/open-vm-tools/lib/include/vm_basic_types.h
+++ b/open-vm-tools/lib/include/vm_basic_types.h
@@ -455,6 +455,9 @@ typedef uintptr_t VPN;
 typedef uint64    PA;
 typedef uint32    PPN;
 
+typedef uint64    TPA;
+typedef uint32    TPPN;
+
 typedef uint64    PhysMemOff;
 typedef uint64    PhysMemSize;
 
@@ -590,7 +593,7 @@ typedef void * UserVA;
 #define INVALID_LPN64     ((LPN64)-1)
 #define INVALID_PAGENUM   ((PageNum)-1)
 
-#ifdef VMKERNEL
+#if defined(VMKERNEL) || defined(VMKBOOT)
 #define INVALID_MPN64     ((MPN64)(uintptr_t)INVALID_MPN)
 #endif
 
diff --git a/open-vm-tools/lib/include/vthreadBase.h b/open-vm-tools/lib/include/vthreadBase.h
index 954a948ce..27363528d 100644
--- a/open-vm-tools/lib/include/vthreadBase.h
+++ b/open-vm-tools/lib/include/vthreadBase.h
@@ -52,7 +52,7 @@ typedef unsigned VThreadID;
 #define VTHREAD_INVALID_ID	(VThreadID)(~0u)
 
 /* XXX Vestigial need as an MXState array size */
-#define VTHREAD_MAX_THREADS   160
+#define VTHREAD_MAX_THREADS   224
 
 #ifdef VMM
 /*
diff --git a/open-vm-tools/lib/include/x86cpuid.h b/open-vm-tools/lib/include/x86cpuid.h
index 24ecaf9b1..c1ab750ac 100644
--- a/open-vm-tools/lib/include/x86cpuid.h
+++ b/open-vm-tools/lib/include/x86cpuid.h
@@ -964,8 +964,11 @@ CPUIDCheck(uint32 eaxIn, uint32 eaxInCheck,
 #define CPUID_MODEL_NEHALEM_2F     0x2f  // Westmere-EX
 #define CPUID_MODEL_SANDYBRIDGE_3A 0x3a  // Ivy Bridge
 #define CPUID_MODEL_SANDYBRIDGE_3E 0x3e  // Ivy Bridge-EP
-#define CPUID_MODEL_HASWELL_3C     0x3c
-#define CPUID_MODEL_HASWELL_45     0x45
+
+
+#define CPUID_MODEL_HASWELL_3C     0x3c  // Haswell DT
+#define CPUID_MODEL_HASWELL_45     0x45  // Haswell Ultrathin
+
 
 #define CPUID_MODEL_PIII_07    7
 #define CPUID_MODEL_PIII_08    8
@@ -1147,19 +1150,15 @@ CPUID_UARCH_IS_HASWELL(uint32 v) // IN: %eax from CPUID with %eax=1.
 
    return CPUID_FAMILY_IS_P6(v) &&
           (effectiveModel == CPUID_MODEL_HASWELL_3C ||
-           effectiveModel == CPUID_MODEL_HASWELL_45
-           );
+           effectiveModel == CPUID_MODEL_HASWELL_45);
 }
 
-
 static INLINE Bool
-CPUID_UARCH_IS_ATOM(uint32 v) // IN: %eax from CPUID with %eax=1.
+CPUID_MODEL_IS_CENTERTON(uint32 v) // IN: %eax from CPUID with %eax=1.
 {
    /* Assumes the CPU manufacturer is Intel. */
-   uint32 effectiveModel = CPUID_EFFECTIVE_MODEL(v);
-
-   return CPUID_FAMILY_IS_P6(v) &&
-          effectiveModel == CPUID_MODEL_ATOM_1C;
+   return CPUID_FAMILY_IS_P6(v) && 
+          CPUID_EFFECTIVE_MODEL(v) == CPUID_MODEL_ATOM_1C;
 }