diff options
| author | Peter Maydell | 2021-07-14 17:25:18 +0200 |
|---|---|---|
| committer | Peter Maydell | 2021-07-14 17:25:19 +0200 |
| commit | 1f966c7c11bbe77f3de5f50911de7c3a74594bfe (patch) | |
| tree | 59f43d35960a7d1f5cde665a3cc8ddedaa3e9b5a | |
| parent | Merge remote-tracking branch 'remotes/rth-gitlab/tags/pull-misc-20210713' int... (diff) | |
| parent | qga-win: Add support of Windows Server 2022 in get-osinfo command (diff) | |
| download | qemu-1f966c7c11bbe77f3de5f50911de7c3a74594bfe.tar.gz qemu-1f966c7c11bbe77f3de5f50911de7c3a74594bfe.tar.xz qemu-1f966c7c11bbe77f3de5f50911de7c3a74594bfe.zip | |
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>
| -rw-r--r-- | qga/commands-win32.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 27baf17d6c..a099acb34d 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -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} }; |