[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/5] qga/commands-win32: Use os_get_win_version()
From: |
Bin Meng |
Subject: |
[PATCH 3/5] qga/commands-win32: Use os_get_win_version() |
Date: |
Wed, 27 Jul 2022 15:35:40 +0800 |
From: Bin Meng <bin.meng@windriver.com>
Drop its own ga_get_win_version() implementation, and use the one
provided in oslib-win32 instead.
Signed-off-by: Bin Meng <bin.meng@windriver.com>
---
qga/commands-win32.c | 27 +--------------------------
1 file changed, 1 insertion(+), 26 deletions(-)
diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index 7ed7664715..6186f2e1f2 100644
--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@@ -2178,26 +2178,6 @@ static ga_win_10_0_t const
WIN_10_0_CLIENT_VERSION_MATRIX[3] = {
{0, 0}
};
-static void ga_get_win_version(RTL_OSVERSIONINFOEXW *info, Error **errp)
-{
- typedef NTSTATUS(WINAPI *rtl_get_version_t)(
- RTL_OSVERSIONINFOEXW *os_version_info_ex);
-
- info->dwOSVersionInfoSize = sizeof(RTL_OSVERSIONINFOEXW);
-
- HMODULE module = GetModuleHandle("ntdll");
- PVOID fun = GetProcAddress(module, "RtlGetVersion");
- if (fun == NULL) {
- error_setg(errp, QERR_QGA_COMMAND_FAILED,
- "Failed to get address of RtlGetVersion");
- return;
- }
-
- rtl_get_version_t rtl_get_version = (rtl_get_version_t)fun;
- rtl_get_version(info);
- return;
-}
-
static char *ga_get_win_name(OSVERSIONINFOEXW const *os_version, bool id)
{
DWORD major = os_version->dwMajorVersion;
@@ -2312,17 +2292,12 @@ static char *ga_get_current_arch(void)
GuestOSInfo *qmp_guest_get_osinfo(Error **errp)
{
- Error *local_err = NULL;
OSVERSIONINFOEXW os_version = {0};
bool server;
char *product_name;
GuestOSInfo *info;
- ga_get_win_version(&os_version, &local_err);
- if (local_err) {
- error_propagate(errp, local_err);
- return NULL;
- }
+ os_get_win_version(&os_version);
server = os_version.wProductType != VER_NT_WORKSTATION;
product_name = ga_get_win_product_name(errp);
--
2.34.1
- [PATCH 2/5] util/oslib-win32: Add a helper to get the Windows version, (continued)
- [PATCH 2/5] util/oslib-win32: Add a helper to get the Windows version, Bin Meng, 2022/07/27
- Re: [PATCH 2/5] util/oslib-win32: Add a helper to get the Windows version, Yan Vugenfirer, 2022/07/27
- Re: [PATCH 2/5] util/oslib-win32: Add a helper to get the Windows version, Bin Meng, 2022/07/27
- Re: [PATCH 2/5] util/oslib-win32: Add a helper to get the Windows version, Daniel P . Berrangé, 2022/07/27
- Re: [PATCH 2/5] util/oslib-win32: Add a helper to get the Windows version, Yan Vugenfirer, 2022/07/27
- Re: [PATCH 2/5] util/oslib-win32: Add a helper to get the Windows version, Bin Meng, 2022/07/27
- Re: [PATCH 2/5] util/oslib-win32: Add a helper to get the Windows version, Daniel P . Berrangé, 2022/07/27
- Re: [PATCH 2/5] util/oslib-win32: Add a helper to get the Windows version, Bin Meng, 2022/07/27
- Re: [PATCH 2/5] util/oslib-win32: Add a helper to get the Windows version, Konstantin Kostiuk, 2022/07/27
- Re: [PATCH 2/5] util/oslib-win32: Add a helper to get the Windows version, Bin Meng, 2022/07/27
[PATCH 3/5] qga/commands-win32: Use os_get_win_version(),
Bin Meng <=
[PATCH 4/5] util/qemu-sockets: Enable unix socket support on Windows, Bin Meng, 2022/07/27
[PATCH 5/5] chardev/char-socket: Update AF_UNIX for Windows, Bin Meng, 2022/07/27
Re: [PATCH 0/5] Enable unix socket support on Windows, Daniel P . Berrangé, 2022/07/27