From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 23 Mar 2018 21:57:11 +0000 (-0700)
Subject: Changes to common header files; not applicable to open-vm-tools.
X-Git-Tag: stable-10.3.0~81
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18358aecd27f7d77b71d5ab31250edc600b7bfbc;p=thirdparty%2Fopen-vm-tools.git

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

diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
index 46b363985..dcf04ed18 100644
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -190,7 +190,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
                               BS(AMAZONLINUX2_64)
 
 #define ALLVMKERNEL           BS(VMKERNEL), BS(VMKERNEL5), BS(VMKERNEL6), \
-                              BS(VMKERNEL65)
+                              BS(VMKERNEL65), BS(VMKERNEL7)
 
 #define ALLLINUX32            BS(OTHER24XLINUX), ALL26XLINUX32, ALL3XLINUX32, \
                               ALL4XLINUX32, BS(OTHERLINUX), BS(VMKERNEL)
diff --git a/open-vm-tools/lib/include/guest_os_tables.h b/open-vm-tools/lib/include/guest_os_tables.h
index 471886081..c3f3d73b2 100644
--- a/open-vm-tools/lib/include/guest_os_tables.h
+++ b/open-vm-tools/lib/include/guest_os_tables.h
@@ -109,6 +109,7 @@ extern "C" {
    GOT(GUEST_OS_VMKERNEL5)         /* ESX 5.x */                           \
    GOT(GUEST_OS_VMKERNEL6)         /* ESX 6 */                             \
    GOT(GUEST_OS_VMKERNEL65)        /* ESX 6.5 and later */                 \
+   GOT(GUEST_OS_VMKERNEL7)         /* ESX 7 and later */                   \
    GOT(GUEST_OS_PHOTON_64)         /* VMware Photon IA 64-bit */           \
    GOT(GUEST_OS_ORACLE)                                                    \
    GOT(GUEST_OS_ORACLE_64)                                                 \
@@ -258,6 +259,7 @@ extern "C" {
    GOSL("vmkernel5",                         GUEST_OS_VMKERNEL5,              NULL)                   \
    GOSL("vmkernel6",                         GUEST_OS_VMKERNEL6,              NULL)                   \
    GOSL("vmkernel65",                        GUEST_OS_VMKERNEL65,             NULL)                   \
+   GOSL("vmkernel7",                         GUEST_OS_VMKERNEL7,              NULL)                   \
    GOSL(STR_OS_PHOTON "-64",                 GUEST_OS_PHOTON_64,              NULL)                   \
    GOSL("whistler",                          GUEST_OS_WINXP,                  "winPreVista.iso") /* old */ \
    GOSL("win2000",                           GUEST_OS_WIN2000,                "winPreVista.iso") /* old */ \
diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
index 066194424..2352e3046 100644
--- a/open-vm-tools/lib/misc/hostinfoPosix.c
+++ b/open-vm-tools/lib/misc/hostinfoPosix.c
@@ -635,7 +635,7 @@ HostinfoESX(struct utsname *buf)  // IN:
    char osNameFull[MAX_OS_FULLNAME_LEN];
 
    /* The most recent osName always goes here. */
-   Str_Strcpy(osName, "vmkernel65", sizeof osName);
+   Str_Strcpy(osName, "vmkernel7", sizeof osName);
 
    /* Handle any special cases */
    if ((buf->release[0] <= '4') && (buf->release[1] == '.')) {
@@ -645,6 +645,8 @@ HostinfoESX(struct utsname *buf)  // IN:
    } else if ((buf->release[0] >= '6') && (buf->release[1] == '.')) {
       if (buf->release[2] < '5') {
          Str_Strcpy(osName, "vmkernel6", sizeof osName);
+      } else {
+         Str_Strcpy(osName, "vmkernel65", sizeof osName);
       }
    }