From: John Wolfe <jwolfe@vmware.com>
Date: Fri, 11 Dec 2020 03:34:56 +0000 (-0800)
Subject: The next Windows Server OS is Windows Server 2022
X-Git-Tag: stable-11.3.0~216
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c504335ff4d11b93d6225a3f68f2faa88fe36f4a;p=thirdparty%2Fopen-vm-tools.git

The next Windows Server OS is Windows Server 2022

Originally guessed 2021 based on early data, but now Microsoft has
provided the official name and date.  Update the internals appropriately.

Add some TBD markers as a reminder to update the guest identification
code once Windows Server 2022 has an official build number.
---

diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
index e7a4c891d..1f9c9b343 100644
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -121,7 +121,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_2019SRVNEXT_64)
+                              BS(WIN_2022SRV_64)
 #define ALLWINTENSERVER       ALLWINTENSERVER64
 
 #define ALLWINTENCLIENT32     BS(WINTEN)
@@ -511,21 +511,23 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 
 #define STR_OS_WIN_2019SRV_X64 "windows2019srv-64"
 
-/* Windows Server 2021 */
+/* Windows Server 2022 */
 
-#define STR_OS_WIN_2019SRVNEXT_X64 "windows2019srvNext-64"
+#define STR_OS_WIN_2022SRV_X64 "windows2019srvNext-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"
 
 /* Win 10 server versions are distinguished by major build number */
 #define WIN10SERVER2016_BUILD14393 14393
 #define WIN10SERVER2019_BUILD17763 17763
+#define WIN10SERVER2022_BUILDxxxxx "TBD"
 
 /* Microsoft Hyper-V */
-#define STR_OS_HYPER_V "winHyperV"
+#define STR_OS_HYPER_V      "winHyperV"
 #define STR_OS_HYPER_V_FULL "Hyper-V Server"
 
 /* Windows Future/Unknown */
diff --git a/open-vm-tools/lib/include/guest_os_tables.h b/open-vm-tools/lib/include/guest_os_tables.h
index 11d14b303..345b1b04e 100644
--- a/open-vm-tools/lib/include/guest_os_tables.h
+++ b/open-vm-tools/lib/include/guest_os_tables.h
@@ -55,7 +55,7 @@ extern "C" {
    GOT(GUEST_OS_WINTEN_64)         /* Windows 10 x64 */                    \
    GOT(GUEST_OS_WIN_2016SRV_64)    /* Windows Server 2016 X64 */           \
    GOT(GUEST_OS_WIN_2019SRV_64)    /* Windows Server 2019 X64 */           \
-   GOT(GUEST_OS_WIN_2019SRVNEXT_64)/* Windows Server 2021 X64 */           \
+   GOT(GUEST_OS_WIN_2022SRV_64)    /* Windows Server 2022 X64 */           \
    GOT(GUEST_OS_HYPER_V)           /* Microsoft Hyper-V */                 \
    GOT(GUEST_OS_OS2)                                                       \
    GOT(GUEST_OS_ECOMSTATION)       /* OS/2 variant; 1.x */                 \