From nobody Sat May 30 11:15:11 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1778672688; cv=none; d=zohomail.com; s=zohoarc; b=R7EDLWbdvXZ/bc2GONLDovKokxbdHDp8MAwwlF8Ap0eRATvLeaRsS1nozis+JhBLN3iJ3DhyGFp6YpVGntMVae6o7PeJdLe49mnTkG7fPMrMJ2wlfW3nv7T5/V7EtD5wEAEeBviK83cwjj846K27Dnwn5jOSfwSu8RPImCZ0Xzg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778672688; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=GQE8DFe4DRPLmoSnOwxaRoHlZT5zD9oiU41YpusLj+w=; b=bcg1JCgJKl7mGxsdSbjwOmsq/cY+lV9/57W9d1hZKGv7ox0IKFJuYthWVI45i1pB1LYW5tyQEKkj6YCEohm5YFOK3LpQClrqdd+2y9hsyj4ZFZlfkPyxVajW8QaFlOzHXMD5g9i6wkNC/VeuvFqkYulFZBzn+t45Xz79eF8bKlE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1778672688037921.34944979089; Wed, 13 May 2026 04:44:48 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1307873.1579437 (Exim 4.92) (envelope-from ) id 1wN80t-0005K1-3N; Wed, 13 May 2026 11:44:31 +0000 Received: by outflank-mailman (output) from mailman id 1307873.1579437; Wed, 13 May 2026 11:44:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wN80t-0005Ju-0U; Wed, 13 May 2026 11:44:31 +0000 Received: by outflank-mailman (input) for mailman id 1307873; Wed, 13 May 2026 11:44:30 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wN80r-0005Jl-Ut for xen-devel@lists.xenproject.org; Wed, 13 May 2026 11:44:29 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wN80r-00A1it-7v for xen-devel@lists.xenproject.org; Wed, 13 May 2026 13:44:29 +0200 Received: from [10.42.69.10] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6a046419-bab6-0a2a0a5309dd-0a2a450adfe8-14 for ; Wed, 13 May 2026 13:44:29 +0200 Received: from [209.85.128.45] (helo=mail-wm1-f45.google.com) by tlsNG-4011c0.mxtls.expurgate.net with ESMTPS (eXpurgate 4.56.1) (envelope-from ) id 6a04641c-56b3-0a2a450a0019-d155802dd47c-3 for ; Wed, 13 May 2026 13:44:29 +0200 Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-48e6db3ff7eso26500785e9.0 for ; Wed, 13 May 2026 04:44:29 -0700 (PDT) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e8f43de84sm40207105e9.26.2026.05.13.04.44.28 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 13 May 2026 04:44:28 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=google header.d=suse.com header.i="@suse.com" header.h="Content-Transfer-Encoding:In-Reply-To:Autocrypt:Content-Language:References:Cc:To:From:Subject:User-Agent:MIME-Version:Date:Message-ID" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1778672668; x=1779277468; darn=lists.xenproject.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=GQE8DFe4DRPLmoSnOwxaRoHlZT5zD9oiU41YpusLj+w=; b=U0lHgAKtbkIlrK7ISAWjxe49o5Xpp/07bM2hyHm/dfd9KV3XyvRhBkqwjrOwQzliR+ 57wtf6SkaFnpXmxnXDjDTBRLxXBSYb8drbXuvoKUfR7iV/0EoQLwSFGOaKcDxqtnCukx cHOI1/nYaFt/iujcC1kPp3jMlM3lCVfssIQW5OMRoZni9L30Bhx7WDvQ8jpYqhKlm5sl EbsWql5WJOBEWwhAFpy1tA7UZIF6tkQzk+fq94SGdUM7572jHiY1T3lcr2wy/1kpMQ0q av8rv1Bm8XfHqRmKJVh1Oj/zSxbLH5caYKwNlQsaAmoY16jmeQULkxRxnhuwtUxu5D/d vfOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778672668; x=1779277468; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=GQE8DFe4DRPLmoSnOwxaRoHlZT5zD9oiU41YpusLj+w=; b=P8gIt9YThTS28cfwcg1itS8PvRQYWd+HgiHyjtq69D1yFrDbeGwgJvP8vCy25nof8m d1oLXmCFzNlygZEYzMCiujvna3dW+EsCAbImb21HqAgNyb8tYvw3r+y6PYxpx+OL2MR9 fSZpWUXuaPvl9EREZyxhiMTc/a5Ycy/XPdotaG8xoQCn+rlV5fASEp4UjPIhPa1COES3 hH3CbeJ8ZjBfLNAApcO2bpmqPkHSTrx2ALuFWpvTYjlQkRF2+acmGBDIyatXVxkkZJ+b VqLLFkJy0VR9ifB76GHlzanSKU7VpGIlcwM50CLrCBHYuY5b8t02ogI0adsjtVg8ALeY RKpw== X-Gm-Message-State: AOJu0YwZSYRc9QZbnmwQUOawZyEwL3bdkP1ClGCA3pql0Awj3N2sBVqj fh0TMabK+3WG2rbQc594H+ansKRsSqLQ3argSltk3/iu5ad9hEVYGvsYl3IquMGTH8LgxwTtm2x 9xfk= X-Gm-Gg: Acq92OEDzzXZmAuuO0leqm2y+/hSFkop4saL6KwqPFL42KjEXMYUo3ohTW88Kfjkn0Y M1Y+E6gqMsmZlV6u6rop9fmUnJrxdcuIPIbXGWbdxw/Oe+ha6eQ8Z7GklgEJK1WdxanoiQOF9pq kewd3rqi1BQvh6pB/wprbTjqtY9wSWQNFABwtZCgkZRW64Ve0Bu/2VtwTR2ALAaQibizSwb3sIB AtcsY2xfZc5QRxgj6B1SktWhYx6oB5EJnEONT0wdXzF9bHFyfNi09c6XwkpDCv0G5Kz27a40Y4l DxwmvSNOwxvb4FOton5r7/s7I71/6V3LTLYKTLwj7P3nopTatLfgKKzkxWIGTIoik2npTUjVphY pnhOYeRKaVoozS6okZZL04VAXu7cqxajC4psOlItgKQdm/TgRjI0ySbViYuU8cDfBCTTusuWePZ AW8eQKKeG50kQolNLz4wp0Ht1GOxyD/xSGFpHRyR/2gz+084zjlnaKJNYn71KyNqDEgy8zR/Tnp IAL6Jir3d50psY= X-Received: by 2002:a05:600c:a318:b0:488:a977:8d6 with SMTP id 5b1f17b1804b1-48fc9a371e4mr30342855e9.19.1778672668631; Wed, 13 May 2026 04:44:28 -0700 (PDT) Message-ID: Date: Wed, 13 May 2026 13:44:27 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH 1/5] x86/guest: rename a local variable From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= , Teddy Astie References: <5eaaf72a-850c-4535-9f20-13b4feed38d1@suse.com> Content-Language: en-US Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: <5eaaf72a-850c-4535-9f20-13b4feed38d1@suse.com> Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-4011c0/1778672669-7176D8B7-06DFC93F/0/0 X-purgate-type: clean X-purgate-size: 810 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1778672688991158500 Content-Type: text/plain; charset="utf-8" ... shadowing a file scope one, thuis violating Misra C:2012 rule 5.3 ("An identifier declared in an inner scope shall not hide an identifier declared in an outer scope"). No difference in generated code. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Reviewed-by: Nicola Vetrini --- a/xen/arch/x86/guest/xen/xen.c +++ b/xen/arch/x86/guest/xen/xen.c @@ -203,11 +203,11 @@ static void __init init_memmap(void) =20 static void cf_check xen_evtchn_upcall(void) { - struct vcpu_info *vcpu_info =3D this_cpu(vcpu_info); + struct vcpu_info *vi =3D this_cpu(vcpu_info); unsigned long pending; =20 - vcpu_info->evtchn_upcall_pending =3D 0; - pending =3D xchg(&vcpu_info->evtchn_pending_sel, 0); + vi->evtchn_upcall_pending =3D 0; + pending =3D xchg(&vi->evtchn_pending_sel, 0); =20 while ( pending ) { From nobody Sat May 30 11:15:11 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1778672708; cv=none; d=zohomail.com; s=zohoarc; b=hj9EmjdShdseuLs2hoWUkIcckbPRSuXcI0c5QhTTYQyTk0ehOskmdamLSjz2VNrUw0jrpWJUTsOz0+m5z0+RSIWe3pGY5ELf8xoNa6CBCaOH5WI8c1HrRSlvvtbhVYGNvWFeOFiA8betFiGB4u08fUvxVSAFn5aLLMrHtOvvCGQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778672708; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=gwBkQd9qd5e7EV+25xbt2DulcaBMv8dm8NGWegkW3Ow=; b=Vd1p5jCMT945qfmjhrHP7G/6yeC/Fe+/01vorXTpJwXZF4X7dXgE9n5htcLLn3aKrMIwKML34kzSXVw5I8HBD7kHUCiffh69ISpKSS7S6W5PAzKWrBIfCzZa8vFlxo40PWL1F0A2abrDpEL0CRMm+yhkcKH4ltDqk4tN41D9r8o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1778672708210465.45736232405613; Wed, 13 May 2026 04:45:08 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1307878.1579446 (Exim 4.92) (envelope-from ) id 1wN81E-0005kG-D1; Wed, 13 May 2026 11:44:52 +0000 Received: by outflank-mailman (output) from mailman id 1307878.1579446; Wed, 13 May 2026 11:44:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wN81E-0005k9-9w; Wed, 13 May 2026 11:44:52 +0000 Received: by outflank-mailman (input) for mailman id 1307878; Wed, 13 May 2026 11:44:50 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wN81C-0005iQ-K5 for xen-devel@lists.xenproject.org; Wed, 13 May 2026 11:44:50 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wN81C-000Ge9-13 for xen-devel@lists.xenproject.org; Wed, 13 May 2026 13:44:50 +0200 Received: from [10.42.69.11] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6a046424-e002-0a2a0a5209dd-0a2a450bb526-44 for ; Wed, 13 May 2026 13:44:49 +0200 Received: from [209.85.128.48] (helo=mail-wm1-f48.google.com) by tlsNG-42698a.mxtls.expurgate.net with ESMTPS (eXpurgate 4.56.1) (envelope-from ) id 6a046431-212f-0a2a450b0019-d1558030bcf6-3 for ; Wed, 13 May 2026 13:44:49 +0200 Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-4896c22fcbaso58449745e9.0 for ; Wed, 13 May 2026 04:44:49 -0700 (PDT) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48fce37b182sm71879535e9.9.2026.05.13.04.44.48 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 13 May 2026 04:44:48 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=google header.d=suse.com header.i="@suse.com" header.h="Content-Transfer-Encoding:In-Reply-To:Autocrypt:Content-Language:References:Cc:To:From:Subject:User-Agent:MIME-Version:Date:Message-ID" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1778672689; x=1779277489; darn=lists.xenproject.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=gwBkQd9qd5e7EV+25xbt2DulcaBMv8dm8NGWegkW3Ow=; b=cpy8b6PyX5A4NtjSZA4H+LeHllppSFQ1veL+gUQdyDmuI0tczLSqg/d6RYe1jf8bO+ OACmFsPhheh+6EylhB9hHB2tJkc7f6+ASYeNm3E6Fg6aQg7QNFuA7lKIet5Y3ABOrLQR 1/ZzM/2oqZ4BseD0uVUHpqdAfnqPofINioGUa+zY3wETyBDDb+8Dx6MtzHHxmCtuysry nQBOFfPeUo1PoX+afXqRcLtXTPPBtL7fasdd6c5YRbfRdKowBabdmdZGngceaktSicHG 87LIoZ0KLRY7lfxocW8Y1SYHi76/rJMS0UEpijKCaAtyC3hnTgEVfcMqhnxyE1sVt7Cv njWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778672689; x=1779277489; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=gwBkQd9qd5e7EV+25xbt2DulcaBMv8dm8NGWegkW3Ow=; b=TG/F/uHLR5oyAVm5REIIn6Yrs1tan3N9nRQCeS3khXV4Rcir3Pm6GVwyxmfEN57Z/5 0LKVAVHPfFggeU9PT1ebNLX70QxhnJjkMSuPijK+WXVKCgRGO8JY3p3HbKw5PoK9fbRk aDAC6zMJOlu2TygGZaGuKj3i3a5u8UtheRbeowwhGtf4VMaNKOtFMJKNdJWsifsUFP0z 924L68OiZXfxdyq91RaTnU9LMmdRY/5SjMnOzK26yppUHg3jq7zkvfkpslGdOH4ty4wU HnsarB+BDQ2OZeDrgnPfXF5BNwJETM/sZ8UDWlig8f+uJOskp2Hyxj99ZxSRIKeZOjmd A+Jw== X-Gm-Message-State: AOJu0YwlGyc7XOI9YOQCuay0LcK+LAzzhr5Soec5haj31SDWWGEeyEU2 9mwJM2tFRM5du9fdOw+AoscrKxnPbzmD4bfkaDW3llYS/OO3eWA/VLHchR2uKcrTYBCw+8zK+Ee GO1c= X-Gm-Gg: Acq92OE+q946S6YQwkyUOebMIGlhMkz/We4omIedkaKw3QIMYRUZq0FYlapke11lvnv L6gj9m8aYYl3bUgF2+a7bO1Am20DZA0pNt3qANSJ7dqLXIDUYTBH/fQxaCopaavRjPlgLpmQte1 iAq/8PjmqFtYhNBTldbyKUjrAzj880YEweXNTG495or2Lso0z0jSJUQqIY1PMXpzBkn5SuZ0fZJ lROHSj3OWnVPFrdWME9eByEUXMaZFwpuBCCSeu97VhRoJlmpVS0NwKmSzkUvzzcu9eLn5thWiOI mQkQ0fLzS8oTXz13662VVFckyQn4tpXS/pjnMRWRYslxoS9O1EGmyOvWFi7yndsSb0TfuV8LMVj xv6KBQHYYYIH3faCNsvhKfVa3I8l1hxwgZWy/1JYXXmJcHWcfmhE7Yji8KglmtLJcPABsiJ2bPa 4BaTkueOEKT7vbxf5MaP1TQfayFmC+V495xH1ULJR/FrtWKMhCx+arlREd2d3f6DVVVbaAqXnC1 yj3BQyZW4kmhkRzu7rdjfEO4A== X-Received: by 2002:a05:600c:3513:b0:48e:635a:18d9 with SMTP id 5b1f17b1804b1-48fc9a34ae6mr42181585e9.15.1778672688744; Wed, 13 May 2026 04:44:48 -0700 (PDT) Message-ID: <871c0ca7-898f-4bc6-8115-d94d40b88301@suse.com> Date: Wed, 13 May 2026 13:44:47 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH 2/5] x86/PV: rename a local variable in pv_emulate_gate_op() From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= , Teddy Astie References: <5eaaf72a-850c-4535-9f20-13b4feed38d1@suse.com> Content-Language: en-US Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: <5eaaf72a-850c-4535-9f20-13b4feed38d1@suse.com> Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-42698a/1778672689-12971F3B-A993FEAD/0/0 X-purgate-type: clean X-purgate-size: 1840 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1778672709319158500 Content-Type: text/plain; charset="utf-8" ... shadowing a function scope one, thus violating Misra C:2012 rule 5.3 ("An identifier declared in an inner scope shall not hide an identifier declared in an outer scope"). No difference in generated code. Signed-off-by: Jan Beulich --- Technically, as the outer scope "rc" isn't used again later, we could simply drop the inner decl. That seemed more error prone to me, though. --- a/xen/arch/x86/pv/emul-gate-op.c +++ b/xen/arch/x86/pv/emul-gate-op.c @@ -286,16 +286,16 @@ void pv_emulate_gate_op(struct cpu_user_ if ( !jump ) { unsigned int ss, esp, *stkp; - int rc; + int left; #define push(item) do \ { \ --stkp; \ esp -=3D 4; \ - rc =3D __put_guest(item, stkp); \ - if ( rc ) \ + left =3D __put_guest(item, stkp); \ + if ( left ) \ { \ pv_inject_page_fault(PFEC_write_access, \ - (unsigned long)(stkp + 1) - rc); \ + (unsigned long)(stkp + 1) - left); \ return; \ } \ } while ( 0 ) @@ -359,10 +359,11 @@ void pv_emulate_gate_op(struct cpu_user_ unsigned int parm; =20 --ustkp; - rc =3D __get_guest(parm, ustkp); - if ( rc ) + left =3D __get_guest(parm, ustkp); + if ( left ) { - pv_inject_page_fault(0, (unsigned long)(ustkp + 1)= - rc); + pv_inject_page_fault(0, + (unsigned long)(ustkp + 1) - = left); return; } push(parm); From nobody Sat May 30 11:15:11 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1778672733; cv=none; d=zohomail.com; s=zohoarc; b=BeazUSs0fBjPxh/HF4lvaT9Z1x9dz1g8FgndhHL2uRTNXeu46qJ6Xj9kWpYxmubVJbsH8eebAob6taa7cW8KenpCB87zPO6/J7sy3lzUinZaFCBMKPuAmBrmJp18ea9DV5cNCxu6fjkkSM/Zq1Gonx9fl3cfskYcH7aU+L9rVrU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778672733; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=8KDAfpZOnzo89l1OvnPb3ALjiYAkA9DUYfDlOPj7cuI=; b=oLIlU+bKlv0OrREU/iZUOwZjzDRhmsdp8uxQePxM7hX1WBF+REho2lrBzqNEImossPac85dgPtVORs5yJ14Do3i6lI5Yr67cywbyP3HCqNFu7IcemhgLWBRioeNThAut2P5fo3ZaTEYM8IwvZqNxsjDUaKyNExME8R/sZEMI2fY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1778672733240295.98021819388; Wed, 13 May 2026 04:45:33 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1307887.1579455 (Exim 4.92) (envelope-from ) id 1wN81c-0006Ex-K5; Wed, 13 May 2026 11:45:16 +0000 Received: by outflank-mailman (output) from mailman id 1307887.1579455; Wed, 13 May 2026 11:45:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wN81c-0006Eq-Ha; Wed, 13 May 2026 11:45:16 +0000 Received: by outflank-mailman (input) for mailman id 1307887; Wed, 13 May 2026 11:45:14 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wN81a-0006EV-Hz for xen-devel@lists.xenproject.org; Wed, 13 May 2026 11:45:14 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wN81Z-002bZs-Um for xen-devel@lists.xenproject.org; Wed, 13 May 2026 13:45:13 +0200 Received: from [10.42.69.4] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6a046448-2eae-0a2a0a5409dd-0a2a4504e9a4-10 for ; Wed, 13 May 2026 13:45:13 +0200 Received: from [209.85.221.53] (helo=mail-wr1-f53.google.com) by tlsNG-ebf023.mxtls.expurgate.net with ESMTPS (eXpurgate 4.56.1) (envelope-from ) id 6a046449-1dec-0a2a45040019-d155dd35e1e6-3 for ; Wed, 13 May 2026 13:45:13 +0200 Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-4585a116a4aso2624280f8f.3 for ; Wed, 13 May 2026 04:45:13 -0700 (PDT) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4549120eab7sm39590855f8f.23.2026.05.13.04.45.12 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 13 May 2026 04:45:12 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=google header.d=suse.com header.i="@suse.com" header.h="Content-Transfer-Encoding:In-Reply-To:Autocrypt:Content-Language:References:Cc:To:From:Subject:User-Agent:MIME-Version:Date:Message-ID" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1778672713; x=1779277513; darn=lists.xenproject.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=8KDAfpZOnzo89l1OvnPb3ALjiYAkA9DUYfDlOPj7cuI=; b=N+R6y1M2ABZQ/E5qhaMyzBGgaV/Pm++wPS+lz0Lbln8AFteD0A05a6iqlW+67OX26H gAMp2Pq5e+FkHYMl/1zeQd2dGy281jpGXuC38tUnPsaHjaImPW7uia5avzZQZOwVdWnS G8SGVrvZrTnNgzUFa+ReTBpVW0XwhWxLlPpt7yJAlV4Q6XQkEUkSZaKy8JFQLyE9w8FB qx0Y9yjFiZ5SuSLff+NoZ0rSK04cers1vQBBxkXvWfn+8jpSmK3EsUlpK+gL8a8p1ZJU +GjlWtw16eVMNCvh94oN0e727/G8SXzRv0xtl7KuXk2TUz2kAm3zhoBv2c2lGaR+U5TP 3PQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778672713; x=1779277513; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=8KDAfpZOnzo89l1OvnPb3ALjiYAkA9DUYfDlOPj7cuI=; b=JUVj5Qak2iRJQ0YuqZ9T8qhQx1NutKQll6YiEVLeuDRwnOYySZjFbVZuN0UEcF+rwp mEsx2nAHSyfWaKDkXzasgHAQh6p9h67gFc2McJ6m3PHsk/KlQtxWR7sdSVVocxupBGs2 L7a2AChdNnYfOL4tojg460ffVdSYwUJCZEV/xlmb7/WvJNcgCHoqEkfnu7wV4TLQB3O2 DVQEdnoTmdHQQBL7cxqtZQ+Bux0zQv4EtZR6DhAJtGo1gIFa3R8JJOKNIxuVpT0BjdJ3 t65UZq7/fK9s8uyxstJZn9RngfT1CzA41JP3tVz9ytQvKuWeJdh5y6wUYodnJSksvTB2 g07w== X-Gm-Message-State: AOJu0YzhUaWZTzL9+hyk3QVmsE2ubSXUi40GkD0epXbFJsYEbfNAvPCd MPQpbA1m+VxZht+xleZLPD/yAYvNDA/h8qX1zyHakZQT/8Q/vwZdsgKBfQRJIgosnebE1KHLVP/ jwXM= X-Gm-Gg: Acq92OHs6X+5a5f3WPLzKMokfpgOI2cpQbZ47wagP24Ba0LtJ+bRIBwamDcuuOG77A7 rl5zZx5BOmvSqFO0nyIAxuxeSwHLarVuCAOpcCKSyetl+M57uEp2J7iOlgzmg0W+dKAfBnaYPQV BuHylLt1qLlI2THUGolAUA3+RxPJ2fvXkUKuf9Oh3T1HlfIfvhUbNR4cOG1S2w3Uv6bmRTF8Cbt 2Ma6aBe0LL3tfBwcAZAc3p5rH5E4nR7MT4KOCkbMMevF3kPXDK/5rPeGBA3GA3dRv5lHfwYQ+Qf sOX0U1xwzdpFetgYMYlmnqKnw+BoVcNzKyWMuSGd52n7v5UfhRKl41bfKZSWS2Asv0mSD/tGXDe ApRhQsHlrBTmJoNS4pfjxSr5RRrh9/uTXUWr2x//mkYeN8mfpc/AnYWnQgDBgZ9MVFA9He/oAe1 OCPT5b4ebXjvKM7sAyHFMvSzWbHRZcGRN1I1EqEZYpEdDblt0ertCTffDPIouXjErKU9oQSsXuZ i9bH9S7wlzLKd4= X-Received: by 2002:a05:6000:4203:b0:43d:7868:21f0 with SMTP id ffacd0b85a97d-45c790b2918mr3990637f8f.9.1778672713343; Wed, 13 May 2026 04:45:13 -0700 (PDT) Message-ID: <86b0f926-6733-48ca-90d5-5601e7c6f0bb@suse.com> Date: Wed, 13 May 2026 13:45:12 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH 3/5] x86/shadow: conditionalize / rename local variables From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= , Teddy Astie References: <5eaaf72a-850c-4535-9f20-13b4feed38d1@suse.com> Content-Language: en-US Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: <5eaaf72a-850c-4535-9f20-13b4feed38d1@suse.com> Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-ebf023/1778672713-41B7B3FF-3D8EEAA2/0/0 X-purgate-type: clean X-purgate-size: 2006 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1778672733699158500 Content-Type: text/plain; charset="utf-8" ... shadowing a function scope one in one case and the global _end[] in another, thus violating Misra C:2012 rule 5.3 ("An identifier declared in an inner scope shall not hide an identifier declared in an outer scope"). No difference in generated code. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monn=C3=A9 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -857,13 +857,13 @@ do { /* 64-bit l2: touch all entries except for PAE compat guests. */ #define FOREACH_PRESENT_L2E(_sl2mfn, _sl2e, _gl2p, _done, _dom, _code) = \ do { = \ - unsigned int _i, _end =3D SHADOW_L2_PAGETABLE_ENTRIES; = \ + unsigned int _i, _nr =3D SHADOW_L2_PAGETABLE_ENTRIES; = \ shadow_l2e_t *_sp =3D map_domain_page((_sl2mfn)); = \ ASSERT_VALID_L2(mfn_to_page(_sl2mfn)->u.sh.type); = \ if ( is_pv_32bit_domain(_dom) /* implies !paging_mode_external */ && = \ mfn_to_page(_sl2mfn)->u.sh.type !=3D SH_type_l2_64_shadow ) = \ - _end =3D COMPAT_L2_PAGETABLE_FIRST_XEN_SLOT(_dom); = \ - for ( _i =3D 0; _i < _end; ++_i ) = \ + _nr =3D COMPAT_L2_PAGETABLE_FIRST_XEN_SLOT(_dom); = \ + for ( _i =3D 0; _i < _nr; ++_i ) = \ { = \ (_sl2e) =3D _sp + _i; = \ if ( shadow_l2e_get_flags(*(_sl2e)) & _PAGE_PRESENT ) = \ @@ -3349,7 +3349,9 @@ static pagetable_t cf_check sh_update_cr #if SHADOW_PAGING_LEVELS =3D=3D 3 { mfn_t smfn =3D pagetable_get_mfn(v->arch.paging.shadow.shadow_= table[0]); +#if GUEST_PAGING_LEVELS !=3D 3 unsigned int i; +#endif =20 for_each_shadow_table(v, i) { From nobody Sat May 30 11:15:11 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1778672787; cv=none; d=zohomail.com; s=zohoarc; b=Wmi/Bkgj/gy9dlOabJQC4FdqcvUyHNk7+CWlvHXQsmrzviaLePlP6UMags7PTAFhCbKGTVwLxqWyS6qoYEj5d5UOx9PjGRJNDAmgb048kGJmCZs0gdRA1xhnL9nsRpOl4bSuRtIiKl2KBhKb2FEXw9HaF851tkQWcMyojHtWFP0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778672787; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=pZuQ87zTRQs5K2PzA9WOyQftHPdtCVC/Cj62DUtB07o=; b=RQIMH5yxU0om7c6h/MOsCd1dCS2gwjfCQzYvOb9B899h9T4EL4x0M5tJw82h1Lp0eJTTP6Fw4q09R5or84pMtZBRz3eCzbcQp4ud29aBLc1RPHBF0Lf+NYF3S6P85iRh6zSjgEQ0iLjSCQpRFlggt7irvoUCPjv6I21ojwRNgMw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1778672787238145.1102296711822; Wed, 13 May 2026 04:46:27 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1307896.1579464 (Exim 4.92) (envelope-from ) id 1wN82U-0006mb-UR; Wed, 13 May 2026 11:46:10 +0000 Received: by outflank-mailman (output) from mailman id 1307896.1579464; Wed, 13 May 2026 11:46:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wN82U-0006mS-Qz; Wed, 13 May 2026 11:46:10 +0000 Received: by outflank-mailman (input) for mailman id 1307896; Wed, 13 May 2026 11:46:10 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wN82U-0006mM-7C for xen-devel@lists.xenproject.org; Wed, 13 May 2026 11:46:10 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wN82T-00D90v-K3 for xen-devel@lists.xenproject.org; Wed, 13 May 2026 13:46:09 +0200 Received: from [10.42.69.10] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6a04647c-2eae-0a2a0a5409dd-0a2a450ad202-16 for ; Wed, 13 May 2026 13:46:09 +0200 Received: from [209.85.128.42] (helo=mail-wm1-f42.google.com) by tlsNG-4011c0.mxtls.expurgate.net with ESMTPS (eXpurgate 4.56.1) (envelope-from ) id 6a046481-56b3-0a2a450a0019-d155802adc46-3 for ; Wed, 13 May 2026 13:46:09 +0200 Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-48909558b3aso66381825e9.0 for ; Wed, 13 May 2026 04:46:09 -0700 (PDT) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48fc8d74536sm71732675e9.15.2026.05.13.04.46.08 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 13 May 2026 04:46:08 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=google header.d=suse.com header.i="@suse.com" header.h="Content-Transfer-Encoding:In-Reply-To:Autocrypt:Content-Language:References:Cc:To:From:Subject:User-Agent:MIME-Version:Date:Message-ID" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1778672769; x=1779277569; darn=lists.xenproject.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=pZuQ87zTRQs5K2PzA9WOyQftHPdtCVC/Cj62DUtB07o=; b=cvgG9udHWEIoY2pPm3m/wYgF5cgUpkMFnYjy7ZiRZGSQrpzzQEN23bUusSDpC2k0u3 OAPNXtGN6BMXhhqBFfhGLprySX/uQ2dmT16KDnPWQjXTWJwmpVxfxoT0G34KQc/emisu FSf6dwDzqavPr1j3lqTzSBRMLNfSbt3vtAN7+ADhV5eiddRLO5I6fwS45uLg07c+l0o4 ZqBIVozG2vLkW2dv3dK9TqHTkfZ4TM8RZXBNJz1zopi5kvFBpoC+xNaR8al1kODkBRAc LQWL2O4zBy56AIIIAtMvcumpHoCYUvft7Y1hoRiCOYwLQlu2fNyqHqzYGw1ZR/kD9clV nRMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778672769; x=1779277569; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=pZuQ87zTRQs5K2PzA9WOyQftHPdtCVC/Cj62DUtB07o=; b=M+JfRidLO7aEfyyJ07qFBMoyCpSRzP79kRBMdKUvJYnu898LVKwx5WLj25Kgv2+Z9G isVmU95NyrFDnwHZt3jOvbka+jFUFO9fU6hHHCTyfhqLsf1M7mZIgO8IbyUpy2wu3Nws TdV/heKqyr4f47/IZsK6PT8XcZYJ4on8SVkbIgRFvII/XKNXLxf+srLRYf2S2KzIv2Pc 9lFg/mg7+Z6m6YEm6tOtZ3GV9Cq0+jztI11AtyEJ2vdUQLj1FNP0gBqo1Qi1VMBPn5at /GIhFdFDO6Lf0IZw86meOem4cBSS7Tx0VaCtYOLMXjplaDUNl9CeWvwmMZmtxgiTX5l9 mhXw== X-Gm-Message-State: AOJu0YyGBcaMoq4EkvJYEoxLgZKXwnknLHB/FqF/Me6GI+fxMORctQVL KetvTxyIvsy3JRo66ybF/eAcxFkJKkl6rZ0D4EvfNpoUsszPB++JjfQfBb1IQffvWO6BZd0UJmd ycKQ= X-Gm-Gg: Acq92OGkRkNiffrrfbf+lxapcJjaSq8xu5uyJEOddGyxr8oEcBauzxx9kLXNNWGoHS8 2lxsN/t16bmx6a7qWekZmC3aclOTxEJ8XOWsIRRGJ1gBlu+RwXQiKY1hI3h25XW6yxJ48XkMluv fEzj6oL39wgRWLCgJLzx7stwPWKMIgYDmivbdVCZ9xhd0cLqfa4FqhsHQC/DqVs30YKoi1tALM3 oLMcINHZ+69QwNYWDX+Q1yWYmsWDh4ZfzE+8XP2Mskn8HFW/ycs+MhyXRYAaIWwKyRDb4jhhtUA W4V2d9wnKXRZCAAKW6q/WVjDxKNIwvmF7a//E0xbWGnrOwoNUL6ysthVqv8VsV/9WIuq/Iwxn++ mavwLeRbWzCg9qsFuEGIEam0Ux0FPDxpaEWGyutcHj0zIxj9c3YpTrJRRK7C3vs6xm3ggPmbYj+ FHZ9R/vGhe/hW14be+JxaACF6uxP/QMGY7/Drd/i17QoPrVRPtwLBig++u8zIBKLZJ+yMnPUKgF Ha66Azugl19nU8= X-Received: by 2002:a05:600c:4583:b0:487:2439:b7be with SMTP id 5b1f17b1804b1-48fce9b2fe7mr33310625e9.6.1778672769058; Wed, 13 May 2026 04:46:09 -0700 (PDT) Message-ID: <146d214c-e766-4b3f-bc50-0b9beee50473@suse.com> Date: Wed, 13 May 2026 13:46:08 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH 4/5] x86/shadow: split a nested max() invocation From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= , Teddy Astie , Stefano Stabellini , Nicola Vetrini References: <5eaaf72a-850c-4535-9f20-13b4feed38d1@suse.com> Content-Language: en-US Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: <5eaaf72a-850c-4535-9f20-13b4feed38d1@suse.com> Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-4011c0/1778672769-73F798B7-C5C149AD/0/0 X-purgate-type: clean X-purgate-size: 1655 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1778672788753158500 Content-Type: text/plain; charset="utf-8" Such nesting causes the inner instance to shadow the outer instance's macro-local variables, thus violating Misra C:2012 rule 5.3 ("An identifier declared in an inner scope shall not hide an identifier declared in an outer scope"). Use an intermediate variable for the inner invocation. No difference in generated code. Signed-off-by: Jan Beulich Reviewed-by: Nicola Vetrini --- Supposedly this case is deviated (rules.rst). Does that deviation not work quite right? Actually, am I mis-reading deviations.ecl or is the respective setting only covering the combination of min() and max(), but not multiple use of the same macro? Furthermore, why would e.g. min(max_t(), ...) need a deviation? Even more generally, aren't those expressions too permissive? --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -767,11 +767,12 @@ static unsigned int sh_min_allocation(co * megabyte of RAM (for the p2m table, minimally enough for HVM's sett= ing * up of slot zero and an LAPIC page), plus one for HVM's 1-to-1 paget= able. */ + unsigned int extra =3D max(domain_tot_pages(d) / 256, + is_hvm_domain(d) ? CONFIG_PAGING_LEVELS + 2 := 0U) + + is_hvm_domain(d); + return shadow_min_acceptable_pages(d) + - max(max(domain_tot_pages(d) / 256, - is_hvm_domain(d) ? CONFIG_PAGING_LEVELS + 2 : 0U) + - is_hvm_domain(d), - d->arch.paging.p2m_pages); + max(extra, d->arch.paging.p2m_pages); } =20 int shadow_set_allocation(struct domain *d, unsigned int pages, bool *pree= mpted) From nobody Sat May 30 11:15:11 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1778672840; cv=none; d=zohomail.com; s=zohoarc; b=essim4QSr/9R7y8qkTu3KCh4ttKtbQXbZ2UqoeLOc5dRNe23g5FzHM/KFPZggame4p7weyMlELeyWWQwD4s8qcm1z8yzcWzY2jFWsk9LEGQfg4eiGdWDxrUl4fEworrBFLGCNwYEsFK22HvW6BwEw3Gn2Cslb7HAyGPNIPDQIpQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778672840; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=5LnypQr9QCdWJIq8PrShfWfOV8zW0x3TsVs9GGSmzQg=; b=gm5y8kdFt4i506iA8vii7m0KHkpvadFNyGmXGKwqXyzZZY4NK3+BmmrvL+72vFOIMuZ+C2sH4xb//3e4KJvvNgMZEaj7dNDDGiaUo1VRFmcunBPNs6u9m29UCB7fWjfECpbTrGwRGfvBnEJGVpg+I40m9G0GCpyaOXrGX1yoH7o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1778672840951670.8200610064364; Wed, 13 May 2026 04:47:20 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1307902.1579473 (Exim 4.92) (envelope-from ) id 1wN83L-0007GU-5z; Wed, 13 May 2026 11:47:03 +0000 Received: by outflank-mailman (output) from mailman id 1307902.1579473; Wed, 13 May 2026 11:47:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wN83L-0007GN-2v; Wed, 13 May 2026 11:47:03 +0000 Received: by outflank-mailman (input) for mailman id 1307902; Wed, 13 May 2026 11:47:01 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wN83J-0007GD-Jp for xen-devel@lists.xenproject.org; Wed, 13 May 2026 11:47:01 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wN83J-00A2US-0T for xen-devel@lists.xenproject.org; Wed, 13 May 2026 13:47:01 +0200 Received: from [10.42.69.8] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6a0464a0-bab6-0a2a0a5309dd-0a2a450898be-40 for ; Wed, 13 May 2026 13:47:00 +0200 Received: from [209.85.128.53] (helo=mail-wm1-f53.google.com) by tlsNG-c1860d.mxtls.expurgate.net with ESMTPS (eXpurgate 4.56.1) (envelope-from ) id 6a0464b4-63b5-0a2a45080019-d1558035e080-3 for ; Wed, 13 May 2026 13:47:00 +0200 Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-488b0e1b870so112025175e9.2 for ; Wed, 13 May 2026 04:47:00 -0700 (PDT) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48fce38e42fsm46744745e9.15.2026.05.13.04.46.59 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 13 May 2026 04:47:00 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=google header.d=suse.com header.i="@suse.com" header.h="Content-Transfer-Encoding:In-Reply-To:Autocrypt:Content-Language:References:Cc:To:From:Subject:User-Agent:MIME-Version:Date:Message-ID" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1778672820; x=1779277620; darn=lists.xenproject.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=5LnypQr9QCdWJIq8PrShfWfOV8zW0x3TsVs9GGSmzQg=; b=J8a0kJaxHNDFCmQ2SkkVqFNSbFK7b9COjP7ZWj58BR4RZclWrXWo3Uuzihb0H03m56 JjckQvXSICynw9HZD4Qkx+bDK1HDjxROkELXfEoDEAVzSVwpDlk1ucnz+Oki3nWXypxq nQGzvRAPawL6mFp534GEzhb2yJE0aDNRvanXWecRpMeVQ0l8EZWN6z4Ka+W2YT/NYezT /k8/EL3GEUIKq1k1Wa5Do01QkkhNJfWJRLm2qhXX1bdwIQy1tuR7sxesWVEZLw8ks93A e1tVbzgIqMEz3dGdztTPw+AVFHZFXxm+iFBs2B1SfhjIoDqsrd0DbXSNcoEQHIV2npuv CodA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778672820; x=1779277620; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=5LnypQr9QCdWJIq8PrShfWfOV8zW0x3TsVs9GGSmzQg=; b=EPQc8d/0gUn5s7YHTzZvlrMZqPLY0LWtGBVnWgDcVQGCFs0xbTBIBG2RO66Shl8rtZ vLDBwiP3g8EexU9WmHXsNMYU1vbHXZOrKx0cXMCb+IVEyhaEEbbPrmwlFttoSg3niusx xLNuNV/Ndrv3AR9dFUsG45A0gBWKwRcw4AxuzoCAzT8wuW5gjYQuSYMtzjdmN/b1HyG9 f3j0DFMZdqwj2PiGct2F6wFz1fa3pekltvOGInH28ZwizSyibc2hDUxUsWOx73HzSPX6 B3zEITz+fAC31MgKGGo6awo4sok/62x1lcsv+/MmNr76JS0YBFYx+jJwQ+WS5P0Amkll Hy9Q== X-Gm-Message-State: AOJu0Ywf5x5QPsJZeIBrAua7TKaRW1+Ip5XAt0Co0BcliUPVgZjUGj9o fwkqBKz1sIDAXGuaKtPHfH9Le9/rwuQxeFrpq4Fgu4qtw3VYo31VPsmuK952zgsjdY3E8e1gcAq XhFE= X-Gm-Gg: Acq92OHpUvY8Cq2HoZvQ22IpPjlAAuntB7llv/hRKYbJbaW/zaeCpPhDV029vUnBod+ uMGgmcDS83QNf2OMBZpT20EsSLOJb2SzAIhXBaaJM0bE7yS9MUAqSRogtWe2Fmyd1fScz1t9SwP hU1vSgyX4kZ4Sa96dsPedXlLlQlOmg3EsR32X4C1mNQFq1EHak5Hh4o5sc1eN4ezZyXCcqAZhju /fJFHkT4UcOylbIYQWEky7QtkDBEPdtnm9NYk5uDu2uZxwxT9QCZ+VtQRfzzlibR5SHGJ+Sqg5t Fy/3TSCVTHoLRDWVGI45uQ82Xo5HxWDbeXrbzJ1Cr0v/N0x3aDL+CbwRo2UIje5VVxcsZCOftdG i7qFgu8urSuv+7DsxkHk15G1EWJTHnrB93dTW8ml4BZ0G7kKkbLgxRX52xIBMPYJylQsuQPc53Q LbpER1jMMl/4dVPQavOi0jynZEnIowT0R+2WZ9nGlsgPtMy43wxVgnAwcc7W9jpM0G7U5nlAq2F HtM895shsfjtR6f86BzPwP+Dg== X-Received: by 2002:a05:600c:4e54:b0:488:c014:34da with SMTP id 5b1f17b1804b1-48fcea15f3cmr36451015e9.26.1778672820418; Wed, 13 May 2026 04:47:00 -0700 (PDT) Message-ID: <8aca671a-eb6f-475d-87cb-7a738ecd0793@suse.com> Date: Wed, 13 May 2026 13:46:59 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH 5/5] x86/shadow: rename a parameter of shadow_l_index() From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= , Teddy Astie References: <5eaaf72a-850c-4535-9f20-13b4feed38d1@suse.com> Content-Language: en-US Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: <5eaaf72a-850c-4535-9f20-13b4feed38d1@suse.com> Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-c1860d/1778672820-BC766DB1-D6F222C2/0/0 X-purgate-type: clean X-purgate-size: 2555 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1778672841425158500 Content-Type: text/plain; charset="utf-8" ... shadowing a file scope one, thus violating Misra C:2012 rule 5.3 ("An identifier declared in an inner scope shall not hide an identifier declared in an outer scope"). While there, - replace u32 by uint32_t, - reduce the number of cf_check by aliasing shadow_l_index() to shadow_l1_index() for N > 1 and GUEST_PAGING_LEVELS > 2. No difference in generated code, except of course the removal of the duplicate function instances. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monn=C3=A9 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -402,46 +402,39 @@ guest_index(const void *ptr) return (u32)((unsigned long)ptr & ~PAGE_MASK) / sizeof(guest_l1e_t); } =20 -static u32 cf_check shadow_l1_index(mfn_t *smfn, u32 guest_index) +static uint32_t cf_check shadow_l1_index(mfn_t *smfn, uint32_t gidx) { #if (GUEST_PAGING_LEVELS =3D=3D 2) ASSERT(mfn_to_page(*smfn)->u.sh.head); - if ( guest_index >=3D SHADOW_L1_PAGETABLE_ENTRIES ) + if ( gidx >=3D SHADOW_L1_PAGETABLE_ENTRIES ) *smfn =3D sh_next_page(*smfn); - return (guest_index % SHADOW_L1_PAGETABLE_ENTRIES); + return (gidx % SHADOW_L1_PAGETABLE_ENTRIES); #else - return guest_index; + return gidx; #endif } =20 -static u32 cf_check shadow_l2_index(mfn_t *smfn, u32 guest_index) -{ #if (GUEST_PAGING_LEVELS =3D=3D 2) +static uint32_t cf_check shadow_l2_index(mfn_t *smfn, uint32_t gidx) +{ int i; ASSERT(mfn_to_page(*smfn)->u.sh.head); // Because we use 2 shadow l2 entries for each guest entry, the number= of // guest entries per shadow page is SHADOW_L2_PAGETABLE_ENTRIES/2 - for ( i =3D 0; i < guest_index / (SHADOW_L2_PAGETABLE_ENTRIES / 2); i+= + ) + for ( i =3D 0; i < gidx / (SHADOW_L2_PAGETABLE_ENTRIES / 2); i++ ) *smfn =3D sh_next_page(*smfn); // We multiply by two to get the index of the first of the two entries // used to shadow the specified guest entry. - return (guest_index % (SHADOW_L2_PAGETABLE_ENTRIES / 2)) * 2; + return (gidx % (SHADOW_L2_PAGETABLE_ENTRIES / 2)) * 2; +} #else - return guest_index; +#define shadow_l2_index shadow_l1_index #endif -} =20 #if GUEST_PAGING_LEVELS >=3D 4 =20 -static u32 cf_check shadow_l3_index(mfn_t *smfn, u32 guest_index) -{ - return guest_index; -} - -static u32 cf_check shadow_l4_index(mfn_t *smfn, u32 guest_index) -{ - return guest_index; -} +#define shadow_l3_index shadow_l1_index +#define shadow_l4_index shadow_l1_index =20 #endif // GUEST_PAGING_LEVELS >=3D 4