From: VMware, Inc <> Date: Fri, 12 Apr 2013 19:48:13 +0000 (-0700) Subject: Fix VMCI_EVENT_VALID macro. X-Git-Tag: 2013.04.16-1098359~44 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bcfe7202fb211b61bd2b39e655357840e6326423;p=thirdparty%2Fopen-vm-tools.git 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 --- diff --git a/open-vm-tools/lib/include/vmci_defs.h b/open-vm-tools/lib/include/vmci_defs.h index 4de59f232..7e752fb8d 100644 --- 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 0f06ddb5d..1b291d00e 100644 --- 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 410638528..dd53ab8f4 100644 --- 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_ */