New common header file: lib/include/product.h.

Move public product types enum from lib/include/productState.h to product.h
Common header file change; not applicable to open-vm-tools.

diff --git a/open-vm-tools/lib/include/product.h b/open-vm-tools/lib/include/product.h
new file mode 100644 (file)
index 0000000..87dc021
--- /dev/null
+++ b/open-vm-tools/lib/include/product.h
@@ -0,0 +1,62 @@
+/*********************************************************
+ * Copyright (C) 2017 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
+ * by the Free Software Foundation version 2.1 and no later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the Lesser GNU General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA.
+ *
+ *********************************************************/
+
+/*
+ * product.h --
+ *
+ *      This file contains the Product enum.
+ *
+ *      Products that don't want to include productState and vm_basic_types.h
+ *      and want to know about the magic values for various products should
+ *      include this file.
+ */
+
+#ifndef _PRODUCT_H_
+#define _PRODUCT_H_
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+/*
+ * Public types.
+ */
+
+typedef enum {
+   PRODUCT_GENERIC      = 0,
+   PRODUCT_WORKSTATION  = 1 << 0,
+   PRODUCT_ESX          = 1 << 1,
+   PRODUCT_PLAYER       = 1 << 2,
+   PRODUCT_TOOLS        = 1 << 3,
+   PRODUCT_VDM_CLIENT   = 1 << 4,
+   PRODUCT_CVP          = 1 << 5,
+   PRODUCT_FUSION       = 1 << 6,
+   PRODUCT_VIEW         = 1 << 7,
+   PRODUCT_VMRC         = 1 << 8,
+   PRODUCT_GANTRY       = 1 << 9,
+   PRODUCT_VMACORETESTS = 1 << 10,
+   PRODUCT_SRM          = 1 << 11,
+   /* etc */
+} Product;
+
+
+#if defined(__cplusplus)
+}  // extern "C"
+#endif
+
+#endif

diff --git a/open-vm-tools/lib/include/productState.h b/open-vm-tools/lib/include/productState.h
index b93897d7c0c578ce48613a18e3301258e7b84890..327a33f05fbf4e8f383f66d84d3b57681fe2ac65 100644 (file)
--- a/open-vm-tools/lib/include/productState.h
+++ b/open-vm-tools/lib/include/productState.h
@@ -27,32 +27,12 @@
 #define _PRODUCT_STATE_H_
 
 #include "vm_basic_types.h"
+#include "product.h"
 
 #if defined(__cplusplus)
 extern "C" {
 #endif
 
-
-/*
- * Public types.
- */
-
-typedef enum {
-   PRODUCT_GENERIC      = 0,
-   PRODUCT_WORKSTATION  = 1 << 0,
-   PRODUCT_ESX          = 1 << 1,
-   PRODUCT_PLAYER       = 1 << 2,
-   PRODUCT_TOOLS        = 1 << 3,
-   PRODUCT_VDM_CLIENT   = 1 << 4,
-   PRODUCT_CVP          = 1 << 5,
-   PRODUCT_FUSION       = 1 << 6,
-   PRODUCT_VIEW         = 1 << 7,
-   PRODUCT_VMRC         = 1 << 8,
-   PRODUCT_GANTRY       = 1 << 9,
-   PRODUCT_VMACORETESTS = 1 << 10,
-   PRODUCT_SRM          = 1 << 11,
-   /* etc */
-} Product;
 typedef uint64 ProductMask;
 #define PRODUCTMASK_HOSTED (PRODUCT_WORKSTATION |\
                             PRODUCT_PLAYER      |\

diff --git a/open-vm-tools/lib/include/vm_product_versions.h b/open-vm-tools/lib/include/vm_product_versions.h
index 7a74b62c6c40b50355111e5fa37d33c0e6035074..302664f35365bdedcf200b5a40475c9c3f1c1bae 100644 (file)
--- a/open-vm-tools/lib/include/vm_product_versions.h
+++ b/open-vm-tools/lib/include/vm_product_versions.h
@@ -197,6 +197,9 @@
                                 VPX_VERSION_MAINT
 #define VPX_VERSION_NUMERIC 6,6,0,PRODUCT_BUILD_NUMBER_NUMERIC
 
+// Last supported ESX version by VC (current -2 releases).
+#define VPX_MIN_HOST_VERSION "5.5.0"
+
 #define MAX_SUPPORTED_VI_VERSION "6.6" //from ovfTool/src/supportedVersions.h
 #define VCDB_CURRENT_SCHEMA_VERSION           660 // from PitCADatabase.h