From: John Wolfe <jwolfe@vmware.com>
Date: Tue, 21 Dec 2021 20:48:50 +0000 (-0800)
Subject: Changes to common header files not applicable to open-vm-tools.
X-Git-Tag: stable-12.0.0~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b3e2e5ae06c77c122bc890a8ff8c3dede6368c9;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 cb8f26916..f372c7e5b 100644
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -144,6 +144,11 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define ALLWIN_11_64          ALLWIN_11_CLIENT64, ALLWIN_11_SERVER
 #define ALLWIN_11             ALLWIN_11_CLIENT64, ALLWIN_11_SERVER
 
+#define ALLWIN_12_CLIENT64    BS(WIN_12_64), BS(WIN_12_ARM_64)
+#define ALLWIN_12_CLIENT      ALLWIN_12_CLIENT64
+
+#define ALLWIN_12             ALLWIN_11_CLIENT64
+
 #define ALLHYPER_V            BS(HYPER_V)
 
 #define ALLWINVISTA_OR_HIGHER ALLWINVISTA,         ALLWINLONGHORN,     \
@@ -151,7 +156,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
                               ALLWINEIGHTSERVER,   ALLWINEIGHTCLIENT,  \
                               ALLWIN_10_SERVER,    ALLWIN_10_CLIENT,   \
                               ALLWIN_11_SERVER,    ALLWIN_11_CLIENT,   \
-                              ALLHYPER_V
+                              ALLWIN_12_CLIENT,    ALLHYPER_V
 
 #define ALLWINNT32            BS(WINNT),           ALLWIN2000,          \
                               ALLWINXP32,          ALLWINNET32,         \
@@ -165,7 +170,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
                               ALLWINEIGHTCLIENT64,   ALLWINEIGHTSERVER, \
                               ALLWIN_10_CLIENT64,    ALLWIN_10_SERVER,  \
                               ALLWIN_11_CLIENT64,    ALLWIN_11_SERVER,  \
-                              ALLHYPER_V
+                              ALLWIN_12_CLIENT64,    ALLHYPER_V
 
 #define ALLWINNT              ALLWINNT32, ALLWINNT64
 
@@ -267,12 +272,12 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define ALLCRX                BS(CRXSYS1_64), BS(CRXPOD1_64)
 
 #define ALLARM                BS(WIN_10_ARM_64),        BS(WIN_11_ARM_64),       \
+                              BS(WIN_12_ARM_64),        BS(RHEL9_ARM_64),        \
                               BS(UBUNTU_ARM_64),        BS(PHOTON_ARM_64),       \
                               BS(VMKERNEL7_ARM),        BS(VMKERNEL8_ARM),       \
                               BS(OTHER_ARM_64),         BS(OTHER5XLINUX_ARM_64), \
                               BS(OTHER6XLINUX_ARM_64),  BS(DEBIAN_ARM_64),       \
-                              BS(FREEBSD13_ARM_64),     BS(FREEBSD14_ARM_64),    \
-                              BS(RHEL9_ARM_64)
+                              BS(FREEBSD13_ARM_64),     BS(FREEBSD14_ARM_64)     \
 
 /*
  * These constants are generated by GuestInfoGetOSName which is in
@@ -583,6 +588,17 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define STR_OS_WIN_11_PRO_FULL             "Windows 11 Pro"
 #define STR_OS_WIN_11_IOTCORE_FULL         "Windows 11 IoT Core"
 
+/*
+ * Windows 12
+ *
+ * No 32-bit support.
+ */
+
+#define STR_OS_WIN_12        "windows12"
+#define STR_OS_WIN_12_X64    "windows12-64"
+
+/* No full names known yet */
+
 /* Windows Server 2016 */
 
 #define STR_OS_WIN_2016SRV_X64 "windows9srv-64"
diff --git a/open-vm-tools/lib/include/guest_os_tables.h b/open-vm-tools/lib/include/guest_os_tables.h
index 55ea9bd4e..c51d856d1 100644
--- a/open-vm-tools/lib/include/guest_os_tables.h
+++ b/open-vm-tools/lib/include/guest_os_tables.h
@@ -59,6 +59,8 @@ extern "C" {
    GOT(GUEST_OS_WIN_10_ARM_64)       /* Windows 10 Arm 64-bit */           \
    GOT(GUEST_OS_WIN_11_64)           /* Windows 11 64-bit */               \
    GOT(GUEST_OS_WIN_11_ARM_64)       /* Windows 11 Arm 64-bit */           \
+   GOT(GUEST_OS_WIN_12_64)           /* Windows 12 64-bit */               \
+   GOT(GUEST_OS_WIN_12_ARM_64)       /* Windows 12 Arm 64-bit */           \
    GOT(GUEST_OS_WIN2008R2_64)        /* Server 2008 R2 64-bit */           \
    GOT(GUEST_OS_WIN_8_SERVER_64)     /* Windows 8 Server 64-bit */         \
    GOT(GUEST_OS_WIN_2016SRV_64)      /* Windows Server 2016 64-bit */      \