Changes to common header files not applicable to open-vm-tools.

diff --git a/open-vm-tools/lib/include/vm_basic_defs.h b/open-vm-tools/lib/include/vm_basic_defs.h
index ac03513287da3cd6c5ab8eb473a52b9a567f970f..c3318b6d65a415857a076cfce958db022bfd2dac 100644 (file)
--- a/open-vm-tools/lib/include/vm_basic_defs.h
+++ b/open-vm-tools/lib/include/vm_basic_defs.h
@@ -709,17 +709,6 @@ typedef int pid_t;
 #define USER_ONLY(x) x
 #endif
 
-/* VMVISOR ifdef only allowed in the vmkernel */
-#ifdef VMKERNEL
-#ifdef VMVISOR
-#define vmvisor 1
-#define VMVISOR_ONLY(x) x
-#else
-#define vmvisor 0
-#define VMVISOR_ONLY(x)
-#endif
-#endif
-
 #ifdef _WIN32
 #define VMW_INVALID_HANDLE INVALID_HANDLE_VALUE
 #else

diff --git a/open-vm-tools/lib/include/vm_product.h b/open-vm-tools/lib/include/vm_product.h
index c1a3340f2ad53ff0756e9020f6e0ab5d291ca8b3..d9ef05ec159f16d605c32cb8e572355caf0f6c0d 100644 (file)
--- a/open-vm-tools/lib/include/vm_product.h
+++ b/open-vm-tools/lib/include/vm_product.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2006-2017 VMware, Inc. All rights reserved.
+ * Copyright (C) 2006-2018 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -60,6 +60,7 @@
  */
 #define PRODUCT_SCALABLE_SERVER_BRIEF_NAME "ESX"
 #define PRODUCT_ESXI_BRIEF_NAME "ESXi"
+#define PRODUCT_VMVISOR_BRIEF_NAME PRODUCT_ESXI_BRIEF_NAME 
 #define PRODUCT_WORKSTATION_BRIEF_NAME "Workstation"
 #define PRODUCT_WORKSTATION_SERVER_BRIEF_NAME "Workstation Server"
 #define PRODUCT_PLAYER_BRIEF_NAME "Player"
@@ -79,6 +80,8 @@
 #define VMWARE_TOOLS_SHORT_NAME MAKE_NAME("Tools")
 
 #define PRODUCT_SCALABLE_SERVER_NAME MAKE_NAME(PRODUCT_SCALABLE_SERVER_BRIEF_NAME)
+#define PRODUCT_ESXI_NAME MAKE_NAME(PRODUCT_ESXI_BRIEF_NAME)
+#define PRODUCT_VMVISOR_NAME PRODUCT_ESXI_NAME
 #define PRODUCT_WORKSTATION_NAME MAKE_NAME(PRODUCT_WORKSTATION_BRIEF_NAME)
 #define PRODUCT_WORKSTATION_SERVER_NAME MAKE_NAME(PRODUCT_WORKSTATION_SERVER_BRIEF_NAME)
 #define PRODUCT_CONSOLE_NAME MAKE_NAME("Server Console")
@@ -149,12 +152,6 @@
 
 #define PRODUCT_VMCF_NAME MAKE_NAME("VMCF")
 
-// XXX VMvisor is the underlying technology for possibly several products,
-// XXX not the product. Fix when names are decided.
-// #define PRODUCT_VMVISOR_NAME MAKE_NAME("VMvisor")
-// XXX Only one product for now so just hardcode it.
-#define PRODUCT_VMVISOR_NAME MAKE_NAME(PRODUCT_SCALABLE_SERVER_BRIEF_NAME "i")
-
 #if defined(__linux__) || defined(__FreeBSD__)
 #define PRODUCT_NETDUMP_NAME PRODUCT_GENERIC_NAME_LOWER "-netdumper"
 #else
@@ -216,10 +213,8 @@
 #endif
 
 
-#if defined(VMVISOR)
-# define PRODUCT_SHORT_NAME PRODUCT_VMVISOR_NAME
-#elif defined(VMX86_SERVER)
-# define PRODUCT_SHORT_NAME PRODUCT_SCALABLE_SERVER_NAME
+#if defined(VMX86_SERVER)
+# define PRODUCT_SHORT_NAME PRODUCT_ESXI_NAME
 #elif defined(VMX86_VMRC) /* check VMX86_VMRC before VMX86_DESKTOP */
 # define PRODUCT_SHORT_NAME PRODUCT_VMRC_NAME
 #elif defined(VMX86_GANTRY)