qemu-ga-win: Fix a typo error

There is a typo error for api 'guest-get-osinfo',
the win2025's version in WIN_10_0_SERVER_VERSION_MATRIX
should be adjusted.

Resolves: RHEL-70468 - win server 2k25 guest agent shows wrong output os version
Signed-off-by: Dehan Meng <demeng@redhat.com>
This commit is contained in:
Dehan Meng 2024-12-12 11:28:00 +08:00
parent 500db95a59
commit 70bf75c9f4
No known key found for this signature in database
GPG Key ID: 60980634121CE964
2 changed files with 44 additions and 0 deletions

View File

@ -0,0 +1,39 @@
From git@z Thu Jan 1 00:00:00 1970
Subject: [PATCH] qemu-ga-win: Fix a typo error
From: Dehan Meng <demeng@redhat.com>
Date: Tue, 10 Dec 2024 13:46:16 +0800
Message-Id: <20241210054616.260386-1-demeng@redhat.com>
To: qemu-devel@nongnu.org
Cc: demeng@redhat.com, kkostiuk@redhat.com, michael.roth@amd.com
List-Id: <qemu-devel.nongnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
There is a typo error for api 'guest-get-osinfo',
the win2025's version in WIN_10_0_SERVER_VERSION_MATRIX
should be adjusted.
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Dehan Meng <demeng@redhat.com>
---
qga/commands-win32.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index 038beb8cfa..99c026c0a0 100644
--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@@ -2088,7 +2088,7 @@ static const ga_win_10_0_t WIN_10_0_SERVER_VERSION_MATRIX[] = {
{14393, "Microsoft Windows Server 2016", "2016"},
{17763, "Microsoft Windows Server 2019", "2019"},
{20344, "Microsoft Windows Server 2022", "2022"},
- {26040, "MIcrosoft Windows Server 2025", "2025"},
+ {26040, "Microsoft Windows Server 2025", "2025"},
{ }
};
--
2.40.1

View File

@ -19,6 +19,7 @@ Requires(postun): systemd-units
Source0: https://gitlab.com/qemu-project/qemu/-/archive/v%{qemu_version}/qemu-v%{qemu_version}.tar.bz2
Patch0001: 0001-Change-Version.patch
Patch0002: 20241210_demeng_qemu_ga_win_fix_a_typo_error.mbx
BuildArch: noarch
# RHEL-57753 - mingw-qemu-ga-win failed to build on s390x
@ -68,6 +69,7 @@ This package does not need to be installed on the host OS.
%prep
%setup -q -n qemu-v%{qemu_version}
%patch0001 -p1
%patch0002 -p1
%build
@ -124,6 +126,9 @@ cp build/qga/qemu-ga-x86_64.msi $RPM_BUILD_ROOT%{mingw64_bindir}
%{mingw64_bindir}/qemu-ga*
%changelog
* Thu Dec 12 2024 Dehan Meng <demeng@redhat.com> 109.1.0-5
- RHEL-70468 - win server 2k25 guest agent shows wrong output os version
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 109.1.0-4
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018