ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qemu-ga patch queue for soft-freeze 

* add support for Windows Server 2022 in get-osinfo command
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCgAdFiEEzqzJ4VU066u4LT+gM1PJzvEItYQFAmDt1v0ACgkQM1PJzvEI
 tYQQpQf8DVg2qrW67r6zTLz++lYd4GWlndfQgZgWXwvUeQjZXxvnGltBhXmkG6F5
 AEk2SZdZ4h1tRVo4ZDOQQY+W6UPXwBuGEmMAcM2X7365hKNyUJBNT9DBYgb+DoTx
 Z6y+wFhRsKuQEo/rBYDkjSkNvuDhTXZrQrK8wIQsIWkJbuIZf3/wEfGDz7sRnXSW
 +2PPfvw+axYHqQ2cRBoI2sCdyVcnlHZJvwzwuKFa+FrCMHCbjzP4R40qX3sRFhSM
 sAYF/19A+nvTFHA5aDQhuQSfCgY1ISIlyvfRrtWAYahuevL8OTSuwQfT2kcwWLmT
 tdpXZAN4eFJrM5d8DD92QWi4o1QTmA==
 =bB+0
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2021-07-13-tag' into staging

qemu-ga patch queue for soft-freeze

* add support for Windows Server 2022 in get-osinfo command

# gpg: Signature made Tue 13 Jul 2021 19:10:05 BST
# gpg:                using RSA key CEACC9E15534EBABB82D3FA03353C9CEF108B584
# gpg: Good signature from "Michael Roth <flukshun@gmail.com>" [full]
# gpg:                 aka "Michael Roth <mdroth@utexas.edu>" [full]
# gpg:                 aka "Michael Roth <mdroth@linux.vnet.ibm.com>" [full]
# Primary key fingerprint: CEAC C9E1 5534 EBAB B82D  3FA0 3353 C9CE F108 B584

* remotes/mdroth/tags/qga-pull-2021-07-13-tag:
  qga-win: Add support of Windows Server 2022 in get-osinfo command

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2021-07-14 16:25:18 +01:00
parent 20a9676179 c141814d4f
commit 1f966c7c11
1 changed files with 2 additions and 1 deletions

3
qga/commands-win32.c
View File

@ -2166,9 +2166,10 @@ typedef struct _ga_win_10_0_server_t {
char const *version_id;
} ga_win_10_0_server_t;
static ga_win_10_0_server_t const WIN_10_0_SERVER_VERSION_MATRIX[3] = {
static ga_win_10_0_server_t const WIN_10_0_SERVER_VERSION_MATRIX[4] = {
{14393, "Microsoft Windows Server 2016", "2016"},
{17763, "Microsoft Windows Server 2019", "2019"},
{20344, "Microsoft Windows Server 2022", "2022"},
{0, 0}
};