Fix VMCI_EVENT_VALID macro.

When VMCI_EVENT_VALID_VMX was changed to accept the QP_PEER_ATTACH and
QP_PEER_DETACH events this broke the regular non-VMX version. This
wasn't caught because I didn't rebuild my guest VMCI driver when
testing.

Signed-off-by: Dmitry Torokhov <dtor@vmware.com>

diff --git a/open-vm-tools/lib/include/vmci_defs.h b/open-vm-tools/lib/include/vmci_defs.h
index 4de59f23225a37d14e47a9ee40720db1045551ce..7e752fb8d49ebce393caf2703a2447bcda464c3f 100644 (file)
--- a/open-vm-tools/lib/include/vmci_defs.h
+++ b/open-vm-tools/lib/include/vmci_defs.h
@@ -381,7 +381,8 @@ typedef uint32 VMCI_Event;
 #define VMCI_EVENT_VALID(_event) (_event < VMCI_EVENT_MAX)
 #else // VMX86_SERVER
 #define VMCI_EVENT_VALID(_event) (_event < VMCI_EVENT_MAX && \
-                                  !VMCI_EVENT_VALID_VMX(_event))
+                                  _event != VMCI_EVENT_MEM_ACCESS_ON && \
+                                  _event != VMCI_EVENT_MEM_ACCESS_OFF)
 #endif // VMX86_SERVER
 
 /* Reserved guest datagram resource ids. */

diff --git a/open-vm-tools/modules/linux/shared/vmci_defs.h b/open-vm-tools/modules/linux/shared/vmci_defs.h
index 0f06ddb5df202cbc838368f9a910152fffbd2822..1b291d00e79206d1e1556693c1802346bde11ebb 100644 (file)
--- a/open-vm-tools/modules/linux/shared/vmci_defs.h
+++ b/open-vm-tools/modules/linux/shared/vmci_defs.h
@@ -381,7 +381,8 @@ typedef uint32 VMCI_Event;
 #define VMCI_EVENT_VALID(_event) (_event < VMCI_EVENT_MAX)
 #else // VMX86_SERVER
 #define VMCI_EVENT_VALID(_event) (_event < VMCI_EVENT_MAX && \
-                                  !VMCI_EVENT_VALID_VMX(_event))
+                                  _event != VMCI_EVENT_MEM_ACCESS_ON && \
+                                  _event != VMCI_EVENT_MEM_ACCESS_OFF)
 #endif // VMX86_SERVER
 
 /* Reserved guest datagram resource ids. */

diff --git a/open-vm-tools/modules/linux/vmci/linux/vmci_version.h b/open-vm-tools/modules/linux/vmci/linux/vmci_version.h
index 410638528f80f2728c089ddbb79788e8da687981..dd53ab8f4d0f0e9edb557315bb71ab16d44a01cc 100644 (file)
--- a/open-vm-tools/modules/linux/vmci/linux/vmci_version.h
+++ b/open-vm-tools/modules/linux/vmci/linux/vmci_version.h
@@ -25,8 +25,8 @@
 #ifndef _VMCI_VERSION_H_
 #define _VMCI_VERSION_H_
 
-#define VMCI_DRIVER_VERSION          9.5.13.0
-#define VMCI_DRIVER_VERSION_COMMAS   9,5,13,0
-#define VMCI_DRIVER_VERSION_STRING   "9.5.13.0"
+#define VMCI_DRIVER_VERSION          9.5.14.0
+#define VMCI_DRIVER_VERSION_COMMAS   9,5,14,0
+#define VMCI_DRIVER_VERSION_STRING   "9.5.14.0"
 
 #endif /* _VMCI_VERSION_H_ */