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

qga-pull-2024-03-11-2 

-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEwsLBCepDxjwUI+uE711egWG6hOcFAmXvMF4ACgkQ711egWG6
 hOd7GQ/9H11bXH5U2HZHAyEv68rCuGxHt57yjy9GfrSGAE7kqkLJ0bHwxdgoj09A
 mmaTOakOEhM5tyrkFYsROde3ta0fAwdFQXyhqpWDHG0ZwDDCAlsNsEuDd541KXbg
 qFTue26BM4EJEwTYy94nEEhOHD+2GgEAuPIsUCF6QDhrq+sBqUts1pH3uUM+E3Sg
 7HSXaF9O/RbgYR6J8FVA53tvNOP4WgOYZ/SZoFwKYzIOAblcaRgJvVbm600OqQDb
 DUZ96s6HUBVBazKx4t24WwPOkgcvYgp7b8QYj2VVfjRU2IHnFumv9A47KuEdJEUl
 meZlo8TsgfL+uSiYWiRvps1Eo1uoS2M4s4FYGbuOeABYviLr3XhJM7VarNyPp7nf
 lupuyeqydXCic5LFbjSg5gkpaIhFYQ9gANYr6JZjPPjX5G8hmgCeB6YsZT98Ygmi
 yG1np2luapvFGsDCPd8kgNpfTkKhOpKghUnTC3UESReV8mjBGhJHRQTd+lMV7YWJ
 reMRxlqrqNq69lDUnlNuSXOqPJX1qHHGkWuV9pdz641tFvw7vigE07qhvsCr8Y7b
 tAg6oDcw+1uuq2t3nHmfkzic6WTxb4lFmSpShsDu2sRA7MqWE3lCefNoS75R+xaI
 FebdrkjkFxdbazyl6oKXwxkOkAR7rFoTvVKKbG79DVMIBDiu4BE=
 =Xt/n
 -----END PGP SIGNATURE-----

Merge tag 'qga-pull-2024-03-11-2' of https://github.com/kostyanf14/qemu into staging

qga-pull-2024-03-11-2

# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCAAdFiEEwsLBCepDxjwUI+uE711egWG6hOcFAmXvMF4ACgkQ711egWG6
# hOd7GQ/9H11bXH5U2HZHAyEv68rCuGxHt57yjy9GfrSGAE7kqkLJ0bHwxdgoj09A
# mmaTOakOEhM5tyrkFYsROde3ta0fAwdFQXyhqpWDHG0ZwDDCAlsNsEuDd541KXbg
# qFTue26BM4EJEwTYy94nEEhOHD+2GgEAuPIsUCF6QDhrq+sBqUts1pH3uUM+E3Sg
# 7HSXaF9O/RbgYR6J8FVA53tvNOP4WgOYZ/SZoFwKYzIOAblcaRgJvVbm600OqQDb
# DUZ96s6HUBVBazKx4t24WwPOkgcvYgp7b8QYj2VVfjRU2IHnFumv9A47KuEdJEUl
# meZlo8TsgfL+uSiYWiRvps1Eo1uoS2M4s4FYGbuOeABYviLr3XhJM7VarNyPp7nf
# lupuyeqydXCic5LFbjSg5gkpaIhFYQ9gANYr6JZjPPjX5G8hmgCeB6YsZT98Ygmi
# yG1np2luapvFGsDCPd8kgNpfTkKhOpKghUnTC3UESReV8mjBGhJHRQTd+lMV7YWJ
# reMRxlqrqNq69lDUnlNuSXOqPJX1qHHGkWuV9pdz641tFvw7vigE07qhvsCr8Y7b
# tAg6oDcw+1uuq2t3nHmfkzic6WTxb4lFmSpShsDu2sRA7MqWE3lCefNoS75R+xaI
# FebdrkjkFxdbazyl6oKXwxkOkAR7rFoTvVKKbG79DVMIBDiu4BE=
# =Xt/n
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon 11 Mar 2024 16:25:02 GMT
# gpg:                using RSA key C2C2C109EA43C63C1423EB84EF5D5E8161BA84E7
# gpg: Good signature from "Kostiantyn Kostiuk (Upstream PR sign) <kkostiuk@redhat.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: C2C2 C109 EA43 C63C 1423  EB84 EF5D 5E81 61BA 84E7

* tag 'qga-pull-2024-03-11-2' of https://github.com/kostyanf14/qemu:
  qga-win: Add support of Windows Server 2025 in get-osinfo command
  qga/commands-win32: Do not set matrix_lookup_t/win_10_0_t arrays size
  qga/commands-win32: Declare const qualifier before type

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2024-03-11 18:42:40 +00:00
parent 67ff703c97 bfded6fe62
commit e6964ee196
1 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
qga/commands-win32.c
View File

@ -2120,49 +2120,47 @@ GuestUserList *qmp_guest_get_users(Error **errp)
typedef struct _ga_matrix_lookup_t { typedef struct _ga_matrix_lookup_t {
int major; int major;
int minor; int minor;
char const *version; const char *version;
char const *version_id; const char *version_id;
} ga_matrix_lookup_t; } ga_matrix_lookup_t;
static ga_matrix_lookup_t const WIN_VERSION_MATRIX[2][7] = { static const ga_matrix_lookup_t WIN_CLIENT_VERSION_MATRIX[] = {
{ { 5, 0, "Microsoft Windows 2000", "2000"},
/* Desktop editions */ { 5, 1, "Microsoft Windows XP", "xp"},
{ 5, 0, "Microsoft Windows 2000", "2000"}, { 6, 0, "Microsoft Windows Vista", "vista"},
{ 5, 1, "Microsoft Windows XP", "xp"}, { 6, 1, "Microsoft Windows 7" "7"},
{ 6, 0, "Microsoft Windows Vista", "vista"}, { 6, 2, "Microsoft Windows 8", "8"},
{ 6, 1, "Microsoft Windows 7" "7"}, { 6, 3, "Microsoft Windows 8.1", "8.1"},
{ 6, 2, "Microsoft Windows 8", "8"}, { }
{ 6, 3, "Microsoft Windows 8.1", "8.1"}, };
{ 0, 0, 0}
},{ static const ga_matrix_lookup_t WIN_SERVER_VERSION_MATRIX[] = {
/* Server editions */ { 5, 2, "Microsoft Windows Server 2003", "2003"},
{ 5, 2, "Microsoft Windows Server 2003", "2003"}, { 6, 0, "Microsoft Windows Server 2008", "2008"},
{ 6, 0, "Microsoft Windows Server 2008", "2008"}, { 6, 1, "Microsoft Windows Server 2008 R2", "2008r2"},
{ 6, 1, "Microsoft Windows Server 2008 R2", "2008r2"}, { 6, 2, "Microsoft Windows Server 2012", "2012"},
{ 6, 2, "Microsoft Windows Server 2012", "2012"}, { 6, 3, "Microsoft Windows Server 2012 R2", "2012r2"},
{ 6, 3, "Microsoft Windows Server 2012 R2", "2012r2"}, { },
{ 0, 0, 0},
{ 0, 0, 0}
}
}; };
typedef struct _ga_win_10_0_t { typedef struct _ga_win_10_0_t {
int first_build; int first_build;
char const *version; const char *version;
char const *version_id; const char *version_id;
} ga_win_10_0_t; } ga_win_10_0_t;
static ga_win_10_0_t const WIN_10_0_SERVER_VERSION_MATRIX[4] = { static const ga_win_10_0_t WIN_10_0_SERVER_VERSION_MATRIX[] = {
{14393, "Microsoft Windows Server 2016", "2016"}, {14393, "Microsoft Windows Server 2016", "2016"},
{17763, "Microsoft Windows Server 2019", "2019"}, {17763, "Microsoft Windows Server 2019", "2019"},
{20344, "Microsoft Windows Server 2022", "2022"}, {20344, "Microsoft Windows Server 2022", "2022"},
{0, 0} {26040, "MIcrosoft Windows Server 2025", "2025"},
{ }
}; };
static ga_win_10_0_t const WIN_10_0_CLIENT_VERSION_MATRIX[3] = { static const ga_win_10_0_t WIN_10_0_CLIENT_VERSION_MATRIX[] = {
{10240, "Microsoft Windows 10", "10"}, {10240, "Microsoft Windows 10", "10"},
{22000, "Microsoft Windows 11", "11"}, {22000, "Microsoft Windows 11", "11"},
{0, 0} { }
}; };
static void ga_get_win_version(RTL_OSVERSIONINFOEXW *info, Error **errp) static void ga_get_win_version(RTL_OSVERSIONINFOEXW *info, Error **errp)
@ -2185,16 +2183,17 @@ static void ga_get_win_version(RTL_OSVERSIONINFOEXW *info, Error **errp)
return; return;
} }
static char *ga_get_win_name(OSVERSIONINFOEXW const *os_version, bool id) static char *ga_get_win_name(const OSVERSIONINFOEXW *os_version, bool id)
{ {
DWORD major = os_version->dwMajorVersion; DWORD major = os_version->dwMajorVersion;
DWORD minor = os_version->dwMinorVersion; DWORD minor = os_version->dwMinorVersion;
DWORD build = os_version->dwBuildNumber; DWORD build = os_version->dwBuildNumber;
int tbl_idx = (os_version->wProductType != VER_NT_WORKSTATION); int tbl_idx = (os_version->wProductType != VER_NT_WORKSTATION);
ga_matrix_lookup_t const *table = WIN_VERSION_MATRIX[tbl_idx]; const ga_matrix_lookup_t *table = tbl_idx ?
ga_win_10_0_t const *win_10_0_table = tbl_idx ? WIN_SERVER_VERSION_MATRIX : WIN_CLIENT_VERSION_MATRIX;
const ga_win_10_0_t *win_10_0_table = tbl_idx ?
WIN_10_0_SERVER_VERSION_MATRIX : WIN_10_0_CLIENT_VERSION_MATRIX; WIN_10_0_SERVER_VERSION_MATRIX : WIN_10_0_CLIENT_VERSION_MATRIX;
ga_win_10_0_t const *win_10_0_version = NULL; const ga_win_10_0_t *win_10_0_version = NULL;
while (table->version != NULL) { while (table->version != NULL) {
if (major == 10 && minor == 0) { if (major == 10 && minor == 0) {
while (win_10_0_table->version != NULL) { while (win_10_0_table->version != NULL) {