From: Oliver Kurth <okurth@vmware.com>
Date: Thu, 28 Mar 2019 19:43:00 +0000 (-0700)
Subject: GOS Table: Add Linux 5.x
X-Git-Tag: stable-11.0.0~159
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c65bb4057bbd8d4b96f8b1bedfc273669357cfd8;p=thirdparty%2Fopen-vm-tools.git

GOS Table: Add Linux 5.x

Linux 5.x is here!  Add it to our supported guests list.
---

diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
index 701d1e718..3d4394f7b 100644
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -190,15 +190,26 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
                               BS(CRXSYS1_64), BS(CRXPOD1_64), \
                               BS(AMAZONLINUX2_64), BS(LINUX_MINT_64)
 
+#define ALL5XLINUX32          BS(OTHER5XLINUX)
+
+#define ALL5XLINUX64          BS(OTHER5XLINUX_64)
+
 #define ALLVMKERNEL           BS(VMKERNEL), BS(VMKERNEL5), BS(VMKERNEL6), \
                               BS(VMKERNEL65), BS(VMKERNEL7)
 
-#define ALLLINUX32            BS(OTHER24XLINUX), ALL26XLINUX32, ALL3XLINUX32, \
-                              ALL4XLINUX32, BS(OTHERLINUX), BS(VMKERNEL)
-#define ALLLINUX64            BS(OTHER24XLINUX_64), ALL26XLINUX64, \
-                              ALL3XLINUX64, ALL4XLINUX64, BS(OTHERLINUX_64)
+#define ALLLINUX32            BS(VMKERNEL), BS(OTHERLINUX), \
+                              BS(OTHER24XLINUX), \
+                              ALL26XLINUX32, ALL3XLINUX32, ALL4XLINUX32, \
+                              ALL5XLINUX32
+
+#define ALLLINUX64            BS(OTHERLINUX_64), BS(OTHER24XLINUX_64), \
+                              ALL26XLINUX64, ALL3XLINUX64, ALL4XLINUX64, \
+                              ALL5XLINUX64
+
 #define ALLLINUX              ALLLINUX32, ALLLINUX64
+
 #define ALLDARWIN32           BS(DARWIN9), BS(DARWIN10), BS(DARWIN11)
+
 #define ALLDARWIN64           BS(DARWIN9_64),  BS(DARWIN10_64), \
                               BS(DARWIN11_64), BS(DARWIN12_64), \
                               BS(DARWIN13_64), BS(DARWIN14_64), \
@@ -207,6 +218,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
                               BS(DARWIN19_64), BS(DARWIN20_64)
 
 #define ALLDARWIN             ALLDARWIN32, ALLDARWIN64
+
 #define ALL64                 ALLWIN64, ALLLINUX64,               \
                               BS(SOLARIS10_64), BS(SOLARIS11_64), \
                               BS(FREEBSD_64), BS(FREEBSD11_64),   \
@@ -214,6 +226,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
                               ALLDARWIN64, ALLVMKERNEL
 
 #define ALLECOMSTATION        BS(ECOMSTATION), BS(ECOMSTATION2)
+
 #define ALLOS2                BS(OS2), ALLECOMSTATION
 
 /*
@@ -280,7 +293,9 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define STR_OS_OTHER_3X           "other3xlinux"
 #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_OTHER_4X_FULL      "Other Linux 4.x"
+#define STR_OS_OTHER_5X           "other5xlinux"
+#define STR_OS_OTHER_5X_FULL      "Other Linux 5.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 7a75738d7..6e056a789 100644
--- a/open-vm-tools/lib/include/guest_os_tables.h
+++ b/open-vm-tools/lib/include/guest_os_tables.h
@@ -59,16 +59,18 @@ extern "C" {
    GOT(GUEST_OS_OS2)                                                       \
    GOT(GUEST_OS_ECOMSTATION)       /* OS/2 variant; 1.x */                 \
    GOT(GUEST_OS_ECOMSTATION2)      /* OS/2 variant; 2.x */                 \
+   GOT(GUEST_OS_OTHERLINUX)                                                \
+   GOT(GUEST_OS_OTHERLINUX_64)                                             \
    GOT(GUEST_OS_OTHER24XLINUX)                                             \
    GOT(GUEST_OS_OTHER24XLINUX_64)                                          \
    GOT(GUEST_OS_OTHER26XLINUX)                                             \
    GOT(GUEST_OS_OTHER26XLINUX_64)                                          \
    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_OTHER4XLINUX)      /* Linux 4.x */                         \
+   GOT(GUEST_OS_OTHER4XLINUX_64)   /* Linux 4.x X64 */                     \
+   GOT(GUEST_OS_OTHER5XLINUX)      /* Linux 5.x and later */               \
+   GOT(GUEST_OS_OTHER5XLINUX_64)   /* Linux 5.x and later X64 */           \
    GOT(GUEST_OS_OTHER)                                                     \
    GOT(GUEST_OS_OTHER_64)                                                  \
    GOT(GUEST_OS_UBUNTU)                                                    \