From: Oliver Kurth <okurth@vmware.com>
Date: Mon, 23 Oct 2017 21:21:18 +0000 (-0700)
Subject: GOSTable: Linux 4.x kernel
X-Git-Tag: stable-10.3.0~268
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8f3f5164f277ee311543c153e6cf4d9a5c3b17c;p=thirdparty%2Fopen-vm-tools.git

GOSTable: Linux 4.x kernel

Add Linux 4.x entries to the Guest OS table.
---

diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
index def97e6f8..8dec4148c 100644
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -183,13 +183,17 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
                               BS(CENTOS6_64), BS(CENTOS7_64), \
                               BS(ORACLE6_64), BS(ORACLE7_64)
 
+#define ALL4XLINUX32          BS(OTHER4XLINUX)
+
+#define ALL4XLINUX64          BS(OTHER4XLINUX_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 +272,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 63a391691..342ba33b6 100644
--- 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")  \
diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
index 5d2123d03..b209b93ff 100644
--- a/open-vm-tools/lib/misc/hostinfoPosix.c
+++ b/open-vm-tools/lib/misc/hostinfoPosix.c
@@ -1014,6 +1014,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