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~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6430649b834da00a81410f7c1d87ca4e67409ada;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 ceb27801a..28e2c6a77 100644
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -86,12 +86,13 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 
 #define ALLFREEBSD32          BS(FREEBSD),    BS(FREEBSD11),  \
                               BS(FREEBSD12),  BS(FREEBSD13),  \
-                              BS(FREEBSD14)
+                              BS(FREEBSD14),  BS(FREEBSD15)
 
 #define ALLFREEBSD64          BS(FREEBSD_64),                           \
                               BS(FREEBSD11_64),  BS(FREEBSD12_64),      \
                               BS(FREEBSD13_64),  BS(FREEBSD13_ARM_64),  \
-                              BS(FREEBSD14_64),  BS(FREEBSD14_ARM_64)
+                              BS(FREEBSD14_64),  BS(FREEBSD14_ARM_64),  \
+                              BS(FREEBSD15_64),  BS(FREEBSD15_ARM_64)
 
 #define ALLFREEBSD            ALLFREEBSD32, ALLFREEBSD64
 
@@ -293,6 +294,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
                               BS(OTHER5XLINUX_ARM_64),  BS(OTHER6XLINUX_ARM_64), \
                               BS(OTHER7XLINUX_ARM_64),                           \
                               BS(FREEBSD13_ARM_64),     BS(FREEBSD14_ARM_64),    \
+                              BS(FREEBSD15_ARM_64),                              \
                               BS(ALMA_LINUX_ARM_64),    BS(ROCKY_LINUX_ARM_64),  \
                               BS(CRXSYS1_ARM_64),       BS(CRXSYS2_ARM_64),      \
                               BS(CRXPOD1_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 f07c1334c..3ddd05ed2 100644
--- a/open-vm-tools/lib/include/guest_os_tables.h
+++ b/open-vm-tools/lib/include/guest_os_tables.h
@@ -117,6 +117,9 @@ extern "C" {
    GOT(GUEST_OS_FREEBSD14)                                                 \
    GOT(GUEST_OS_FREEBSD14_64)                                              \
    GOT(GUEST_OS_FREEBSD14_ARM_64)                                          \
+   GOT(GUEST_OS_FREEBSD15)                                                 \
+   GOT(GUEST_OS_FREEBSD15_64)                                              \
+   GOT(GUEST_OS_FREEBSD15_ARM_64)                                          \
    GOT(GUEST_OS_SOLARIS_6_AND_7)                                           \
    GOT(GUEST_OS_SOLARIS8)                                                  \
    GOT(GUEST_OS_SOLARIS9)                                                  \