From patchwork Thu Feb 22 15:28:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 774876 Delivered-To: patch@linaro.org Received: by 2002:a5d:6ac2:0:b0:33b:4db1:f5b3 with SMTP id u2csp824866wrw; Thu, 22 Feb 2024 07:29:59 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWS3G082ymwTw8w1Nc94nqJz7q+yXnicwKGnJUaxNssZ8ltZlD+oLaSjHMPKOgCEU/KLtmhfjsKOsnoBiCgCMvF X-Google-Smtp-Source: AGHT+IFmNaEXt10xlzqVL4TzKPpKcBKpZfoSJdUFABM6LqjxUZUBf53M9oVcLlQFKdlt3igKBkVZ X-Received: by 2002:a05:6102:b08:b0:470:5c4a:86ab with SMTP id b8-20020a0561020b0800b004705c4a86abmr13379843vst.0.1708615798808; Thu, 22 Feb 2024 07:29:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708615798; cv=none; d=google.com; s=arc-20160816; b=REwe7sN21BJ1gGr0A0of49bOLDK8mU0NW3p8MQYufz5/pxL8pQUmkz1suwyWoOKhW6 X0pvzhPFdunoAVnymV50pGBNue6rp73RHGK7kHtf8WLqfLowNNrOcYy8q/fd3UIG+yYl 02dRqiaifGJZxQKv/2OfQ5wo+pAJEv8tnFPeXTdG1eVVDZgNpkvCzBlDVHccGAowUnMR kr/6AeB1F6PLpUW6ZRJvPYBx5HSGGTAR4bxxn2gXlheX7zycDjjXWldlIrmjwFDkgJyy GHlP1x6PFdSyBOVCZaRxjQOhFZoKRnp4s/KrXk/NGl5c5L9ep1fViCSVH+7wXQGXPxDb YO/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=qJ101CcDEsIgwbCRRwIlIJGFhtgnXY0NDhltmJmVB0g=; fh=3Z7V63VJ+5dwO+735zAlkCY/Qtvc92vbyMcOAWhWIL0=; b=P9wDN69Hzg4oukzU1bwCVSR/CiB0pSIYH/X9TJy7GotLdt2sSPDI8schZORNipBZz4 51xxsDoPZu/SRz/iytLADFPS4MTDVKQQ+EZOigUJTUvLzxvIfdrNB0E3ITUvRAavfzIk zGzENxeCKx28z5iZQjZ3AkXjjS9g7HoJn8iYqT6K02axPb7qOCyuiqBILb3CCswbA6wi mRFklB0llzBI9wIgrt5Y/nV+e//7iJri4+ot5QHrOF2QDH4S4lKouNJs1A1GLOX13DLF w6qLSjU8A7N7LWn+ZDqy/f+1/fiK9mOaCS/uTcJN4C+rAMLVviGGajnBJtY1/8wpilSs TprA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wnXfQxuX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c9-20020ab056c9000000b007d292b7c1b3si1922151uab.222.2024.02.22.07.29.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 22 Feb 2024 07:29:58 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wnXfQxuX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdB0C-0005AH-9u; Thu, 22 Feb 2024 10:28:48 -0500 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 1rdB0A-00059s-I3 for qemu-devel@nongnu.org; Thu, 22 Feb 2024 10:28:46 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rdB08-0000Nw-Tb for qemu-devel@nongnu.org; Thu, 22 Feb 2024 10:28:46 -0500 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-4127946aa11so11263515e9.1 for ; Thu, 22 Feb 2024 07:28:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708615723; x=1709220523; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qJ101CcDEsIgwbCRRwIlIJGFhtgnXY0NDhltmJmVB0g=; b=wnXfQxuXCFERBN1w3t23hKd85+GDWIfphAe4Qs9RBTdQMt3V0LgRorITZ8GDWlZPJw PRD+2xD9dXOzYtym3l+vBQ2Mjwqx3bcG7o9oYqOdkTenFb0kKxghQtreqjjAtXfrrBCS 3x4a0VZ9rWmJCds/JJ/cmg304eMnG9whv0pOUsEbGWJSeZNb3LVFHYsYddX3eQpy8Hj+ WdNNYMeyWlsFyEt2V/Uq+YoEHHOKTvlX7dHfZi62paUAlmMwCjfxfYaaVEMOcEF/VSui lgJbbF1GbljWFezhhfQgypk6M/Mxixiy0qFqmIXVWzhOjSOTY59sQIW1Glf9yW2Pi5Sj Uv3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708615723; x=1709220523; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qJ101CcDEsIgwbCRRwIlIJGFhtgnXY0NDhltmJmVB0g=; b=jcyRMOlGoWisUTetYc08XBw/+7UPP5VNv6PKJxbUd33GUjvlSjdQR1pis0P6tNyM2m 3396j7fVS0BM/jznMMnYnTCqMcrpUuiOEPiJk6Liv8pt4L1iXy7J2ZWVAWoV2U6RLEgy HvfVaZgr+sDnjsnPxYvRJ9D6bHo9i/3a5q0t0zxpDnYcUKDBCEll1eAwdwiX7Q52d5hU Mum2F396F+YIss8ZXWZtiw3PJSqpsF4iMe4zAsb738ze09Si3VTEf5Ee9Jq6CVMX5Bzp LxuOl3CP5TVgLFne3SX0FnNGTykAbwQCsATgBnMl8b6CpURqh5GDg8CpLy78jf56MQNV n2gQ== X-Gm-Message-State: AOJu0YziEpFw7/pN36ZHV97eNeGhWEZ9Keg4E9RUrpebfbsljEhw50R4 AfMCskQ1alwD1a8ALKlhafg3Vy83blnqfvhsH2l1B2G7Uwl7MjnxIlOW/8MHuEAf8jN2l6WvCVt SSV0= X-Received: by 2002:a05:600c:502c:b0:412:8faa:65db with SMTP id n44-20020a05600c502c00b004128faa65dbmr168971wmr.38.1708615723211; Thu, 22 Feb 2024 07:28:43 -0800 (PST) Received: from m1x-phil.lan (sto95-h01-176-184-18-96.dsl.sta.abo.bbox.fr. [176.184.18.96]) by smtp.gmail.com with ESMTPSA id 26-20020a05600c025a00b0041273fc463csm6349173wmj.17.2024.02.22.07.28.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 22 Feb 2024 07:28:42 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Dehan Meng Cc: Konstantin Kostiuk , Michael Roth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v3 1/3] qga/commands-win32: Declare const qualifier before type Date: Thu, 22 Feb 2024 16:28:33 +0100 Message-ID: <20240222152835.72095-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240222152835.72095-1-philmd@linaro.org> References: <20240222152835.72095-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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é Reviewed-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; -static ga_matrix_lookup_t const WIN_VERSION_MATRIX[2][7] = { +static const ga_matrix_lookup_t WIN_VERSION_MATRIX[2][7] = { { /* Desktop editions */ { 5, 0, "Microsoft Windows 2000", "2000"}, @@ -2148,18 +2148,18 @@ static ga_matrix_lookup_t const WIN_VERSION_MATRIX[2][7] = { 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; -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[4] = { {14393, "Microsoft Windows Server 2016", "2016"}, {17763, "Microsoft Windows Server 2019", "2019"}, {20344, "Microsoft Windows Server 2022", "2022"}, {0, 0} }; -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[3] = { {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; } -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 minor = os_version->dwMinorVersion; DWORD build = os_version->dwBuildNumber; int tbl_idx = (os_version->wProductType != VER_NT_WORKSTATION); - ga_matrix_lookup_t const *table = WIN_VERSION_MATRIX[tbl_idx]; - ga_win_10_0_t const *win_10_0_table = tbl_idx ? + const ga_matrix_lookup_t *table = WIN_VERSION_MATRIX[tbl_idx]; + const ga_win_10_0_t *win_10_0_table = tbl_idx ? 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) { if (major == 10 && minor == 0) { while (win_10_0_table->version != NULL) { From patchwork Thu Feb 22 15:28:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 774875 Delivered-To: patch@linaro.org Received: by 2002:a5d:6ac2:0:b0:33b:4db1:f5b3 with SMTP id u2csp824864wrw; Thu, 22 Feb 2024 07:29:59 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWmiJ2QAFG1z88FL+pfagzyhYVpPUKNLE8cgyNIraEQugcWYp/OPTIWwGPAYwM8DxHmpULdsi5HtyiOvp9hvs/B X-Google-Smtp-Source: AGHT+IEOkVygfetFDEfxj7WZQJQfE0Uy0roTrMdpALlvlhbfU3X+j2B0eaANEx2GFIb1j+vLotyX X-Received: by 2002:a1f:ea04:0:b0:4c8:90e5:6790 with SMTP id i4-20020a1fea04000000b004c890e56790mr13946054vkh.5.1708615798766; Thu, 22 Feb 2024 07:29:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708615798; cv=none; d=google.com; s=arc-20160816; b=yntO8Fvh3YxwJC1ah9vxcpC7oq+LCsCXe6EQgwMz58HfXJ3xwR6OEyHpQlTPM/vZmU Fk81v9yEU2aDpiVVHHImKBfvLQ4QvyTHzUlmOAvHadnQtPBLojfunJoO1dYPZgzseRgd SPB2GpiF7SkTcG4lnR+pt9nhWk6UlRhlAcRlK0BRk0lfAYOeuzMy5tWCSmbynD4oVuXg y534dU13kELLDjIQPwCWxFtHX893viJy72axlsb6UFylQUMGhsrP+kpO0w72RIvsNdxj TiCFFOZq0cJ/wgPIv7l8cNLoz5UDO2gT4cHcs7VnKfVo0aUxJf45szfknS22aSrzy6sz Us8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=FzD+99cgpDSrEBdy2lAUngKRLMF2vDH+vLkmhVJWYwA=; fh=3Z7V63VJ+5dwO+735zAlkCY/Qtvc92vbyMcOAWhWIL0=; b=HklJeiATgHnA/25GRuZzGu13e+4HeUReRZ8mBDxr9MF36UgeescgIXl4msuMPLTjAG hr0gN48g2z2R9Wmsdv+RP9/B5Dptmzci76BRANKF9XVQQBtKd8YBQQueNIO6YgoiyZN3 W07e99mRwSbEolOjxqj1+9WeG0vr09WgsLkmeTVoWhCZuqlyz9Ynvc2U2Bi9UmxVx6x3 Itg23hkLe3PnznnnfbEqDLPbL/I2eRGINdXcnJpwyNNhf9IQeRNRtoGViSnfJ0WmIoX7 MxuAGOiWOrfKRT5eetLoM6rqIxg//3KpBpFDHg5MVc857iPmD35fIDFm7jCz+75FY5Zu hGMQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vCeWUuOa; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id s7-20020a0562140ca700b0068cf2ec8200si13087421qvs.95.2024.02.22.07.29.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 22 Feb 2024 07:29:58 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vCeWUuOa; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdB0H-0005Ao-Lj; Thu, 22 Feb 2024 10:28:53 -0500 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 1rdB0G-0005Ac-GF for qemu-devel@nongnu.org; Thu, 22 Feb 2024 10:28:52 -0500 Received: from mail-lf1-x135.google.com ([2a00:1450:4864:20::135]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rdB0E-0000OC-Qj for qemu-devel@nongnu.org; Thu, 22 Feb 2024 10:28:52 -0500 Received: by mail-lf1-x135.google.com with SMTP id 2adb3069b0e04-512b13bf764so5919396e87.0 for ; Thu, 22 Feb 2024 07:28:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708615729; x=1709220529; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FzD+99cgpDSrEBdy2lAUngKRLMF2vDH+vLkmhVJWYwA=; b=vCeWUuOaob3FHfRjZixcQjE+5hh6MknvbKoQQKNN3G3VZBwgpsPwC/IBtoaH7JLKce QKQHshrYvYP26OYrCKIz6hwACWMQEc5ehmzOeTDZzeLjzYuP1rAuP4fTowXDqRzp8qWQ PBSqTxNPht6PBPSwnppuRIGfrxO7MPJMcNNW7UJmSGB/ZxpR3/wtO7B2NshByLSJojxc 37rSXRsfB4mMSo4kpKuESsHj0QNUvsq+rzYldA5i2TIy4Ifr9C76Qz0KhfilqReM5v+v vWD08RckmJzUta6oIWzTJEY/O5asQ1OlXR42sncOZL1lAHljgE3+D1+wVrGboOm2v4r7 ULcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708615729; x=1709220529; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FzD+99cgpDSrEBdy2lAUngKRLMF2vDH+vLkmhVJWYwA=; b=lxC5tGLZS04hOBo99lK9fzvcPbcvGnsWhJ+muNp1pk6F1amd6CWoXeob/xKRwXUicS 1H3DWIOk9A3KXinFZ+ZcgDiBFHTogxeyt7wjzbGMfEsnrDs0cvBXTYPRm8Cf1/vGVtxf VJAYaNZkNP3nBaC+81uhmC0guWq/0KR2Vegcht/2t7SlzQD8p5rcPmAAkzQ89XL0IDdh MQdgDgdo1Dr3ylVhKFdDz3Dxy0dsL1UJ2oZP+pQJ9JcEIzWVwBsnsEvWC/vY49b4rfgB Z69w3juKQFW++NNbFuRnpY6F4dVtBqKaHErwa45QwEaADWD8/U/tN17CEZzWQTU+dtbA Wzhg== X-Gm-Message-State: AOJu0YyP6vieAy4roWHw0yAw5RveTIqPjzZ3RspLGdzXZiB5/+2G3g4h KlVfgXREMCMaSn8XHZzgEWATnfjC2y9IsYX9HAxDyyw+5rnZpwVahpOYqb7l3w90emwUZLL2fg8 WTW8= X-Received: by 2002:a05:651c:2125:b0:2d2:5cca:cf6f with SMTP id a37-20020a05651c212500b002d25ccacf6fmr3198721ljq.18.1708615728774; Thu, 22 Feb 2024 07:28:48 -0800 (PST) Received: from m1x-phil.lan (sto95-h01-176-184-18-96.dsl.sta.abo.bbox.fr. [176.184.18.96]) by smtp.gmail.com with ESMTPSA id u6-20020a05600c19c600b004128e757706sm765542wmq.36.2024.02.22.07.28.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 22 Feb 2024 07:28:48 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Dehan Meng Cc: Konstantin Kostiuk , Michael Roth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v3 2/3] qga/commands-win32: Do not set matrix_lookup_t/win_10_0_t arrays size Date: Thu, 22 Feb 2024 16:28:34 +0100 Message-ID: <20240222152835.72095-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240222152835.72095-1-philmd@linaro.org> References: <20240222152835.72095-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::135; envelope-from=philmd@linaro.org; helo=mail-lf1-x135.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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 = WIN_VERSION_MATRIX[tbl_idx]; const ga_win_10_0_t *win_10_0_table = ... ... while (table->version != NULL) { ^^^^^^^^^^^^^^^ while (win_10_0_table->version != NULL) { ^^^^^^^^^^^^^^^ This will simplify maintenance when adding new entries to these arrays. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Konstantin Kostiuk --- qga/commands-win32.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 79b5a580c9..87ce6e2870 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -2124,7 +2124,7 @@ typedef struct _ga_matrix_lookup_t { const char *version_id; } ga_matrix_lookup_t; -static const ga_matrix_lookup_t WIN_VERSION_MATRIX[2][7] = { +static const ga_matrix_lookup_t WIN_VERSION_MATRIX[2][] = { { /* Desktop editions */ { 5, 0, "Microsoft Windows 2000", "2000"}, @@ -2133,7 +2133,7 @@ static const ga_matrix_lookup_t WIN_VERSION_MATRIX[2][7] = { { 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"}, @@ -2141,28 +2141,27 @@ static const ga_matrix_lookup_t WIN_VERSION_MATRIX[2][7] = { { 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} + { }, } }; typedef struct _ga_win_10_0_t { int first_build; - const char *version; - const char *version_id; + char const *version; + char const *version_id; } ga_win_10_0_t; -static const ga_win_10_0_t 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"}, {17763, "Microsoft Windows Server 2019", "2019"}, {20344, "Microsoft Windows Server 2022", "2022"}, - {0, 0} + { } }; -static const ga_win_10_0_t 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"}, {22000, "Microsoft Windows 11", "11"}, - {0, 0} + { } }; static void ga_get_win_version(RTL_OSVERSIONINFOEXW *info, Error **errp) From patchwork Thu Feb 22 15:28:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 774874 Delivered-To: patch@linaro.org Received: by 2002:a5d:6ac2:0:b0:33b:4db1:f5b3 with SMTP id u2csp824860wrw; Thu, 22 Feb 2024 07:29:58 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUzhCmcyTrs8FaeVO8PwAfKUQ19yZ1AmwE/Pj2S2J7qdnaOc2rq+vqOnv4vGzwjetYyTWosMdzh4vpEOyl9E4dd X-Google-Smtp-Source: AGHT+IE0jY8lVE9lRMoVvmM5XAP8iMDIxDtown4qf+HWQFrZGmEahAw5SBRmbR5GryM1wKoNspE7 X-Received: by 2002:a1f:da42:0:b0:4ca:15b2:a09b with SMTP id r63-20020a1fda42000000b004ca15b2a09bmr12323646vkg.13.1708615798457; Thu, 22 Feb 2024 07:29:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708615798; cv=none; d=google.com; s=arc-20160816; b=iXvw3qv6nk2R40qwXX32YrMNCjq3ApVAm2rEVE+wboODtC+NBNKB/pGEKTYS8DwY+b mEh2kxXAby/eOrZ8ZriUh1PjS5+HlR96WmZSugPcPCnb77tS9gCeGxYilWDb8m4puh8N 11uxOlIyCgUTMLHlLprR6EcOA7iijp4V013b0SzW2G5lSsQb8ULwhmLZgfS+ki9mNoBl ewvfdF2m/vlLc63BVb08fFnqlzrsnAiE0H+5aclnyD87GQZgfJb84VvMZs+GLcHuNw25 SGKKKit3fr0X3yB+0ytR8v4BKvB1ybE1pjJ3cVLadqF9ZTUUGl04785pzi9kzMLS5A0H fkKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=9iQ3mhDuZFxw4v/RDXonwhsB2p6WbD00VJUj071WFjs=; fh=3Z7V63VJ+5dwO+735zAlkCY/Qtvc92vbyMcOAWhWIL0=; b=G2dmeV3N8L87zJi2plfGtbQjm0FHz2sbteQp1Pdq4D6Zgd4Q/LcBccqTd0hhHXU8f4 Yqn8ZVQJ1nYu5I8xtkcF8KnuwhEFFgKMfRBceNbd/ftijCYprCcxISMJTwLJ7m9QH+oX LF8bF9wL28aYGjIpznvCT2gjeisQXg3PaDHQlM6r6wuYIryJG06+DZM6dburgs/PQqCG P5ISYbWWfAoQrSIQDmuBR2So40yjY3zGgyDpLpM2hdowHygMU72cHS6pO6sNQUHgzEmD 3tCM5c2G/5GZC05JMv+MMjkVgHCcopUTc8AIIm2BhKQV4R9oniGwROGnxYZthH4PQwCt cugg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LWahLmuG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id gc12-20020a0561221d0c00b004b6e3fa75a0si2219743vkb.7.2024.02.22.07.29.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 22 Feb 2024 07:29:58 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LWahLmuG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdB0M-0005Bf-S8; Thu, 22 Feb 2024 10:28:58 -0500 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 1rdB0L-0005BW-Dr for qemu-devel@nongnu.org; Thu, 22 Feb 2024 10:28:57 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rdB0K-0000OU-0r for qemu-devel@nongnu.org; Thu, 22 Feb 2024 10:28:57 -0500 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-33d0a7f2424so4892897f8f.0 for ; Thu, 22 Feb 2024 07:28:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708615734; x=1709220534; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9iQ3mhDuZFxw4v/RDXonwhsB2p6WbD00VJUj071WFjs=; b=LWahLmuGy7nCNqkt4Z6aBANrU63/If4zuQaK+8W1+YZJDoq7fRLF0rqBJ0ArokOPlG 8HNVcnlpzZ002pKcY4vG8OG8gbA5ruRl0xJ8PAlXz5jcFR63gU9M4FcFxMgTN6EhWovE DbLDjJzUnqM2Iyqa9oPhBNNgmqMwhoGdWtAeMWQAFnx3zFPPJMR4sM0ABduQPzaKPazy QkCctstfY2x21yAk5OCrcsWiyTStDwabMDnGW5FmTwYq/LHAGK6ajRJVblSh6arcgh1u T3Ugjm0+x/rOu/NqLgoET/S7oKr/F6Hz0LHldHVRiTQojGsjuZSFGa2BHNY/zDLjDrjt YdVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708615734; x=1709220534; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9iQ3mhDuZFxw4v/RDXonwhsB2p6WbD00VJUj071WFjs=; b=KXa/iaFHNLnIjZAsQvXJtP4iAXb+jZIruJ4W3AglcnEVJ4kXBIzcyJLLcU81GrH6YX L8X9l1Bx+rALA+LDKTp9017F1lxh/BTqx2/Iq6QbWD1b4fDitAj7IcaqMl6VVqFtSaFc /bZrK4ZEFIAvMgc/AElUfaH667nXOj4FzTqNUWl+Unk0U87ZIHSevs0qIY/e7t+iy70I A49oA0Jo+0ZVUyJUw4HKgr9M4uPyoHOO0dmrts7Eb/7j2zX7k5kdNy0QrYiy2ozydIZ5 bMrFKpwFWn/iw9i3izhkrBQmjVqAZ1CzfAPNFc1VIjMU7F9yVUT1VOK45mPv2i2ABhEQ crEA== X-Gm-Message-State: AOJu0Yx3ouNNa9HSQouwqqCF/eC6Ld/6m3z65VBhXRGt0vCUOgcY097z NGqXacge4m+ExCF6JFuEXKeIAdKBPhw5V/bSz0OGNy+fgLe4W1dl06KERvPXteNlpoDV++e6cDe Tzfs= X-Received: by 2002:a5d:6201:0:b0:33b:62c0:6181 with SMTP id y1-20020a5d6201000000b0033b62c06181mr13756918wru.42.1708615734183; Thu, 22 Feb 2024 07:28:54 -0800 (PST) Received: from m1x-phil.lan (sto95-h01-176-184-18-96.dsl.sta.abo.bbox.fr. [176.184.18.96]) by smtp.gmail.com with ESMTPSA id u11-20020a056000038b00b0033d7dd27d97sm5885868wrf.45.2024.02.22.07.28.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 22 Feb 2024 07:28:53 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Dehan Meng Cc: Konstantin Kostiuk , Michael Roth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v3 3/3] qga-win: Add support of Windows Server 2025 in get-osinfo command Date: Thu, 22 Feb 2024 16:28:35 +0100 Message-ID: <20240222152835.72095-4-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240222152835.72095-1-philmd@linaro.org> References: <20240222152835.72095-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Dehan Meng Add support of Windows Server 2025 in get-osinfo command Signed-off-by: Dehan Meng Message-ID: <20240222025352.58859-2-demeng@redhat.com> Signed-off-by: Philippe Mathieu-Daudé Reviewed-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 87ce6e2870..9749e4e6a3 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -2155,6 +2155,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"}, { } };