Change error code of VMCIDoorbell_Create

Before the merging of the two VMCI drivers, the guest version
would return VMCI_ERROR_ALREADY_EXISTS when creating a
doorbell with a handle that already exists. The host code
actually returned VMCI_ERROR_DUPLICATE_ENTRY, which is the
hash table error code for duplicate entries. After the merge,
we always return VMCI_ERROR_DUPLICATE_ENTRY, but
VMCI_ERROR_ALREADY_EXISTS is slightly more descriptive so
return that instead.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>

diff --git a/open-vm-tools/modules/linux/vmci/common/vmciDoorbell.c b/open-vm-tools/modules/linux/vmci/common/vmciDoorbell.c
index abaea624ee1a0ffa0c560a42921c98b901f05d47..3f6d47c9f848fe475ac50df2dec10269edde5a44 100644 (file)
--- a/open-vm-tools/modules/linux/vmci/common/vmciDoorbell.c
+++ b/open-vm-tools/modules/linux/vmci/common/vmciDoorbell.c
@@ -644,6 +644,9 @@ VMCIDoorbell_Create(VMCIHandle *handle,            // IN/OUT
    if (result != VMCI_SUCCESS) {
       VMCI_WARNING((LGPFX"Failed to add new resource (handle=0x%x:0x%x).\n",
                     newHandle.context, newHandle.resource));
+      if (result == VMCI_ERROR_DUPLICATE_ENTRY) {
+         result = VMCI_ERROR_ALREADY_EXISTS;
+      }
       goto destroy;
    }
 

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 c47022ba3b8a4078e84b9d69f9341aff6626ff4d..27ed5b32880bfe0eb4d10fdd69e0acc968551d74 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.1.14.0
-#define VMCI_DRIVER_VERSION_COMMAS   9,1,14,0
-#define VMCI_DRIVER_VERSION_STRING   "9.1.14.0"
+#define VMCI_DRIVER_VERSION          9.1.15.0
+#define VMCI_DRIVER_VERSION_COMMAS   9,1,15,0
+#define VMCI_DRIVER_VERSION_STRING   "9.1.15.0"
 
 #endif /* _VMCI_VERSION_H_ */