From: Katy Feng <fkaty@vmware.com>
Date: Tue, 22 Aug 2023 18:11:43 +0000 (-0700)
Subject: Changes to common header files not applicable to open-vm-tools.
X-Git-Tag: stable-12.3.0~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfc6ee8aa66b3bfcdefe8020639f2b2ef03c215d;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 0dfe9a981..ceb27801a 100644
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -235,6 +235,10 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
                               BS(RHEL10_64),       BS(RHEL10_ARM_64),        \
                               BS(ORACLE10_64)
 
+#define ALL7XLINUX32          BS(OTHER7XLINUX)
+
+#define ALL7XLINUX64          BS(OTHER7XLINUX_64), BS(OTHER7XLINUX_ARM_64)
+
 #define ALLVMKERNEL           BS(VMKERNEL),   BS(VMKERNEL5),      \
                               BS(VMKERNEL6),  BS(VMKERNEL65),     \
                               BS(VMKERNEL7),  BS(VMKERNEL7_ARM),  \
@@ -243,12 +247,14 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define ALLLINUX32            BS(VMKERNEL),      BS(OTHERLINUX), \
                               BS(OTHER24XLINUX), ALL26XLINUX32,  \
                               ALL3XLINUX32,      ALL4XLINUX32,   \
-                              ALL5XLINUX32,      ALL6XLINUX32
+                              ALL5XLINUX32,      ALL6XLINUX32,   \
+                              ALL7XLINUX32
 
 #define ALLLINUX64            BS(OTHERLINUX_64), BS(OTHER24XLINUX_64), \
                               ALL26XLINUX64,     ALL3XLINUX64,         \
                               ALL4XLINUX64,      ALL5XLINUX64,         \
-                              ALL6XLINUX64,      ALLPHOTON
+                              ALL6XLINUX64,      ALL7XLINUX64,         \
+                              ALLPHOTON
 
 #define ALLLINUX              ALLLINUX32, ALLLINUX64
 
@@ -283,8 +289,9 @@ 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(OTHER_ARM_64),         BS(OTHER5XLINUX_ARM_64), \
-                              BS(OTHER6XLINUX_ARM_64),  BS(DEBIAN_ARM_64),       \
+                              BS(OTHER_ARM_64),         BS(DEBIAN_ARM_64),       \
+                              BS(OTHER5XLINUX_ARM_64),  BS(OTHER6XLINUX_ARM_64), \
+                              BS(OTHER7XLINUX_ARM_64),                           \
                               BS(FREEBSD13_ARM_64),     BS(FREEBSD14_ARM_64),    \
                               BS(ALMA_LINUX_ARM_64),    BS(ROCKY_LINUX_ARM_64),  \
                               BS(CRXSYS1_ARM_64),       BS(CRXSYS2_ARM_64),      \
@@ -349,7 +356,9 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define STR_OS_OTHER_5X           "other5xlinux"
 #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_OTHER_6X_FULL      "Other Linux 6.x kernel"
+#define STR_OS_OTHER_7X           "other7xlinux"
+#define STR_OS_OTHER_7X_FULL      "Other Linux 7.x and 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 cad5fd38a..f07c1334c 100644
--- a/open-vm-tools/lib/include/guest_os_tables.h
+++ b/open-vm-tools/lib/include/guest_os_tables.h
@@ -84,9 +84,12 @@ extern "C" {
    GOT(GUEST_OS_OTHER5XLINUX)        /* Linux 5.x 32-bit */                \
    GOT(GUEST_OS_OTHER5XLINUX_64)     /* Linux 5.x 64-bit */                \
    GOT(GUEST_OS_OTHER5XLINUX_ARM_64) /* Linux 5.x Arm 64-bit */            \
-   GOT(GUEST_OS_OTHER6XLINUX)        /* Linux 6.x and later 32-bit */      \
-   GOT(GUEST_OS_OTHER6XLINUX_64)     /* Linux 6.x and later 64-bit */      \
-   GOT(GUEST_OS_OTHER6XLINUX_ARM_64) /* Linux 6.x and later Arm 64-bit */  \
+   GOT(GUEST_OS_OTHER6XLINUX)        /* Linux 6.x 32-bit */                \
+   GOT(GUEST_OS_OTHER6XLINUX_64)     /* Linux 6.x 64-bit */                \
+   GOT(GUEST_OS_OTHER6XLINUX_ARM_64) /* Linux 6.x Arm 64-bit */            \
+   GOT(GUEST_OS_OTHER7XLINUX)        /* Linux 7.x and later 32-bit */      \
+   GOT(GUEST_OS_OTHER7XLINUX_64)     /* Linux 7.x and later 64-bit */      \
+   GOT(GUEST_OS_OTHER7XLINUX_ARM_64) /* Linux 7.x and later Arm 64-bit */  \
    GOT(GUEST_OS_OTHER)               /* Other 32-bit */                    \
    GOT(GUEST_OS_OTHER_64)            /* Other 64-bit */                    \
    GOT(GUEST_OS_OTHER_ARM_64)        /* Other Arm 64-bit */                \