Add new GOS definitions for virtual hardware version 14.

  RHEL 8 64-bit
  CentOS 8 64-bit
  Oracle 8 64_bit
  SLES 15 64-bit
  Asianux 8 64-bit
  Other 4.x Linux Kernel
  Other 4.x Linux Kernel 64-bit
  FreeBSD 12
  FreeBSD 12 64-bit
  Darwin 18 64-bit

diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
index def97e6f8a38423d110b74ad2dd413724f2f4d72..0e3b587e8d27f8d056863197cf1128317cb4cb09 100644 (file)
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -179,17 +179,22 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 
 #define ALL3XLINUX32          BS(OTHER3XLINUX), BS(CENTOS6), BS(ORACLE6)
 
-#define ALL3XLINUX64          BS(OTHER3XLINUX_64), BS(PHOTON_64), \
+#define ALL3XLINUX64          BS(OTHER3XLINUX_64), \
                               BS(CENTOS6_64), BS(CENTOS7_64), \
                               BS(ORACLE6_64), BS(ORACLE7_64)
 
+#define ALL4XLINUX32          BS(OTHER4XLINUX)
+
+#define ALL4XLINUX64          BS(OTHER4XLINUX_64), BS(PHOTON_64), \
+                              BS(CENTOS8_64), BS(ORACLE8_64)
+
 #define ALLVMKERNEL           BS(VMKERNEL), BS(VMKERNEL5), BS(VMKERNEL6), \
                               BS(VMKERNEL65)
 
 #define ALLLINUX32            BS(OTHER24XLINUX), ALL26XLINUX32, ALL3XLINUX32, \
-                              BS(OTHERLINUX), BS(VMKERNEL)
+                              ALL4XLINUX32, BS(OTHERLINUX), BS(VMKERNEL)
 #define ALLLINUX64            BS(OTHER24XLINUX_64), ALL26XLINUX64, \
-                              ALL3XLINUX64, BS(OTHERLINUX_64)
+                              ALL3XLINUX64, ALL4XLINUX64, BS(OTHERLINUX_64)
 #define ALLLINUX              ALLLINUX32, ALLLINUX64
 #define ALLDARWIN32           BS(DARWIN9), BS(DARWIN10), BS(DARWIN11)
 #define ALLDARWIN64           BS(DARWIN9_64),  BS(DARWIN10_64), \
@@ -268,7 +273,9 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define STR_OS_OTHER_26           "other26xlinux"
 #define STR_OS_OTHER_26_FULL      "Other Linux 2.6.x kernel"
 #define STR_OS_OTHER_3X           "other3xlinux"
-#define STR_OS_OTHER_3X_FULL      "Other Linux 3.x or later kernel"
+#define STR_OS_OTHER_3X_FULL      "Other Linux 3.x kernel"
+#define STR_OS_OTHER_4X           "other4xlinux"
+#define STR_OS_OTHER_4X_FULL      "Other Linux 4.x or later kernel"
 #define STR_OS_PHOTON             "vmware-photon"
 #define STR_OS_PHOTON_FULL        "VMware Photon OS"
 #define STR_OS_PLD                "PLD"

diff --git a/open-vm-tools/lib/include/guest_os_tables.h b/open-vm-tools/lib/include/guest_os_tables.h
index 63a391691ca8fea0143642c0503b1a68279c8c32..06132b214032b2e972b94d5a0b4022772666e167 100644 (file)
--- a/open-vm-tools/lib/include/guest_os_tables.h
+++ b/open-vm-tools/lib/include/guest_os_tables.h
@@ -62,8 +62,10 @@ extern "C" {
    GOT(GUEST_OS_OTHER24XLINUX_64)                                          \
    GOT(GUEST_OS_OTHER26XLINUX)                                             \
    GOT(GUEST_OS_OTHER26XLINUX_64)                                          \
-   GOT(GUEST_OS_OTHER3XLINUX)      /* Linux 3.x and later */               \
-   GOT(GUEST_OS_OTHER3XLINUX_64)   /* Linux 3.x and later X64 */           \
+   GOT(GUEST_OS_OTHER3XLINUX)      /* Linux 3.x */                         \
+   GOT(GUEST_OS_OTHER3XLINUX_64)   /* Linux 3.x X64 */                     \
+   GOT(GUEST_OS_OTHER4XLINUX)      /* Linux 4.x and later */               \
+   GOT(GUEST_OS_OTHER4XLINUX_64)   /* Linux 4.x and later X64 */           \
    GOT(GUEST_OS_OTHERLINUX)                                                \
    GOT(GUEST_OS_OTHERLINUX_64)                                             \
    GOT(GUEST_OS_OTHER)                                                     \
@@ -209,6 +211,8 @@ extern "C" {
    GOSL(STR_OS_OTHER_26 "-64",               GUEST_OS_OTHER26XLINUX_64,       "linux.iso")            \
    GOSL(STR_OS_OTHER_3X,                     GUEST_OS_OTHER3XLINUX,           "linux.iso")            \
    GOSL(STR_OS_OTHER_3X "-64",               GUEST_OS_OTHER3XLINUX_64,        "linux.iso")            \
+   GOSL(STR_OS_OTHER_4X,                     GUEST_OS_OTHER4XLINUX,           "linux.iso")            \
+   GOSL(STR_OS_OTHER_4X "-64",               GUEST_OS_OTHER4XLINUX_64,        "linux.iso")            \
    GOSL(STR_OS_OTHER,                        GUEST_OS_OTHERLINUX,             "linuxPreGlibc25.iso")  \
    GOSL(STR_OS_OTHER "-64",                  GUEST_OS_OTHERLINUX_64,          "linuxPreGlibc25.iso")  \
    GOSL(STR_OS_RED_HAT,                      GUEST_OS_OTHER26XLINUX,          "linuxPreGlibc25.iso")  \
@@ -417,18 +421,21 @@ extern "C" {
    GOKM("rhel6-64",                             rhel6_64Guest,           TRUE) \
    GOKM("rhel7",                                rhel7Guest,              TRUE) \
    GOKM("rhel7-64",                             rhel7_64Guest,           TRUE) \
+   GOKM("rhel8-64",                             rhel8_64Guest,           TRUE) \
    GOKM("centos",                               centosGuest,             TRUE) \
    GOKM("centos-64",                            centos64Guest,           TRUE) \
    GOKM("centos6",                              centos6Guest,            TRUE) \
    GOKM("centos6-64",                           centos6_64Guest,         TRUE) \
    GOKM("centos7",                              centos7Guest,            FALSE) \
    GOKM("centos7-64",                           centos7_64Guest,         TRUE) \
+   GOKM("centos8-64",                           centos8_64Guest,         TRUE) \
    GOKM("oraclelinux",                          oracleLinuxGuest,        TRUE) \
    GOKM("oraclelinux-64",                       oracleLinux64Guest,      TRUE) \
    GOKM("oraclelinux6",                         oracleLinux6Guest,       TRUE) \
    GOKM("oraclelinux6-64",                      oracleLinux6_64Guest,    TRUE) \
    GOKM("oraclelinux7",                         oracleLinux7Guest,       FALSE) \
    GOKM("oraclelinux7-64",                      oracleLinux7_64Guest,    TRUE) \
+   GOKM("oraclelinux8-64",                      oracleLinux8_64Guest,    TRUE) \
    GOKM("suse",                                 suseGuest,               TRUE) \
    GOKM("suse-64",                              suse64Guest,             TRUE) \
    GOKM("sles",                                 slesGuest,               TRUE) \
@@ -439,6 +446,7 @@ extern "C" {
    GOKM("sles11-64",                            sles11_64Guest,          TRUE) \
    GOKM("sles12",                               sles12Guest,             TRUE) \
    GOKM("sles12-64",                            sles12_64Guest,          TRUE) \
+   GOKM("sles15-64",                            sles15_64Guest,          TRUE) \
    GOKM("mandrake",                             mandrakeGuest,           TRUE) \
    GOKM("mandrake-64",                          mandriva64Guest,         FALSE) \
    GOKM("mandriva",                             mandrivaGuest,           TRUE) \
@@ -467,6 +475,7 @@ extern "C" {
    GOKM("asianux4-64",                          asianux4_64Guest,        TRUE) \
    GOKM("asianux5-64",                          asianux5_64Guest,        TRUE) \
    GOKM("asianux7-64",                          asianux7_64Guest,        TRUE) \
+   GOKM("asianux8-64",                          asianux8_64Guest,        TRUE) \
    GOKM("nld9",                                 nld9Guest,               TRUE) \
    GOKM("oes",                                  oesGuest,                TRUE) \
    GOKM("sjds",                                 sjdsGuest,               TRUE) \
@@ -482,6 +491,8 @@ extern "C" {
    GOKM("other26xlinux-64",                     other26xLinux64Guest,    TRUE) \
    GOKM("other3xlinux",                         other3xLinuxGuest,       TRUE) \
    GOKM("other3xlinux-64",                      other3xLinux64Guest,     TRUE) \
+   GOKM("other4xlinux",                         other4xLinuxGuest,       TRUE) \
+   GOKM("other4xlinux-64",                      other4xLinux64Guest,     TRUE) \
    GOKM("linux",                                otherLinuxGuest,         FALSE) \
    GOKM("otherlinux",                           otherLinuxGuest,         TRUE) \
    GOKM("otherlinux-64",                        otherLinux64Guest,       TRUE) \
@@ -511,6 +522,7 @@ extern "C" {
    GOKM("darwin15-64",                          darwin15_64Guest,        TRUE) \
    GOKM("darwin16-64",                          darwin16_64Guest,        TRUE) \
    GOKM("darwin17-64",                          darwin17_64Guest,        TRUE) \
+   GOKM("darwin18-64",                          darwin18_64Guest,        TRUE) \
    /* ESX guests */ \
    GOKM("vmkernel",                             vmkernelGuest,           TRUE) \
    GOKM("vmkernel5",                            vmkernel5Guest,          TRUE) \
@@ -526,6 +538,8 @@ extern "C" {
    GOKM("freeBSD-64",                           freebsd64Guest,          TRUE) \
    GOKM("freeBSD11",                            freebsd11Guest,          TRUE) \
    GOKM("freeBSD11-64",                         freebsd11_64Guest,       TRUE) \
+   GOKM("freeBSD12",                            freebsd12Guest,          TRUE) \
+   GOKM("freeBSD12-64",                         freebsd12_64Guest,       TRUE) \
    GOKM("openserver5",                          openServer5Guest,        TRUE) \
    GOKM("openserver6",                          openServer6Guest,        TRUE) \
    GOKM("unixware7",                            unixWare7Guest,          TRUE) \

diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
index fa8f7b415c4761a49434ba7bc8f2311af2f37fe3..d3a86230be77e4bbfa03b8f8ad52961e8b7fbf23 100644 (file)
--- a/open-vm-tools/lib/misc/hostinfoPosix.c
+++ b/open-vm-tools/lib/misc/hostinfoPosix.c
@@ -1007,6 +1007,9 @@ HostinfoOSData(void)
       } else if (majorVersion == 3) {
          Str_Strcpy(distro, STR_OS_OTHER_3X_FULL, distroSize);
          Str_Strcpy(distroShort, STR_OS_OTHER_3X, distroSize);
+      } else if (majorVersion == 4) {
+         Str_Strcpy(distro, STR_OS_OTHER_4X_FULL, distroSize);
+         Str_Strcpy(distroShort, STR_OS_OTHER_4X, distroSize);
       } else {
          /*
           * Anything newer than this code explicitly handles returns the
@@ -1016,7 +1019,7 @@ HostinfoOSData(void)
 
          Str_Sprintf(distro, sizeof distro, "Other Linux %d.%d kernel",
                      majorVersion, Hostinfo_OSVersion(1));
-         Str_Strcpy(distroShort, STR_OS_OTHER_3X, distroSize);
+         Str_Strcpy(distroShort, STR_OS_OTHER_4X, distroSize);
       }
 
       /*