Changes to common header files; not applicable to open-vm-tools

GOS: Add support for Windows Server 2019

Add support for the upcoming Windows Server 2019. With this change it
is present but does not show up in a public menu. Making it appear in
a customer menu is something the hosted UI group does... when they are
ready.

diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
index 230acd2c588f3aec9c9437e5327cba0cc999b836..6969bc9485617ca27382d0a99e895be8ff9e8dad 100644 (file)
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -116,7 +116,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 
 #define ALLWINEIGHT           ALLWINEIGHTSERVER, ALLWINEIGHTCLIENT
 
-#define ALLWINTENSERVER64     BS(WINTENSERVER_64)
+#define ALLWINTENSERVER64     BS(WIN_2016SRV_64), BS(WIN_2019SRV_64)
 #define ALLWINTENSERVER       ALLWINTENSERVER64
 
 #define ALLWINTENCLIENT32     BS(WINTEN)
@@ -498,7 +498,11 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 
 /* Windows Server 2016 */
 
-#define STR_OS_WIN_TENSERVER_X64 "windows9srv-64"
+#define STR_OS_WIN_2016SRV_X64 "windows9srv-64"
+
+/* Windows Server 2019 */
+
+#define STR_OS_WIN_2019SRV_X64 "windows2019srv-64"
 
 /* THIS SPACE FOR RENT (Windows 10 official server variant names) */
 

diff --git a/open-vm-tools/lib/include/guest_os_tables.h b/open-vm-tools/lib/include/guest_os_tables.h
index 917685accffc312d4574fa8bfb1e8c5a68f4882d..c7c4fbaea6ca7503d23ff6c7d865f15237c1821d 100644 (file)
--- a/open-vm-tools/lib/include/guest_os_tables.h
+++ b/open-vm-tools/lib/include/guest_os_tables.h
@@ -53,7 +53,8 @@ extern "C" {
    GOT(GUEST_OS_WINEIGHTSERVER_64) /* Windows 8 Server X64 */              \
    GOT(GUEST_OS_WINTEN)            /* Windows 10 */                        \
    GOT(GUEST_OS_WINTEN_64)         /* Windows 10 x64 */                    \
-   GOT(GUEST_OS_WINTENSERVER_64)   /* Windows 10 Server X64 */             \
+   GOT(GUEST_OS_WIN_2016SRV_64)    /* Windows Server 2016 X64 */           \
+   GOT(GUEST_OS_WIN_2019SRV_64)    /* Windows Server 2019 X64 */           \
    GOT(GUEST_OS_HYPER_V)           /* Microsoft Hyper-V */                 \
    GOT(GUEST_OS_OS2)                                                       \
    GOT(GUEST_OS_ECOMSTATION)       /* OS/2 variant; 1.x */                 \
@@ -108,7 +109,7 @@ extern "C" {
    GOT(GUEST_OS_VMKERNEL)          /* ESX 4.x */                           \
    GOT(GUEST_OS_VMKERNEL5)         /* ESX 5.x */                           \
    GOT(GUEST_OS_VMKERNEL6)         /* ESX 6 */                             \
-   GOT(GUEST_OS_VMKERNEL65)        /* ESX 6.5 and later */                 \
+   GOT(GUEST_OS_VMKERNEL65)        /* ESX 6.5 */                           \
    GOT(GUEST_OS_VMKERNEL7)         /* ESX 7 and later */                   \
    GOT(GUEST_OS_PHOTON_64)         /* VMware Photon IA 64-bit */           \
    GOT(GUEST_OS_ORACLE)                                                    \
@@ -278,7 +279,8 @@ extern "C" {
    GOSL(STR_OS_WIN_EIGHTSERVER_X64,          GUEST_OS_WINEIGHTSERVER_64,      "windows.iso")          \
    GOSL(STR_OS_WIN_TEN,                      GUEST_OS_WINTEN,                 "windows.iso")          \
    GOSL(STR_OS_WIN_TEN_X64,                  GUEST_OS_WINTEN_64,              "windows.iso")          \
-   GOSL(STR_OS_WIN_TENSERVER_X64,            GUEST_OS_WINTENSERVER_64,        "windows.iso")          \
+   GOSL(STR_OS_WIN_2016SRV_X64,              GUEST_OS_WIN_2016SRV_64,         "windows.iso")          \
+   GOSL(STR_OS_WIN_2019SRV_X64,              GUEST_OS_WIN_2019SRV_64,         "windows.iso")          \
    GOSL(STR_OS_HYPER_V,                      GUEST_OS_HYPER_V,                NULL)                   \
    GOSL("winLonghorn64Guest",                GUEST_OS_LONGHORN_64,            "windows.iso")          \
    GOSL("winLonghornGuest",                  GUEST_OS_LONGHORN,               "windows.iso")          \