From: John Wolfe <jwolfe@vmware.com>
Date: Mon, 7 Jun 2021 15:25:09 +0000 (-0700)
Subject: GOS support: Add Linux 6.x support.
X-Git-Tag: stable-12.0.0~182
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3de1afdd4d802596bffdbbb63ec6708fafcf51a;p=thirdparty%2Fopen-vm-tools.git

GOS support: Add Linux 6.x support.
---

diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
index 3b4ffa30c..1c43e38b8 100644
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -209,18 +209,22 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define ALL5XLINUX64          BS(OTHER5XLINUX_64), BS(ARM_OTHER5XLINUX_64), \
                               BS(ARM_DEBIAN_64),   BS(ARM_UBUNTU_64)
 
+#define ALL6XLINUX32          BS(OTHER6XLINUX)
+
+#define ALL6XLINUX64          BS(OTHER6XLINUX_64), BS(ARM_OTHER6XLINUX_64)
+
 #define ALLVMKERNEL           BS(VMKERNEL),   BS(VMKERNEL5), BS(VMKERNEL6), \
                               BS(VMKERNEL65), BS(VMKERNEL7), BS(ARM_VMKERNEL7)
 
 #define ALLLINUX32            BS(VMKERNEL), BS(OTHERLINUX), \
                               BS(OTHER24XLINUX), \
                               ALL26XLINUX32, ALL3XLINUX32, ALL4XLINUX32, \
-                              ALL5XLINUX32
+                              ALL5XLINUX32, ALL6XLINUX32
 
 #define ALLLINUX64            BS(OTHERLINUX_64), BS(OTHER24XLINUX_64), \
                               ALL26XLINUX64,     ALL3XLINUX64,         \
                               ALL4XLINUX64,      ALL5XLINUX64,         \
-                              ALLPHOTON
+                              ALL6XLINUX64,      ALLPHOTON
 
 #define ALLLINUX              ALLLINUX32, ALLLINUX64
 
@@ -312,8 +316,12 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #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 and later kernel"
+#define STR_OS_OTHER_6X           "other6xlinux"
+#define STR_OS_OTHER_6X_FULL      "Other Linux 6.x and later kernel"
 #define STR_OS_ARM_OTHER_5X       "arm-other5xlinux"
 #define STR_OS_ARM_OTHER_5X_FULL  "Other Linux 5.x and later kernel Arm"
+#define STR_OS_ARM_OTHER_6X       "arm-other6xlinux"
+#define STR_OS_ARM_OTHER_6X_FULL  "Other Linux 6.x and later kernel Arm"
 #define STR_OS_PHOTON             "vmware-photon"
 #define STR_OS_ARM_PHOTON         "arm-vmware-photon"
 #define STR_OS_PHOTON_FULL        "VMware Photon OS"
diff --git a/open-vm-tools/lib/include/guest_os_tables.h b/open-vm-tools/lib/include/guest_os_tables.h
index 9fc7357b0..ea9298aad 100644
--- a/open-vm-tools/lib/include/guest_os_tables.h
+++ b/open-vm-tools/lib/include/guest_os_tables.h
@@ -80,6 +80,9 @@ extern "C" {
    GOT(GUEST_OS_OTHER5XLINUX)        /* Linux 5.x and later 32-bit */      \
    GOT(GUEST_OS_OTHER5XLINUX_64)     /* Linux 5.x and later 64-bit */      \
    GOT(GUEST_OS_ARM_OTHER5XLINUX_64) /* Linux 5.x and later Arm 64-bit */  \
+   GOT(GUEST_OS_OTHER6XLINUX)        /* Linux 5.x and later 32-bit */      \
+   GOT(GUEST_OS_OTHER6XLINUX_64)     /* Linux 5.x and later 64-bit */      \
+   GOT(GUEST_OS_ARM_OTHER6XLINUX_64) /* Linux 5.x and later Arm 64-bit */  \
    GOT(GUEST_OS_OTHER)                                                     \
    GOT(GUEST_OS_OTHER_64)            /* Other 64-bit */                    \
    GOT(GUEST_OS_ARM_OTHER_64)        /* Other Arm 64-bit */                \