From nobody Tue Nov 26 04:50:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1710176327; cv=none; d=zohomail.com; s=zohoarc; b=NbHkNVqvhhicWiV2AypzwBrLd1JVz3KKH7gr1rSZyeIrmFBV3WqWbtw6a0WlsZSx9Ua526GgBPu2BhxGUCc7YPTWBwzRs9gzQ3ZYiJRgfmsPJ4XGcDjjM+JSaBXm0WCeoBVwakkSPJvlYtNYsIOYeZMhdDT5EydE/48kUcVX3W8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710176327; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=9d+LTN83r2rY7ixxhzwmhw6wv45EVmHvQQDqrHorbps=; b=mcAnF3tJady9HkaE6XIi1Nas7JE9tD4G6uKjx4QelyMX0Smv2B63tsGQG/ShLZ7AMTeRo1/T+kkHsqOncMdwIyNRj+YtmGjYgOXztyyvaEGmsH4JuPll+46XhsMiv2K43qiek37KMD9hmNtZZhWhYbUF/vq6x8Xniyo6bqvViZc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1710176327333710.0487537135244; Mon, 11 Mar 2024 09:58:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rjiy0-00056G-Ac; Mon, 11 Mar 2024 12:57:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rjixz-00054C-0p for qemu-devel@nongnu.org; Mon, 11 Mar 2024 12:57:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rjixx-0005zf-E9 for qemu-devel@nongnu.org; Mon, 11 Mar 2024 12:57:34 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-15-hJGUVA3GPtWOsZbDXTzDCg-1; Mon, 11 Mar 2024 12:57:29 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 494318007A2; Mon, 11 Mar 2024 16:57:29 +0000 (UTC) Received: from srv1.redhat.com (unknown [10.45.224.122]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4E73D10F43; Mon, 11 Mar 2024 16:57:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710176252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9d+LTN83r2rY7ixxhzwmhw6wv45EVmHvQQDqrHorbps=; b=b5ypW+GaLNnf0Q3Lt53qoxnhJTRMdyYoUeFfvXUHVHuH3MmC05LjneLwenwE2f4sogCc3C YMaXYeGlO4h5X0gOBNOwg1R2C7JvdV7mQsXXMf/ZQO4HGxsT8mOOdLqB8/n130pOe9zRhq 0COYOzDTW4TgCHvjCpNC5G+dJ/TFxrA= X-MC-Unique: hJGUVA3GPtWOsZbDXTzDCg-1 From: Konstantin Kostiuk To: qemu-devel@nongnu.org, Peter Maydell , Stefan Hajnoczi Subject: [PULL 1/3] qga/commands-win32: Declare const qualifier before type Date: Mon, 11 Mar 2024 18:57:22 +0200 Message-ID: <20240311165724.176168-2-kkostiuk@redhat.com> In-Reply-To: <20240311165724.176168-1-kkostiuk@redhat.com> References: <20240311165724.176168-1-kkostiuk@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=kkostiuk@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.029, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1710176328992100001 From: Philippe Mathieu-Daud=C3=A9 Most of the code base use the 'const' qualifier *before* the type being qualified. Use the same style to unify. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20240222152835.72095-2-philmd@linaro.org> Reviewed-by: Konstantin Kostiuk Reviewed-by: Yan Vugenfirer Link: https://lore.kernel.org/r/20240304134532.28506-2-kkostiuk@redhat.com Signed-off-by: Konstantin Kostiuk --- qga/commands-win32.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index a1015757d8..79b5a580c9 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -2120,11 +2120,11 @@ GuestUserList *qmp_guest_get_users(Error **errp) typedef struct _ga_matrix_lookup_t { int major; int minor; - char const *version; - char const *version_id; + const char *version; + const char *version_id; } ga_matrix_lookup_t; =20 -static ga_matrix_lookup_t const WIN_VERSION_MATRIX[2][7] =3D { +static const ga_matrix_lookup_t WIN_VERSION_MATRIX[2][7] =3D { { /* Desktop editions */ { 5, 0, "Microsoft Windows 2000", "2000"}, @@ -2148,18 +2148,18 @@ static ga_matrix_lookup_t const WIN_VERSION_MATRIX[= 2][7] =3D { =20 typedef struct _ga_win_10_0_t { int first_build; - char const *version; - char const *version_id; + const char *version; + const char *version_id; } ga_win_10_0_t; =20 -static ga_win_10_0_t const WIN_10_0_SERVER_VERSION_MATRIX[4] =3D { +static const ga_win_10_0_t WIN_10_0_SERVER_VERSION_MATRIX[4] =3D { {14393, "Microsoft Windows Server 2016", "2016"}, {17763, "Microsoft Windows Server 2019", "2019"}, {20344, "Microsoft Windows Server 2022", "2022"}, {0, 0} }; =20 -static ga_win_10_0_t const WIN_10_0_CLIENT_VERSION_MATRIX[3] =3D { +static const ga_win_10_0_t WIN_10_0_CLIENT_VERSION_MATRIX[3] =3D { {10240, "Microsoft Windows 10", "10"}, {22000, "Microsoft Windows 11", "11"}, {0, 0} @@ -2185,16 +2185,16 @@ static void ga_get_win_version(RTL_OSVERSIONINFOEXW= *info, Error **errp) return; } =20 -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 =3D os_version->dwMajorVersion; DWORD minor =3D os_version->dwMinorVersion; DWORD build =3D os_version->dwBuildNumber; int tbl_idx =3D (os_version->wProductType !=3D VER_NT_WORKSTATION); - ga_matrix_lookup_t const *table =3D WIN_VERSION_MATRIX[tbl_idx]; - ga_win_10_0_t const *win_10_0_table =3D tbl_idx ? + const ga_matrix_lookup_t *table =3D WIN_VERSION_MATRIX[tbl_idx]; + const ga_win_10_0_t *win_10_0_table =3D tbl_idx ? WIN_10_0_SERVER_VERSION_MATRIX : WIN_10_0_CLIENT_VERSION_MATRIX; - ga_win_10_0_t const *win_10_0_version =3D NULL; + const ga_win_10_0_t *win_10_0_version =3D NULL; while (table->version !=3D NULL) { if (major =3D=3D 10 && minor =3D=3D 0) { while (win_10_0_table->version !=3D NULL) { --=20 2.44.0 From nobody Tue Nov 26 04:50:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1710176331; cv=none; d=zohomail.com; s=zohoarc; b=kShaU51ATE9LIJta8RyTh5yz4+NpwetI2RHHQFc/trnIHJGqpRvFtp9Ha5e41fNBS1QIBZDscn8UVSSVHse7q24LooRWkE4bUemWdC6j6UEu4skhTyyeRUy70bIsuweX+eKGccRvRt/FWInjgVtKjLMjguJrcrTzq6yhcMkRWpI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710176331; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=bQ4JxGLRjBFYllQ7HhDkk3GD2IJwmIxf2BTco2CgMWw=; b=HcMyl87e5z8bk3gXhmML6mdD9Hv5p6oXoMzhbnhcq2Rn0tlJZ0my8/FCudA2ZwQkB4mFRcaX1yVGiJkb68aXnpBANr2d3n88Y5IpzN6XTXgVjYkg4XO3QA0RBMMGjoX32nr/BLww61/p7eqdvxbK7JA9E99GnRI5ZXKrWZYAH+4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1710176331410201.67538676902518; Mon, 11 Mar 2024 09:58:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rjiy7-00057Q-SE; Mon, 11 Mar 2024 12:57:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rjiy5-00057B-QL for qemu-devel@nongnu.org; Mon, 11 Mar 2024 12:57:42 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rjiy4-00061u-2M for qemu-devel@nongnu.org; Mon, 11 Mar 2024 12:57:41 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-120-hLO8EQKhOi6KlCp97Rg7Qg-1; Mon, 11 Mar 2024 12:57:30 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 86D75855300; Mon, 11 Mar 2024 16:57:30 +0000 (UTC) Received: from srv1.redhat.com (unknown [10.45.224.122]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8D8D610E49; Mon, 11 Mar 2024 16:57:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710176259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bQ4JxGLRjBFYllQ7HhDkk3GD2IJwmIxf2BTco2CgMWw=; b=TOqMJ/ed7U32K7zhlOzMHb4Z+QcCZCkXtyy1JzF1ne0aofsDUuvVBuiI5LsZJrK7kGzBxT o9z/V6JTcWdNEbI83lrxLXAxgYrAcq26gyS0WYhWEIML0ehblnc0GItDT6agJ45VbwXyQa MdEifqCNinoIiDGG5bxDvsP3/88mVrI= X-MC-Unique: hLO8EQKhOi6KlCp97Rg7Qg-1 From: Konstantin Kostiuk To: qemu-devel@nongnu.org, Peter Maydell , Stefan Hajnoczi Subject: [PULL 2/3] qga/commands-win32: Do not set matrix_lookup_t/win_10_0_t arrays size Date: Mon, 11 Mar 2024 18:57:23 +0200 Message-ID: <20240311165724.176168-3-kkostiuk@redhat.com> In-Reply-To: <20240311165724.176168-1-kkostiuk@redhat.com> References: <20240311165724.176168-1-kkostiuk@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=kkostiuk@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.029, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1710176332912100002 From: Philippe Mathieu-Daud=C3=A9 ga_get_win_name() iterates over all elements in the arrays by checking the 'version' field is non-NULL. Since the arrays are guarded by a NULL terminating element, we don't need to specify their size: static char *ga_get_win_name(...) { ... const ga_matrix_lookup_t *table =3D WIN_VERSION_MATRIX[tbl_idx]; const ga_win_10_0_t *win_10_0_table =3D ... ... while (table->version !=3D NULL) { ^^^^^^^^^^^^^^^ while (win_10_0_table->version !=3D NULL) { ^^^^^^^^^^^^^^^ This will simplify maintenance when adding new entries to these arrays. Split WIN_VERSION_MATRIX into WIN_CLIENT_VERSION_MATRIX and WIN_SERVER_VERSION_MATRIX because multidimensional array must have bounds for all dimensions except the first. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20240222152835.72095-3-philmd@linaro.org> Reviewed-by: Konstantin Kostiuk Reviewed-by: Yan Vugenfirer Link: https://lore.kernel.org/r/20240304134532.28506-3-kkostiuk@redhat.com Signed-off-by: Konstantin Kostiuk --- qga/commands-win32.c | 48 +++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 79b5a580c9..659dfb624a 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -2124,26 +2124,23 @@ typedef struct _ga_matrix_lookup_t { const char *version_id; } ga_matrix_lookup_t; =20 -static const ga_matrix_lookup_t WIN_VERSION_MATRIX[2][7] =3D { - { - /* Desktop editions */ - { 5, 0, "Microsoft Windows 2000", "2000"}, - { 5, 1, "Microsoft Windows XP", "xp"}, - { 6, 0, "Microsoft Windows Vista", "vista"}, - { 6, 1, "Microsoft Windows 7" "7"}, - { 6, 2, "Microsoft Windows 8", "8"}, - { 6, 3, "Microsoft Windows 8.1", "8.1"}, - { 0, 0, 0} - },{ - /* Server editions */ - { 5, 2, "Microsoft Windows Server 2003", "2003"}, - { 6, 0, "Microsoft Windows Server 2008", "2008"}, - { 6, 1, "Microsoft Windows Server 2008 R2", "2008r2"}, - { 6, 2, "Microsoft Windows Server 2012", "2012"}, - { 6, 3, "Microsoft Windows Server 2012 R2", "2012r2"}, - { 0, 0, 0}, - { 0, 0, 0} - } +static const ga_matrix_lookup_t WIN_CLIENT_VERSION_MATRIX[] =3D { + { 5, 0, "Microsoft Windows 2000", "2000"}, + { 5, 1, "Microsoft Windows XP", "xp"}, + { 6, 0, "Microsoft Windows Vista", "vista"}, + { 6, 1, "Microsoft Windows 7" "7"}, + { 6, 2, "Microsoft Windows 8", "8"}, + { 6, 3, "Microsoft Windows 8.1", "8.1"}, + { } +}; + +static const ga_matrix_lookup_t WIN_SERVER_VERSION_MATRIX[] =3D { + { 5, 2, "Microsoft Windows Server 2003", "2003"}, + { 6, 0, "Microsoft Windows Server 2008", "2008"}, + { 6, 1, "Microsoft Windows Server 2008 R2", "2008r2"}, + { 6, 2, "Microsoft Windows Server 2012", "2012"}, + { 6, 3, "Microsoft Windows Server 2012 R2", "2012r2"}, + { }, }; =20 typedef struct _ga_win_10_0_t { @@ -2152,17 +2149,17 @@ typedef struct _ga_win_10_0_t { const char *version_id; } ga_win_10_0_t; =20 -static const ga_win_10_0_t WIN_10_0_SERVER_VERSION_MATRIX[4] =3D { +static const ga_win_10_0_t WIN_10_0_SERVER_VERSION_MATRIX[] =3D { {14393, "Microsoft Windows Server 2016", "2016"}, {17763, "Microsoft Windows Server 2019", "2019"}, {20344, "Microsoft Windows Server 2022", "2022"}, - {0, 0} + { } }; =20 -static const ga_win_10_0_t WIN_10_0_CLIENT_VERSION_MATRIX[3] =3D { +static const ga_win_10_0_t WIN_10_0_CLIENT_VERSION_MATRIX[] =3D { {10240, "Microsoft Windows 10", "10"}, {22000, "Microsoft Windows 11", "11"}, - {0, 0} + { } }; =20 static void ga_get_win_version(RTL_OSVERSIONINFOEXW *info, Error **errp) @@ -2191,7 +2188,8 @@ static char *ga_get_win_name(const OSVERSIONINFOEXW *= os_version, bool id) DWORD minor =3D os_version->dwMinorVersion; DWORD build =3D os_version->dwBuildNumber; int tbl_idx =3D (os_version->wProductType !=3D VER_NT_WORKSTATION); - const ga_matrix_lookup_t *table =3D WIN_VERSION_MATRIX[tbl_idx]; + const ga_matrix_lookup_t *table =3D tbl_idx ? + WIN_SERVER_VERSION_MATRIX : WIN_CLIENT_VERSION_MATRIX; const ga_win_10_0_t *win_10_0_table =3D tbl_idx ? WIN_10_0_SERVER_VERSION_MATRIX : WIN_10_0_CLIENT_VERSION_MATRIX; const ga_win_10_0_t *win_10_0_version =3D NULL; --=20 2.44.0 From nobody Tue Nov 26 04:50:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1710176335; cv=none; d=zohomail.com; s=zohoarc; b=MgKDspKiP/6N0zk45eBKLRnVuaHNW1jaxRo5rhnMfbnLz2XOPzNPkippzq0eny2pm9xucj5ZtTzCSl9XZh89fOMn+RgPtl71/I+IKBee/yBK2U7LFRui1Y3wpzwe88SO3NHoob0oJZhLW5/+btA7LVioq2YHwjnZvlAiXnuYyOY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710176335; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=xfqUGYeBh3sXT2eaC8iUIADn77FNyLKB5J5cOD/CMvc=; b=djSxblEoxkWT3/vEAs9TYfdQveEwoQH8JG1AhVV4Q7JqUV9LnTfsVmIcB+9kdvv4PKGOqU+j1/Yo9tJJ/iVa/IucoM7P6EYaS647SW/sXNKnjLJfFNrBYJkhggxmmOUkGNNPCDNfwmehZDEF9JlyMxyoW3+GI9zCZ0NAs7M/bic= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1710176335065459.24814822190467; Mon, 11 Mar 2024 09:58:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rjiy3-00056i-8f; Mon, 11 Mar 2024 12:57:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rjiy0-00056I-TB for qemu-devel@nongnu.org; Mon, 11 Mar 2024 12:57:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rjixz-0005zt-AE for qemu-devel@nongnu.org; Mon, 11 Mar 2024 12:57:36 -0400 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-163-Eazq2sQmO0qbBoGg0-0Z7A-1; Mon, 11 Mar 2024 12:57:32 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C68B4299E742; Mon, 11 Mar 2024 16:57:31 +0000 (UTC) Received: from srv1.redhat.com (unknown [10.45.224.122]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CBFC310E4B; Mon, 11 Mar 2024 16:57:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710176254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xfqUGYeBh3sXT2eaC8iUIADn77FNyLKB5J5cOD/CMvc=; b=czULmK2JLPH1TdxTj9eCA+jLNO6ilc11HqftrZH3Oz1bEs3cLYa2TQfzGkmmGh/iueQeqg JcKezOgw554bdo6Dovo9bDG7sDqAO67vgEUpLrMLVy9mfeDrddHb4Rfv2hH2+DUwXmAC9B sC4SOHBWHeSYub5MYgqUmNbQ2HuPx04= X-MC-Unique: Eazq2sQmO0qbBoGg0-0Z7A-1 From: Konstantin Kostiuk To: qemu-devel@nongnu.org, Peter Maydell , Stefan Hajnoczi Subject: [PULL 3/3] qga-win: Add support of Windows Server 2025 in get-osinfo command Date: Mon, 11 Mar 2024 18:57:24 +0200 Message-ID: <20240311165724.176168-4-kkostiuk@redhat.com> In-Reply-To: <20240311165724.176168-1-kkostiuk@redhat.com> References: <20240311165724.176168-1-kkostiuk@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=kkostiuk@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.029, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1710176336868100001 From: Dehan Meng Add support of Windows Server 2025 in get-osinfo command Signed-off-by: Dehan Meng Message-ID: <20240222152835.72095-4-philmd@linaro.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Konstantin Kostiuk Reviewed-by: Yan Vugenfirer Link: https://lore.kernel.org/r/20240304134532.28506-4-kkostiuk@redhat.com Signed-off-by: Konstantin Kostiuk --- qga/commands-win32.c | 1 + 1 file changed, 1 insertion(+) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 659dfb624a..6242737b00 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -2153,6 +2153,7 @@ static const ga_win_10_0_t WIN_10_0_SERVER_VERSION_MA= TRIX[] =3D { {14393, "Microsoft Windows Server 2016", "2016"}, {17763, "Microsoft Windows Server 2019", "2019"}, {20344, "Microsoft Windows Server 2022", "2022"}, + {26040, "MIcrosoft Windows Server 2025", "2025"}, { } }; =20 --=20 2.44.0