From: Kruti <kpendharkar@vmware.com>
Date: Mon, 27 May 2024 06:55:32 +0000 (-0700)
Subject: Change to common header file not applicable to open-vm-tools.
X-Git-Tag: stable-12.5.0~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ab6868b2b993a18f3680416ad1257b4240c5f25;p=thirdparty%2Fopen-vm-tools.git

Change to common header file 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 29aebbbd7..56317c846 100644
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -244,7 +244,8 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define ALLVMKERNEL           BS(VMKERNEL),   BS(VMKERNEL5),      \
                               BS(VMKERNEL6),  BS(VMKERNEL65),     \
                               BS(VMKERNEL7),  BS(VMKERNEL7_ARM),  \
-                              BS(VMKERNEL8),  BS(VMKERNEL8_ARM)
+                              BS(VMKERNEL8),  BS(VMKERNEL8_ARM),  \
+                              BS(VMKERNEL9),  BS(VMKERNEL9_ARM)
 
 #define ALLLINUX32            BS(VMKERNEL),      BS(OTHERLINUX), \
                               BS(OTHER24XLINUX), ALL26XLINUX32,  \
@@ -291,6 +292,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
                               BS(WIN_12_ARM_64),                                 \
                               BS(UBUNTU_ARM_64),        BS(PHOTON_ARM_64),       \
                               BS(VMKERNEL7_ARM),        BS(VMKERNEL8_ARM),       \
+                              BS(VMKERNEL9_ARM),                                 \
                               BS(OTHER_ARM_64),         BS(DEBIAN_ARM_64),       \
                               BS(OTHER5XLINUX_ARM_64),  BS(OTHER6XLINUX_ARM_64), \
                               BS(OTHER7XLINUX_ARM_64),                           \
diff --git a/open-vm-tools/lib/include/guest_os_tables.h b/open-vm-tools/lib/include/guest_os_tables.h
index ed247f068..1f46e2f17 100644
--- a/open-vm-tools/lib/include/guest_os_tables.h
+++ b/open-vm-tools/lib/include/guest_os_tables.h
@@ -156,8 +156,10 @@ extern "C" {
    GOT(GUEST_OS_VMKERNEL65)          /* ESX 6.5 and 6.7 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_VMKERNEL8)           /* ESX 8 64-bit */                    \
+   GOT(GUEST_OS_VMKERNEL8_ARM)       /* ESX 8 Arm 64-bit */                \
+   GOT(GUEST_OS_VMKERNEL9)           /* ESX 9 and later 64-bit */          \
+   GOT(GUEST_OS_VMKERNEL9_ARM)       /* ESX 9 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)                                                    \