From patchwork Fri Sep 29 08:50:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 727605 Delivered-To: patch@linaro.org Received: by 2002:a5d:60c8:0:b0:31d:da82:a3b4 with SMTP id x8csp332151wrt; Fri, 29 Sep 2023 01:52:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE2B7QPIIjhIAp2+H4pcyLJBz34y6dbP+CrujL++CpvFGD4omRFd979UuJAINUydpop3Jy3 X-Received: by 2002:ac8:5f8f:0:b0:418:b66:c1bf with SMTP id j15-20020ac85f8f000000b004180b66c1bfmr4140151qta.46.1695977579689; Fri, 29 Sep 2023 01:52:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695977579; cv=none; d=google.com; s=arc-20160816; b=vwmGI6EcSmajaIW3agNyZMNCYnDImq7KYwHzSqvbLiQrcPHSqsRlPYaQNQv2MzLi0C t8L8bz2wgc0OYY1ajLW+Ilz9xTUNsGMjWP3JqeKAnVjGb37ZRpOfsGGQy8MHbZEL4L8t Wc7L0gBkpzYxBu0mAkLWg9aHLtP8cntSlt2cBxNLO33LFyYmuY/hWXP1m0PRDu3DgH6s ZFbu+Moo+CYWSxFEvd+53W73wBIY+IC/H/Qo2quq6vVxJmR5Sh838VGzw76W1ZmixQve +IXz4E4UsMn8ancMYIGCzTMDk8Hj9cmtS4uxWyqoES4CTxlm7xgQL5zT4ncvsJ422Dt6 FJoQ== 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=rHWFkm0Owm+0KO8bC4d1hG2we6McKOc9L+rx16nbk2Q=; fh=u1kk6oY/jZAcw2lMgy0QQr17FnLowJaaL+GvRwVd/XA=; b=oCarTNnklk+Lnp3pBdytg/o2Ki89yKQxJ0qVGxJ0QnQP31eLUwOzn/2FZhHDPs7GUn BgO+GK6yau9q6078vblmEarrywkIrkkVULD2mqBpMOWQqW3Pu+IYte9GjXGDVA4vV3W1 GfJN6s7lWLEDmwbOAMqshBCFMS/Bp/Rm+48/0hoxK6m6IIA81JXe+qytbgsIolUMewhc wUQ2+L2PfuEBSHVfmo0pj7ysYRGbV6u6dy6SKmfVNL7vW3Yf8NbPB7L/MMDjRcYV2hAd BsCkCLkk1Y6XStrrl4eMNWV1KzTDiP5iHZ6frpvnJzAAX0CM0IZUI6445PEw0Sa4P8az dFSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Rud8lAI7; 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 q14-20020a05622a04ce00b00417f34c1f6bsi5157716qtx.576.2023.09.29.01.52.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Sep 2023 01:52:59 -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=Rud8lAI7; 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 1qm9De-0005Cg-L7; Fri, 29 Sep 2023 04:51:31 -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 1qm9DW-00052W-4r for qemu-devel@nongnu.org; Fri, 29 Sep 2023 04:51:22 -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 1qm9DC-0005dJ-N0 for qemu-devel@nongnu.org; Fri, 29 Sep 2023 04:51:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695977461; 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=rHWFkm0Owm+0KO8bC4d1hG2we6McKOc9L+rx16nbk2Q=; b=Rud8lAI7BtPcmbiQGC3XhEOPw2OeYXJ3DJlO7aCNBBI71IUAALBa5pH77SI38NT37LwGYu qgBFUtZ0Kt4omySqaQwx9112SYLzxl7LYWwytYih8gba1Ffv547CA0E7rToqz2mmWeiWaQ 6ZsA8HzT1DozSrrfl3xZDvXNMLfi+9A= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-563-39KKLhHvN0SlLEPlHM0Oyg-1; Fri, 29 Sep 2023 04:50:58 -0400 X-MC-Unique: 39KKLhHvN0SlLEPlHM0Oyg-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (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 A3B983C025BC; Fri, 29 Sep 2023 08:50:57 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 814E19A; Fri, 29 Sep 2023 08:50:57 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id C5E3121E689C; Fri, 29 Sep 2023 10:50:53 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eric Auger Subject: [PULL 39/56] hw/intc/arm_gicv3_its: Avoid shadowing variable in do_process_its_cmd() Date: Fri, 29 Sep 2023 10:50:36 +0200 Message-ID: <20230929085053.2789105-40-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.5 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: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Peter Maydell Avoid shadowing a local variable in do_process_its_cmd(): ../../hw/intc/arm_gicv3_its.c:548:17: warning: declaration of ‘ite’ shadows a previous local [-Wshadow=compatible-local] 548 | ITEntry ite = {}; | ^~~ ../../hw/intc/arm_gicv3_its.c:518:13: note: shadowed declaration is here 518 | ITEntry ite; | ^~~ Signed-off-by: Peter Maydell Message-ID: <20230922152944.3583438-2-peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Eric Auger Signed-off-by: Markus Armbruster --- hw/intc/arm_gicv3_its.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/intc/arm_gicv3_its.c b/hw/intc/arm_gicv3_its.c index 5f552b4d37..52e9aca9c6 100644 --- a/hw/intc/arm_gicv3_its.c +++ b/hw/intc/arm_gicv3_its.c @@ -545,10 +545,10 @@ static ItsCmdResult do_process_its_cmd(GICv3ITSState *s, uint32_t devid, } if (cmdres == CMD_CONTINUE_OK && cmd == DISCARD) { - ITEntry ite = {}; + ITEntry i = {}; /* remove mapping from interrupt translation table */ - ite.valid = false; - return update_ite(s, eventid, &dte, &ite) ? CMD_CONTINUE_OK : CMD_STALL; + i.valid = false; + return update_ite(s, eventid, &dte, &i) ? CMD_CONTINUE_OK : CMD_STALL; } return CMD_CONTINUE_OK; }