From nobody Tue Feb 10 12:40:20 2026 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=1695977503; cv=none; d=zohomail.com; s=zohoarc; b=I766puQOnNGIKfEhvpQc0d/gkvOGzDRKagJQqYwHhIhKPT0KI0JqAErx8FlQJHsHadxOYIgVDQRkclQ5+8so3YPqulQTn8QKb8VHuVgOGbuz5sDJiaDei4NBc5tqy+vcOAYd/M/LTz1Qv/Xa71osVAEsAkE7v/oskftPUqYdJkM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695977503; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0BMIMSiB+DtFo+8Bx7+AdacnBshOWBPA/iIwhqoFIAc=; b=dKZCx3J8rGALd0kTKGINGBPYlrwokmZsOW28cy8aTWjqx+NXAGCOL8YhclA48J6SFtigKaUYv3TNkNmNxygMyLvlYROtQ5CIKfFduS+P43LEnAiYQ3D0x5rBBekZWMlfFvZNn9rglYqVX+YL+FMD7j6x3S7jNxUObpUlBJD7AWc= 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 1695977503091456.53606946989294; Fri, 29 Sep 2023 01:51:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm9DQ-000504-GL; Fri, 29 Sep 2023 04:51:16 -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 1qm9DF-0004w9-H3 for qemu-devel@nongnu.org; Fri, 29 Sep 2023 04:51:05 -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 1qm9D9-0005b9-C8 for qemu-devel@nongnu.org; Fri, 29 Sep 2023 04:51:05 -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.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-561-nGD1WDopN_29O-RGCB25-Q-1; Fri, 29 Sep 2023 04:50:55 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 81F3F8002B2; Fri, 29 Sep 2023 08:50:55 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5FE972156A27; Fri, 29 Sep 2023 08:50:55 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 66CD521E6911; Fri, 29 Sep 2023 10:50:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695977458; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0BMIMSiB+DtFo+8Bx7+AdacnBshOWBPA/iIwhqoFIAc=; b=Q0YF4oCglRbW80ty7Xd0bMsBYEkFgwpzCWM/gCCoH8lbn4kJSKAvSmAaSnagB4wcXChzYr X4tAEvwdDe4vat5Gy+NQxQ+agwVk8PnnScg7zAPYhalQCHkI681JmELckqHxF0k91dGexK fgfZ/Bk7nceAmXmGkfVnsmlKHCU6i0M= X-MC-Unique: nGD1WDopN_29O-RGCB25-Q-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PULL 08/56] tcg: Clean up local variable shadowing Date: Fri, 29 Sep 2023 10:50:05 +0200 Message-ID: <20230929085053.2789105-9-armbru@redhat.com> In-Reply-To: <20230929085053.2789105-1-armbru@redhat.com> References: <20230929085053.2789105-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, 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 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: 1695977503673100001 From: Philippe Mathieu-Daud=C3=A9 Fix: tcg/tcg.c:2551:27: error: declaration shadows a local variable [-Werror,-= Wshadow] MemOp op =3D get_memop(oi); ^ tcg/tcg.c:2437:12: note: previous declaration is here TCGOp *op; ^ accel/tcg/tb-maint.c:245:18: error: declaration shadows a local variable = [-Werror,-Wshadow] for (int i =3D 0; i < V_L2_SIZE; i++) { ^ accel/tcg/tb-maint.c:210:9: note: previous declaration is here int i; ^ Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20230904161235.84651-2-philmd@linaro.org> Signed-off-by: Markus Armbruster --- accel/tcg/tb-maint.c | 3 +-- tcg/tcg.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/accel/tcg/tb-maint.c b/accel/tcg/tb-maint.c index 32ae8af61c..8c71cebabd 100644 --- a/accel/tcg/tb-maint.c +++ b/accel/tcg/tb-maint.c @@ -207,13 +207,12 @@ static PageDesc *page_find_alloc(tb_page_addr_t index= , bool alloc) { PageDesc *pd; void **lp; - int i; =20 /* Level 1. Always allocated. */ lp =3D l1_map + ((index >> v_l1_shift) & (v_l1_size - 1)); =20 /* Level 2..N-1. */ - for (i =3D v_l2_levels; i > 0; i--) { + for (int i =3D v_l2_levels; i > 0; i--) { void **p =3D qatomic_rcu_read(lp); =20 if (p =3D=3D NULL) { diff --git a/tcg/tcg.c b/tcg/tcg.c index 604fa9bf3e..ea94d0fbff 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -2549,21 +2549,21 @@ static void tcg_dump_ops(TCGContext *s, FILE *f, bo= ol have_prefs) { const char *s_al, *s_op, *s_at; MemOpIdx oi =3D op->args[k++]; - MemOp op =3D get_memop(oi); + MemOp mop =3D get_memop(oi); unsigned ix =3D get_mmuidx(oi); =20 - s_al =3D alignment_name[(op & MO_AMASK) >> MO_ASHIFT]; - s_op =3D ldst_name[op & (MO_BSWAP | MO_SSIZE)]; - s_at =3D atom_name[(op & MO_ATOM_MASK) >> MO_ATOM_SHIF= T]; - op &=3D ~(MO_AMASK | MO_BSWAP | MO_SSIZE | MO_ATOM_MAS= K); + s_al =3D alignment_name[(mop & MO_AMASK) >> MO_ASHIFT]; + s_op =3D ldst_name[mop & (MO_BSWAP | MO_SSIZE)]; + s_at =3D atom_name[(mop & MO_ATOM_MASK) >> MO_ATOM_SHI= FT]; + mop &=3D ~(MO_AMASK | MO_BSWAP | MO_SSIZE | MO_ATOM_MA= SK); =20 /* If all fields are accounted for, print symbolically= . */ - if (!op && s_al && s_op && s_at) { + if (!mop && s_al && s_op && s_at) { col +=3D ne_fprintf(f, ",%s%s%s,%u", s_at, s_al, s_op, ix); } else { - op =3D get_memop(oi); - col +=3D ne_fprintf(f, ",$0x%x,%u", op, ix); + mop =3D get_memop(oi); + col +=3D ne_fprintf(f, ",$0x%x,%u", mop, ix); } i =3D 1; } --=20 2.41.0