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/vm_product.h b/open-vm-tools/lib/include/vm_product.h
index 600f6ac58cf90ae550688b9be8d3ac66ecc7ecc2..88b43cf624fc575f31158c8d6794beb49b24e508 100644 (file)
--- a/open-vm-tools/lib/include/vm_product.h
+++ b/open-vm-tools/lib/include/vm_product.h
@@ -222,6 +222,18 @@
    PRODUCT_VMRC_PLUGIN_CURRENT_MIMETYPE PRODUCT_VMRC_MIMETYPE_SEPARATOR \
    PRODUCT_VMRC_PLUGIN_PREVIOUS_MIMETYPES PRODUCT_VMRC_MIMETYPE_TERMINATOR
 
+/*
+ * VMware USB Arbitration Service version definitions
+ */
+
+#define PRODUCT_USB_ARBITRATOR_SHORT_NAME "vmware-usbarbitrator"
+#define PRODUCT_USB_ARBITRATOR_NAME MAKE_NAME("USB Arbitration Service")
+#ifdef _WIN32
+#define PRODUCT_USB_ARBITRATOR_EXECUTABLE PRODUCT_GENERIC_NAME_LOWER "-usbarbitrator.exe"
+#else
+#define PRODUCT_USB_ARBITRATOR_EXECUTABLE PRODUCT_GENERIC_NAME_LOWER "-usbarbitrator"
+#endif
+
 /*
  * TODO: This properly lives in productState, but we need it here to
  * define DEFAULT_LIBDIRECTORY.  If that can be moved to productState,

diff --git a/open-vm-tools/lib/include/vm_version.h b/open-vm-tools/lib/include/vm_version.h
index cfe8bf31a402055ee793e7125a7d5b1807ae73b2..d378d64ac130eacde6a9b03f106b3da98d78f407 100644 (file)
--- a/open-vm-tools/lib/include/vm_version.h
+++ b/open-vm-tools/lib/include/vm_version.h
@@ -255,6 +255,16 @@
  */
 #define TOOLS_VERSION TOOLS_VERSION_CURRENT_STR
 
+/*
+ * USB Arbitrator Component version. This encompasses the USB Arbitrator, hcmon, and
+ * vmusb. This is used by the installer to determine if an upgrade should take place. The
+ * major version should be bumped with every major hosted release (and the minor to 0)
+ * while the minor version should be bumped with each change affecting the USB Arbitrator.
+ *
+ * Currently set to 2.x for the hosted10 branch.
+ */
+#define USB_ARBITRATOR_COMPONENT_VERSION_NUMBER "2.0"
+
 #ifdef VMX86_VPX
 #define VIM_API_TYPE "VirtualCenter"
 #else