From: John Wolfe <jwolfe@vmware.com>
Date: Tue, 21 Dec 2021 20:48:49 +0000 (-0800)
Subject: Changes to common header files not applicable to open-vm-tools.
X-Git-Tag: stable-12.0.0~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=011d680184caa26fd4d4d6fe77f77a862aee0adb;p=thirdparty%2Fopen-vm-tools.git

Changes to common header files not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
index 1ec28a51c..2db36f84d 100644
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -225,7 +225,9 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define ALL6XLINUX64          BS(OTHER6XLINUX_64), BS(OTHER6XLINUX_ARM_64)
 
 #define ALLVMKERNEL           BS(VMKERNEL),   BS(VMKERNEL5), BS(VMKERNEL6), \
-                              BS(VMKERNEL65), BS(VMKERNEL7), BS(VMKERNEL7_ARM)
+                              BS(VMKERNEL65),                               \
+                              BS(VMKERNEL7), BS(VMKERNEL7_ARM),             \
+                              BS(VMKERNEL8), BS(VMKERNEL8_ARM)
 
 #define ALLLINUX32            BS(VMKERNEL),      BS(OTHERLINUX), \
                               BS(OTHER24XLINUX), ALL26XLINUX32,  \
@@ -263,12 +265,13 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 
 #define ALLCRX                BS(CRXSYS1_64), BS(CRXPOD1_64)
 
-#define ALLARM                BS(WIN_10_ARM_64),        BS(WIN_11_ARM_64),      \
-                              BS(UBUNTU_ARM_64),        BS(PHOTON_ARM_64),      \
-                              BS(VMKERNEL7_ARM),        BS(OTHER_ARM_64),       \
-                              BS(OTHER5XLINUX_ARM_64),  BS(DEBIAN_ARM_64),      \
-                              BS(FREEBSD13_ARM_64),     BS(FREEBSD14_ARM_64),   \
-                              BS(RHEL9_ARM_64),         BS(OTHER6XLINUX_ARM_64)
+#define ALLARM                BS(WIN_10_ARM_64),        BS(WIN_11_ARM_64),       \
+                              BS(UBUNTU_ARM_64),        BS(PHOTON_ARM_64),       \
+                              BS(VMKERNEL7_ARM),        BS(VMKERNEL8_ARM),       \
+                              BS(OTHER_ARM_64),         BS(OTHER5XLINUX_ARM_64), \
+                              BS(OTHER6XLINUX_ARM_64),  BS(DEBIAN_ARM_64),       \
+                              BS(FREEBSD13_ARM_64),     BS(FREEBSD14_ARM_64),    \
+                              BS(RHEL9_ARM_64)
 
 /*
  * These constants are generated by GuestInfoGetOSName which is in
@@ -326,13 +329,13 @@ 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"
+#define STR_OS_OTHER_4X_FULL      "Other Linux 4.x kernel"
 #define STR_OS_OTHER_5X           "other5xlinux"
-#define STR_OS_OTHER_5X_FULL      "Other Linux 5.x and later kernel"
+#define STR_OS_OTHER_5X_FULL      "Other Linux 5.x 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_5X_FULL  "Other Linux 5.x 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"
diff --git a/open-vm-tools/lib/include/guest_os_tables.h b/open-vm-tools/lib/include/guest_os_tables.h
index 41e441a44..8fb5275c1 100644
--- a/open-vm-tools/lib/include/guest_os_tables.h
+++ b/open-vm-tools/lib/include/guest_os_tables.h
@@ -142,8 +142,10 @@ extern "C" {
    GOT(GUEST_OS_VMKERNEL5)           /* ESX 5.x 64-bit */                  \
    GOT(GUEST_OS_VMKERNEL6)           /* ESX 6 64-bit */                    \
    GOT(GUEST_OS_VMKERNEL65)          /* ESX 6.5 and 6.7 64-bit */          \
-   GOT(GUEST_OS_VMKERNEL7)           /* ESX 7 and later 64-bit */          \
-   GOT(GUEST_OS_VMKERNEL7_ARM)       /* ESX 7 and later Arm 64-bit */      \
+   GOT(GUEST_OS_VMKERNEL7)           /* ESX 7 64-bit */                    \
+   GOT(GUEST_OS_VMKERNEL7_ARM)       /* ESX 7 Arm 64-bit */                \
+   GOT(GUEST_OS_VMKERNEL8)           /* ESX 8 and later 64-bit */          \
+   GOT(GUEST_OS_VMKERNEL8_ARM)       /* ESX 8 and later Arm 64-bit */      \
    GOT(GUEST_OS_PHOTON_64)           /* VMware Photon 64-bit */            \
    GOT(GUEST_OS_PHOTON_ARM_64)       /* VMware Photon Arm 64-bit */        \
    GOT(GUEST_OS_ORACLE)                                                    \