Internal branch sync. Included in this change:

. VSOCK: strip SOCK_SEQPACKET from the VMX/installer
. 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/include/mutexRank.h b/open-vm-tools/lib/include/mutexRank.h
index 4942af6bbd94ed060b17e1d0c15b8104c3652c7a..b7e26555904b47e41de62eca7e46ffcaf3b40a8d 100644 (file)
--- a/open-vm-tools/lib/include/mutexRank.h
+++ b/open-vm-tools/lib/include/mutexRank.h
@@ -32,6 +32,8 @@
 
 /*
  * Core rank defines.
+ *
+ * ANY RANK USAGE ABOVE RANK_LEAF IS RESERVED BY THE PI GROUP.
  */
 
 #define RANK_UNRANKED            0
@@ -52,7 +54,18 @@
  * logging code cannot call anything else which requires a lock, but
  * everyone else can safely Log() while holding a leaf lock.
  */
-#define RANK_logLock             (RANK_LEAF + 1)
+#define RANK_logLock             (RANK_LEAF + 2)
+
+/*
+ * overheadMem lock rank.
+ *
+ * Very special case. Don't change it. One must be able to enter
+ * the overheadMem Facility at any rank (RANK_LEAF or lower) and
+ * still be able to acquire a lock in overheadMem *AND* be able
+ * to Log().
+ */
+
+#define RANK_overheadMem         (RANK_LEAF + 1)
 
 /*
  * bora/lib/allocTrack rank (not really).

diff --git a/open-vm-tools/modules/linux/vsock/linux/vsockCommon.h b/open-vm-tools/modules/linux/vsock/linux/vsockCommon.h
index 57a1f9a94e8063b1e813a8cff5c59cca66c8ebba..ee76076dff8e145d355046bd6cb0fb0f6ec9b3e8 100644 (file)
--- a/open-vm-tools/modules/linux/vsock/linux/vsockCommon.h
+++ b/open-vm-tools/modules/linux/vsock/linux/vsockCommon.h
@@ -204,31 +204,6 @@ __declspec(selectany) extern const WSAPROTOCOL_INFOW vsockProtocolInfos[] = {
       0,                         /* None. */
       L"VMCI sockets STREAM"     /* Protocol name. */
    },
-   {
-      /* XXX, should this also be XP1_MESSAGE_ORIENTED? */
-      (XP1_GUARANTEED_DELIVERY | /* Guaranteed delivery. */
-       XP1_GUARANTEED_ORDER |    /* Guaranteed order. */
-       XP1_GRACEFUL_CLOSE),      /* Graceful close. */
-      0,                         /* Reserved. */
-      0,                         /* Reserved. */
-      0,                         /* Reserved. */
-      PFL_MATCHES_PROTOCOL_ZERO, /* Always protocol 0. */
-      { 0 },                     /* None. */
-      0,                         /* Assigned by Winsock. */
-      { 1, 0 },                  /* Base provider. */
-      0,                         /* Version 0. */
-      VMCI_SOCKETS_AF_VALUE,     /* VMCI sockets protocol. */
-      16,                        /* Maximum address length in bytes. */
-      16,                        /* Minimum address length in bytes. */
-      SOCK_SEQPACKET,            /* SEQPACKET. */
-      0,                         /* Protocol. */
-      0,                         /* Protocol max offset. */
-      BIGENDIAN,                 /* Network byte order. */
-      SECURITY_PROTOCOL_NONE,    /* No security. */
-      0,                         /* Message size unimportant. */
-      0,                         /* None. */
-      L"VMCI sockets SEQPACKET"  /* Protocol name. */
-   },
 };
 
 __declspec(selectany) extern const