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/guest_os.h b/open-vm-tools/lib/include/guest_os.h
index f0588e6665bf97336e33ec7020cc80a834e0478f..c1d0e3c965dde95a9bc3e13037d98bc3b9c20669 100644 (file)
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -72,7 +72,7 @@ typedef enum GuestOSType {
    GUEST_OS_SOLARIS9            = GUEST_OS_BASE + 34,
    GUEST_OS_SOLARIS10           = GUEST_OS_BASE + 35,
    GUEST_OS_SOLARIS10_64        = GUEST_OS_BASE + 36,
-   GUEST_OS_VMKERNEL            = GUEST_OS_BASE + 37,
+   GUEST_OS_VMKERNEL            = GUEST_OS_BASE + 37, // ESX 4.x
    GUEST_OS_DARWIN9             = GUEST_OS_BASE + 38, // Mac OS 10.5
    GUEST_OS_DARWIN9_64          = GUEST_OS_BASE + 39,
    GUEST_OS_DARWIN10            = GUEST_OS_BASE + 40, // Mac OS 10.6
@@ -92,6 +92,7 @@ typedef enum GuestOSType {
    GUEST_OS_WINEIGHT            = GUEST_OS_BASE + 54, // Windows 8
    GUEST_OS_WINEIGHT_64         = GUEST_OS_BASE + 55, // Windows 8 x64
    GUEST_OS_WINEIGHTSERVER_64   = GUEST_OS_BASE + 56, // Windows 8 Server X64
+   GUEST_OS_VMKERNEL5           = GUEST_OS_BASE + 57, // ESX 5.x and later
 } GuestOSType;
 
 
@@ -183,12 +184,18 @@ typedef enum GuestOSFamilyType {
 
 #define ALLOS2          (BS(OS2) | BS(ECOMSTATION))
 
+#define ALLVMKERNEL     (BS(VMKERNEL) | BS(VMKERNEL5))
+
 
 /*
  * These constants are generated by GuestInfoGetOSName which is in
  * the bora-vmsoft subtree.
  */
 
+/* vmkernel (ESX) */
+#define STR_OS_ESX_4               "VMware ESX 4"
+#define STR_OS_ESX_5               "VMware ESX 5"
+
 /* Linux */
 #define STR_OS_ANNVIX              "Annvix"
 #define STR_OS_ARCH                "Arch"