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 6a0732fab58cb5f4de596be77c78cfcbe06472da..b637627a132567560704c5acab9a1495618e4d01 100644 (file)
--- 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 7cb4d475b988d019e1e4a1c2545059868ba13af1..4c9c048e6c6b8d774b0defd419d834e57d5d6fd9 100644 (file)
--- 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 fdb17336b959e7b246b77bc4e3559ee0a10f379f..d3d14748da374a66f5b191a734d6b2dc46f454a1 100644 (file)
--- 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 954a948ceb7bb21c2a0d8b8c50065a1e2e287e47..27363528d036906db2592ecec043e8c6f31de940 100644 (file)
--- 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 24ecaf9b12fd245710464eb7a8df55870c4c9673..c1ab750ac760ced71236c310df785ae8f478726e 100644 (file)
--- 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;
 }