From: Oliver Kurth <okurth@vmware.com>
Date: Mon, 23 Oct 2017 21:21:20 +0000 (-0700)
Subject: Add new GOS definitions in HWV=14
X-Git-Tag: stable-10.3.0~256
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=729acd5603c62d514d5e244faf9e508db2b9efd7;p=thirdparty%2Fopen-vm-tools.git

Add new GOS definitions in HWV=14
---

diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
index 8dec4148c..0d8bad37f 100644
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -180,7 +180,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define ALL3XLINUX32          BS(OTHER3XLINUX), BS(CENTOS6), BS(ORACLE6)
 
 #define ALL3XLINUX64          BS(OTHER3XLINUX_64), BS(PHOTON_64), \
-                              BS(CENTOS6_64), BS(CENTOS7_64), \
+                              BS(CENTOS6_64), BS(CENTOS7_64), BS(CENTOS8_64),\
                               BS(ORACLE6_64), BS(ORACLE7_64)
 
 #define ALL4XLINUX32          BS(OTHER4XLINUX)
diff --git a/open-vm-tools/lib/include/guest_os_tables.h b/open-vm-tools/lib/include/guest_os_tables.h
index 342ba33b6..06132b214 100644
--- a/open-vm-tools/lib/include/guest_os_tables.h
+++ b/open-vm-tools/lib/include/guest_os_tables.h
@@ -421,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) \
@@ -443,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) \
@@ -471,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) \
@@ -486,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) \
@@ -515,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) \
@@ -530,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) \