From: Katy Feng <fkaty@vmware.com>
Date: Tue, 22 Aug 2023 18:11:41 +0000 (-0700)
Subject: Changes to common header files not applicable to open-vm-tools.
X-Git-Tag: stable-12.3.0~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=549f04fabbba57a33b8983e02064e216b8393485;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 a925ec961..996d6a18c 100644
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -226,7 +226,8 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
                               BS(RHEL9_64),        BS(RHEL9_ARM_64),        \
                               BS(ROCKY_LINUX_64),  BS(ROCKY_LINUX_ARM_64),  \
                               BS(ALMA_LINUX_64),   BS(ALMA_LINUX_ARM_64),   \
-                              BS(CRXSYS1_ARM_64),  BS(CRXPOD1_ARM_64)
+                              BS(CRXSYS1_ARM_64),  BS(CRXPOD1_ARM_64),      \
+                              BS(CRXSYS2_64),      BS(CRXSYS2_ARM_64)
 
 #define ALL6XLINUX32          BS(OTHER6XLINUX)
 
@@ -272,8 +273,9 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 
 #define ALLOS2                BS(OS2), ALLECOMSTATION
 
-#define ALLCRX                BS(CRXSYS1_64),     BS(CRXPOD1_64),   \
-                              BS(CRXSYS1_ARM_64), BS(CRXPOD1_ARM_64)
+#define ALLCRX                BS(CRXSYS1_64),     BS(CRXPOD1_64),     \
+                              BS(CRXSYS1_ARM_64), BS(CRXPOD1_ARM_64), \
+                              BS(CRXSYS2_64),     BS(CRXSYS2_ARM_64)
 
 #define ALLARM                BS(WIN_10_ARM_64),        BS(WIN_11_ARM_64),       \
                               BS(WIN_12_ARM_64),        BS(RHEL9_ARM_64),        \
@@ -283,7 +285,8 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
                               BS(OTHER6XLINUX_ARM_64),  BS(DEBIAN_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(CRXPOD1_ARM_64)
+                              BS(CRXSYS1_ARM_64),       BS(CRXPOD1_ARM_64),      \
+                              BS(CRXSYS2_ARM_64)
 
 /*
  * Architecture prefixes. No prefix implies the X86 architecture.
diff --git a/open-vm-tools/lib/include/guest_os_tables.h b/open-vm-tools/lib/include/guest_os_tables.h
index 32bd88915..b33cf95f1 100644
--- a/open-vm-tools/lib/include/guest_os_tables.h
+++ b/open-vm-tools/lib/include/guest_os_tables.h
@@ -169,6 +169,8 @@ extern "C" {
    GOT(GUEST_OS_AMAZONLINUX3_64)                                           \
    GOT(GUEST_OS_CRXSYS1_64)        /* VMware CRX system VM 1.0 64-bit */   \
    GOT(GUEST_OS_CRXSYS1_ARM_64)    /* VMware CRX system VM 1.0 Arm 64-bit */ \
+   GOT(GUEST_OS_CRXSYS2_64)        /* VMware CRX system VM 2.0 64-bit */   \
+   GOT(GUEST_OS_CRXSYS2_ARM_64)    /* VMware CRX system VM 2.0 Arm 64-bit */ \
    GOT(GUEST_OS_CRXPOD1_64)        /* VMware CRX pod VM 1.0 64-bit */      \
    GOT(GUEST_OS_CRXPOD1_ARM_64)    /* VMware CRX pod VM 1.0 Arm 64-bit */  \
    GOT(GUEST_OS_LINUX_MINT_64)                                             \