From: John Wolfe <jwolfe@vmware.com>
Date: Fri, 9 Jul 2021 03:10:23 +0000 (-0700)
Subject: Changes to common header files not applicable to open-vm-tools.
X-Git-Tag: stable-12.0.0~153
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ae179aa40ed68f3357faabbe6f101035206cd32;p=thirdparty%2Fopen-vm-tools.git

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

Prepared the basic infrastructure for adding Windows 11 guests.
---

diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
index afc62609b..0d755d80e 100644
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -136,13 +136,17 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define ALLWINTEN64           ALLWINTENCLIENT64, ALLWINTENSERVER
 #define ALLWINTEN             ALLWINTENCLIENT, ALLWINTENSERVER
 
+#define ALLWINELEVENCLIENT64  BS(WINELEVEN_64), BS(ARM_WINELEVEN_64)
+#define ALLWINELEVEN64        ALLWINTENCLIENT64
+#define ALLWINELEVEN          ALLWINELEVENCLIENT64
+
 #define ALLHYPER_V            BS(HYPER_V)
 
-#define ALLWINVISTA_OR_HIGHER ALLWINVISTA,       ALLWINLONGHORN,     \
-                              ALLWIN2008R2,      ALLWINSEVEN,        \
-                              ALLWINEIGHTSERVER, ALLWINEIGHTCLIENT,  \
-                              ALLWINTENSERVER,   ALLWINTENCLIENT,    \
-                              ALLHYPER_V                             \
+#define ALLWINVISTA_OR_HIGHER ALLWINVISTA,           ALLWINLONGHORN,     \
+                              ALLWIN2008R2,          ALLWINSEVEN,        \
+                              ALLWINEIGHTSERVER,     ALLWINEIGHTCLIENT,  \
+                              ALLWINTENSERVER,       ALLWINTENCLIENT,    \
+                              ALLWINELEVENCLIENT64,  ALLHYPER_V          \
 
 #define ALLWINNT32            BS(WINNT),           ALLWIN2000,          \
                               ALLWINXP32,          ALLWINNET32,         \
@@ -150,12 +154,12 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
                               ALLWINSEVEN32,       ALLWINEIGHTCLIENT32, \
                               ALLWINTENCLIENT32
 
-#define ALLWINNT64            ALLWINXP64,          ALLWINNET64,       \
-                              ALLWINVISTA64,       ALLWINLONGHORN64,  \
-                              ALLWINSEVEN64,       ALLWIN2008R2_64,   \
-                              ALLWINEIGHTCLIENT64, ALLWINEIGHTSERVER, \
-                              ALLWINTENCLIENT64,   ALLWINTENSERVER,   \
-                              ALLHYPER_V
+#define ALLWINNT64            ALLWINXP64,            ALLWINNET64,       \
+                              ALLWINVISTA64,         ALLWINLONGHORN64,  \
+                              ALLWINSEVEN64,         ALLWIN2008R2_64,   \
+                              ALLWINEIGHTCLIENT64,   ALLWINEIGHTSERVER, \
+                              ALLWINTENCLIENT64,     ALLWINTENSERVER,   \
+                              ALLWINELEVENCLIENT64,  ALLHYPER_V
 
 #define ALLWINNT              ALLWINNT32, ALLWINNT64
 
@@ -522,6 +526,14 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define STR_OS_WIN_2012_MULTIPOINT_PREMIUM_FULL   "Windows MultiPoint Server 2012%s Premium"
 
 
+/*
+ * Windows on Arm
+ *
+ * Window on Arm support starts with Windows 10.
+ */
+
+#define STR_OS_ARM_WIN       "arm-windows"
+
 /*
  * Windows 10
  *
@@ -532,7 +544,6 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 
 #define STR_OS_WINTEN        "windows9"
 #define STR_OS_WINTEN_X64    "windows9-64"
-#define STR_OS_ARM_WIN       "arm-windows"
 
 #define STR_OS_WIN_TEN_GENERIC_FULL        "Windows 10"
 #define STR_OS_WIN_10_HOME_FULL            "Windows 10 Home"
@@ -542,6 +553,14 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define STR_OS_WIN_10_PRO_FULL             "Windows 10 Pro"
 #define STR_OS_WIN_10_IOTCORE_FULL         "Windows 10 IoT Core"
 
+/*
+ * Windows 11
+ *
+ * No 32-bit support.
+ */
+
+#define STR_OS_WINELEVEN_X64    "windows11-64"
+
 /* 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 822a64a61..d9f6a63e3 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_WINTEN)              /* Windows 10 32-bit */               \
    GOT(GUEST_OS_WINTEN_64)           /* Windows 10 64-bit */               \
    GOT(GUEST_OS_ARM_WINTEN_64)       /* Windows 10 Arm 64-bit */           \
+   GOT(GUEST_OS_WINELEVEN_64)        /* Windows 11 64-bit */               \
+   GOT(GUEST_OS_ARM_WINELEVEN_64)    /* Windows 11 Arm 64-bit */           \
    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 */      \