[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 8/9] qga-win: Detect OS based on Windows 10 by first build number
|
From: |
Konstantin Kostiuk |
|
Subject: |
[PULL 8/9] qga-win: Detect OS based on Windows 10 by first build number |
|
Date: |
Mon, 10 Jan 2022 15:46:43 +0200 |
From: Kostiantyn Kostiuk <konstantin@daynix.com>
Windows Server 2016, 2019, 2022 are based on Windows 10 and
have the same major and minor versions. So, the only way to
detect the proper version is to use the build number.
Before this commit, the guest agent use the last build number
for each OS, but it causes problems when new OS releases.
There are few preview versions before release, and we
can't update this list.
After this commit, the guest agent will use the first build
number. For each new preview version or release version,
Microsoft increases the build number, so we can add the number
of the first preview build and this will work until the new
OS release.
Signed-off-by: Kostiantyn Kostiuk <konstantin@daynix.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Kostiantyn Kostiuk <kkostiuk@redhat.com>
---
qga/commands-win32.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index 892082504f..3f60419419 100644
--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@@ -2195,7 +2195,7 @@ static ga_matrix_lookup_t const WIN_VERSION_MATRIX[2][8]
= {
};
typedef struct _ga_win_10_0_server_t {
- int final_build;
+ int first_build;
char const *version;
char const *version_id;
} ga_win_10_0_server_t;
@@ -2235,18 +2235,22 @@ static char *ga_get_win_name(OSVERSIONINFOEXW const
*os_version, bool id)
int tbl_idx = (os_version->wProductType != VER_NT_WORKSTATION);
ga_matrix_lookup_t const *table = WIN_VERSION_MATRIX[tbl_idx];
ga_win_10_0_server_t const *win_10_0_table =
WIN_10_0_SERVER_VERSION_MATRIX;
+ ga_win_10_0_server_t const *win_10_0_version = NULL;
while (table->version != NULL) {
if (major == 10 && minor == 0 && tbl_idx) {
while (win_10_0_table->version != NULL) {
- if (build <= win_10_0_table->final_build) {
- if (id) {
- return g_strdup(win_10_0_table->version_id);
- } else {
- return g_strdup(win_10_0_table->version);
- }
+ if (build >= win_10_0_table->first_build) {
+ win_10_0_version = win_10_0_table;
}
win_10_0_table++;
}
+ if (win_10_0_table) {
+ if (id) {
+ return g_strdup(win_10_0_version->version_id);
+ } else {
+ return g_strdup(win_10_0_version->version);
+ }
+ }
} else if (major == table->major && minor == table->minor) {
if (id) {
return g_strdup(table->version_id);
--
2.25.1
- [PULL 0/9] qemu-ga-win patches, Konstantin Kostiuk, 2022/01/10
- [PULL 1/9] MAINTAINERS: Add entry for QEMU Guest Agent Windows components, Konstantin Kostiuk, 2022/01/10
- [PULL 2/9] gqa-win: get_pci_info: Clean dev_info if handle is valid, Konstantin Kostiuk, 2022/01/10
- [PULL 3/9] gqa-win: get_pci_info: Use common 'end' label, Konstantin Kostiuk, 2022/01/10
- [PULL 5/9] gqa-win: get_pci_info: Split logic to separate functions, Konstantin Kostiuk, 2022/01/10
- [PULL 6/9] gqa-win: get_pci_info: Add g_autofree for few variables, Konstantin Kostiuk, 2022/01/10
- [PULL 7/9] gqa-win: get_pci_info: Replace 'while' with 2 calls of the function, Konstantin Kostiuk, 2022/01/10
- [PULL 8/9] qga-win: Detect OS based on Windows 10 by first build number,
Konstantin Kostiuk <=
- [PULL 4/9] gqa-win: get_pci_info: Free parent_dev_info properly, Konstantin Kostiuk, 2022/01/10
- [PULL 9/9] qga-win: Detect Windows 11 by build number, Konstantin Kostiuk, 2022/01/10
- Re: [PULL 0/9] qemu-ga-win patches, Philippe Mathieu-Daudé, 2022/01/10
- Re: [PULL 0/9] qemu-ga-win patches, Peter Maydell, 2022/01/15