Changes to common source 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 f086dc49e8a2f431ec11cc18703d4d2374496bbc..05e886f0f8823e8814cc0d1e1508a0ad23bfc5dd 100644 (file)
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -123,7 +123,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define ALLWINEIGHT           ALLWINEIGHTSERVER, ALLWINEIGHTCLIENT
 
 #define ALLWINTENSERVER64     BS(WIN_2016SRV_64), BS(WIN_2019SRV_64), \
-                              BS(WIN_2022SRV_64)
+                              BS(WIN_2022SRV_64), BS(WIN_2025SRV_64)
 
 #define ALLWINTENSERVER       ALLWINTENSERVER64
 
@@ -538,11 +538,16 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 
 #define STR_OS_WIN_2022SRV_X64 "windows2019srvNext-64"
 
+/* Windows Server 2025 */
+
+#define STR_OS_WIN_2025SRV_X64 "windows2022srvNext-64"
+
 /* THIS SPACE FOR RENT (Windows 10 official server variant names) */
 
 #define STR_OS_WIN_TENSERVER_2016_GENERIC_FULL "Windows Server 2016"
 #define STR_OS_WIN_TENSERVER_2019_GENERIC_FULL "Windows Server 2019"
 #define STR_OS_WIN_TENSERVER_2022_GENERIC_FULL "Windows Server 2022"
+#define STR_OS_WIN_TENSERVER_2025_GENERIC_FULL "Windows Server 2025"
 
 /* Microsoft Hyper-V */
 #define STR_OS_HYPER_V      "winHyperV"

diff --git a/open-vm-tools/lib/include/guest_os_tables.h b/open-vm-tools/lib/include/guest_os_tables.h
index 8e1adda0efca5aa8bb4de74fc64c12e3a9118624..943587dcc96ca6972d98ef30bc991fa8c7209037 100644 (file)
--- a/open-vm-tools/lib/include/guest_os_tables.h
+++ b/open-vm-tools/lib/include/guest_os_tables.h
@@ -62,6 +62,7 @@ extern "C" {
    GOT(GUEST_OS_WIN_2016SRV_64)      /* Windows Server 2016 64-bit */      \
    GOT(GUEST_OS_WIN_2019SRV_64)      /* Windows Server 2019 64-bit */      \
    GOT(GUEST_OS_WIN_2022SRV_64)      /* Windows Server 2022 64-bit */      \
+   GOT(GUEST_OS_WIN_2025SRV_64)      /* Windows Server 2025 64-bit */      \
    GOT(GUEST_OS_HYPER_V)             /* Microsoft Hyper-V */               \
    GOT(GUEST_OS_OS2)                                                       \
    GOT(GUEST_OS_ECOMSTATION)         /* OS/2 variant; 1.x */               \