From patchwork Fri Sep 29 08:50:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 727610 Delivered-To: patch@linaro.org Received: by 2002:a5d:60c8:0:b0:31d:da82:a3b4 with SMTP id x8csp332468wrt; Fri, 29 Sep 2023 01:54:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGnYVcLUr/la4JCcQukr2VBuQYZhwa+BFaCCxt3DunegPP/zDg+nMPhnyotpl3twUnWQixO X-Received: by 2002:a05:6214:588b:b0:65b:17b9:25e8 with SMTP id md11-20020a056214588b00b0065b17b925e8mr3768991qvb.5.1695977641138; Fri, 29 Sep 2023 01:54:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695977641; cv=none; d=google.com; s=arc-20160816; b=Bk+PmaA+iDdcKYBFHgW+tlo5getbhfS98pPbOyt+B11p1Cy0PLRRxt4a0Xtsu/S/9z /n6/BrEeuxjotJrvxvMpGtLzJgphmmfP4eEX8gvi2sLK96WjqPWOFTatpxU6kIloq3W3 dcS/zC8C8Q4pTsOzvZ97fJF1W85dXWzUBBTVCUo3UdGHxUFcb8dNYz1AhNc4yusoCPkT J2CNnqfKilrpOkmXXfUyTQwajx0+LbzEoQFoIozOxl+1zGpLNNKk/z414H48Y9zia471 akQH0Ogg7zBssFbS7GRvMu153z8PewxR+UXGLhuLKJDY83eNAw4zfUgaKsWFuaBVRxMQ J1VA== 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=PfRZm1Tr+msFGXcXQgGvHu4UGdfHaMt0ZevvgeflFQQ=; fh=Z+dvssxbQM7eXtANqJ47vy+t1tQRtHmIMmw64Hhqipo=; b=hBRpdwHtXdsnw6XgIWS9uTbcH/jgKyzpXbmDDg1/zKPE2AUvsJ1axu9lPpuiNy/WX2 jOAp2GCYEmvJca8sZPvpgAg0vPMDBXdypYt4NuHeyqIpRY/O/FfCCEpKCufUH9wijdZU 7iSinZ4R2hrXvGdFEPS2mHm7wlaL+Z4D2ZRlJ/4RHVu48TZIhapu1uBoU6uS06LXi3l5 9vH04tMUqb7cUIz4yctciy7ntF/HqIKySz+IZDPI3qwJKvE4iogmuhvyKGTf75ssX61n MczXc2cLEP1C8Sf9wQhiAQTc+FW7KUSpiuhglMbGJK9ia07tcDyR2ygI+qyHt/d1FY80 gkeg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="Ajny/UbT"; 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k28-20020a0cb25c000000b0063d456fcd44si9523518qve.515.2023.09.29.01.54.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Sep 2023 01:54:01 -0700 (PDT) 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=@redhat.com header.s=mimecast20190719 header.b="Ajny/UbT"; 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=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm9DQ-0004zt-B4; 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 1qm9DH-0004wc-Qk for qemu-devel@nongnu.org; Fri, 29 Sep 2023 04:51:08 -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 1qm9D9-0005bP-Vz for qemu-devel@nongnu.org; Fri, 29 Sep 2023 04:51:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695977459; 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=PfRZm1Tr+msFGXcXQgGvHu4UGdfHaMt0ZevvgeflFQQ=; b=Ajny/UbTfumUbizb8Qd1l3ALuYaNhKRY/L2ZZIgIbBt1tjpkPU7LFLJE2T7OrVNnAnw9gP Qq8mwlaIW3yx8BRTfHjdChAGEX90eXpk0DldeyOiL1FVvg4JY7ueQLn/Lnki1p44Kl7gwl Mc/Cpk46H6cA+MGFdGf7RdG+bdBWq6w= 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-534-RMuwZ1bQPsqn7-JME4WGhA-1; Fri, 29 Sep 2023 04:50:57 -0400 X-MC-Unique: RMuwZ1bQPsqn7-JME4WGhA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (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 D3673802D35; Fri, 29 Sep 2023 08:50:56 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B155C14171CB; Fri, 29 Sep 2023 08:50:56 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 9FE7521E6890; Fri, 29 Sep 2023 10:50:53 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Peter Maydell Subject: [PULL 28/56] hw/intc/openpic: Clean up local variable shadowing Date: Fri, 29 Sep 2023 10:50:25 +0200 Message-ID: <20230929085053.2789105-29-armbru@redhat.com> In-Reply-To: <20230929085053.2789105-1-armbru@redhat.com> References: <20230929085053.2789105-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 Received-SPF: pass client-ip=170.10.133.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_H3=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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Fix: hw/intc/openpic.c: In function ‘openpic_gbl_write’: hw/intc/openpic.c:614:17: warning: declaration of ‘idx’ shadows a previous local [-Wshadow=compatible-local] 614 | int idx; | ^~~ hw/intc/openpic.c:568:9: note: shadowed declaration is here 568 | int idx; | ^~~ Signed-off-by: Philippe Mathieu-Daudé Message-ID: <20230904162824.85385-3-philmd@linaro.org> Reviewed-by: Peter Maydell Signed-off-by: Markus Armbruster --- hw/intc/openpic.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c index c757adbe53..a6f91d4bcd 100644 --- a/hw/intc/openpic.c +++ b/hw/intc/openpic.c @@ -610,11 +610,8 @@ static void openpic_gbl_write(void *opaque, hwaddr addr, uint64_t val, case 0x10B0: case 0x10C0: case 0x10D0: - { - int idx; - idx = (addr - 0x10A0) >> 4; - write_IRQreg_ivpr(opp, opp->irq_ipi0 + idx, val); - } + idx = (addr - 0x10A0) >> 4; + write_IRQreg_ivpr(opp, opp->irq_ipi0 + idx, val); break; case 0x10E0: /* SPVE */ opp->spve = val & opp->vector_mask;