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/vmci_defs.h b/open-vm-tools/lib/include/vmci_defs.h
index 2f70b5222ba1f4c717321085073723e480dfe2ef..795521cdc26ca428ffd8a1f4afaca388825d3926 100644 (file)
--- a/open-vm-tools/lib/include/vmci_defs.h
+++ b/open-vm-tools/lib/include/vmci_defs.h
@@ -116,7 +116,8 @@ typedef uint32 VMCI_Resource;
  * WS 7.0/7.1 and ESX 4.1
  */
 #define VMCI_HGFS_TRANSPORT       13
-#define VMCI_RESOURCE_MAX         14
+#define VMCI_UNITY_PBRPC_REGISTER 14
+#define VMCI_RESOURCE_MAX         15
 
 /* VMCI Ids. */
 typedef uint32 VMCIId;

diff --git a/open-vm-tools/modules/linux/shared/vmci_defs.h b/open-vm-tools/modules/linux/shared/vmci_defs.h
index 392efc3758a2d5b0e0ec555644a83b49e95f8298..1cc6976d83a1ed5ef0eb11a48e6887d12e0995be 100644 (file)
--- a/open-vm-tools/modules/linux/shared/vmci_defs.h
+++ b/open-vm-tools/modules/linux/shared/vmci_defs.h
@@ -116,7 +116,8 @@ typedef uint32 VMCI_Resource;
  * WS 7.0/7.1 and ESX 4.1
  */
 #define VMCI_HGFS_TRANSPORT       13
-#define VMCI_RESOURCE_MAX         14
+#define VMCI_UNITY_PBRPC_REGISTER 14
+#define VMCI_RESOURCE_MAX         15
 
 /* VMCI Ids. */
 typedef uint32 VMCIId;

diff --git a/open-vm-tools/modules/linux/vsock/linux/vsockAddr.c b/open-vm-tools/modules/linux/vsock/linux/vsockAddr.c
index 106eb7420731391488b85cfabeb5da331fe84245..6d7e090217f67d46bcebfb8dd3ff10e01eb96b72 100644 (file)
--- a/open-vm-tools/modules/linux/vsock/linux/vsockAddr.c
+++ b/open-vm-tools/modules/linux/vsock/linux/vsockAddr.c
@@ -446,7 +446,15 @@ VSockAddr_SocketContextDgram(uint32 cid,  // IN
                              uint32 rid)  // IN
 {
    if (cid == VMCI_HYPERVISOR_CONTEXT_ID) {
-      return FALSE;
+      /*
+       * Registrations of PBRPC Servers do not modify VMX/Hypervisor state and
+       * are allowed.
+       */
+      if (rid == VMCI_UNITY_PBRPC_REGISTER) {
+         return TRUE;
+      } else {
+         return FALSE;
+      }
    }
 
    return TRUE;