From patchwork Fri Sep 29 08:50:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 727619 Delivered-To: patch@linaro.org Received: by 2002:a5d:60c8:0:b0:31d:da82:a3b4 with SMTP id x8csp333400wrt; Fri, 29 Sep 2023 01:57:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IECBD5E+jAIXoGTVQD+TZ5tYtPEBbai4nUtlYYZaq6wMcmWZl0WIP0x9Dmmi9dyLRaFnccy X-Received: by 2002:a05:620a:136a:b0:775:7530:cbf8 with SMTP id d10-20020a05620a136a00b007757530cbf8mr3492829qkl.39.1695977843746; Fri, 29 Sep 2023 01:57:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695977843; cv=none; d=google.com; s=arc-20160816; b=yxG70+4WPuB9lZ8oq308TMlkfoA4yomEsZQgENSLkQ8vm3DETvS7HjT0tPTAfq5edV maeh811lCXiC0LtO5v5nm0AGw60YVuMj1csTqqV5+U3X5c4HDQp0VsjQ4LGblu4Xz5Ys GAKljkEyRLviL79sU+IlQDB63QDaIZ2TYZYOOuKLEZd5ggVhQdo0ewMLl2ek/a8bYgw2 9gOQ2qPTqvO7y9zMWzevd9Q112gMQVUxJSWcIqq0S9LpJX1OrxQq/QSvkzMclGP2uGO4 WAYBPCth1eI40IDWn/qBohoqER80iDsTFuZe3+YTsrGR0v49+o60I/3rrFL0aJNKOU27 n88Q== 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=y6oUritT/tvNge4hpZhsru6x2nNnKpQ7C/KLQ2rP0D0=; fh=u1kk6oY/jZAcw2lMgy0QQr17FnLowJaaL+GvRwVd/XA=; b=Gz4MdgQ/JEg8DQHAOnkCuymyZMsay7woaxSzEbnZb+KaacgKfZffGA3BkiD0NvGfVi wgnpNqEuYyta9+5pnokR2LrsK71sGpoeLYw9/dPwJUmBfzdmqZxcc9CUOw5H5KiAI54k fbUv3N40iLovGmSJpF9qT7Y7lRzod3CVa5gH3gD13sVth+4qBWVP7mdqOb34nVOTLAcj 9faMHfouCPwBvlbP32ltdWkL50+p4DhGuunQwPeiBZIfuHU9SAZ7fp7TTtz2OKJko6ox q04WgCLh4eE30usxpiV5WnAaslKW5NU6CV0Tx0No6JpKxCrmEzetKnPZBOYyIYRI1j4I ggvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=gerCQHHJ; 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 h19-20020a05620a245300b0077417e7fd27si8701564qkn.290.2023.09.29.01.57.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Sep 2023 01:57:23 -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=gerCQHHJ; 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 1qm9Dm-0005J7-4S; Fri, 29 Sep 2023 04:51:38 -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 1qm9Dc-0005Bq-IR for qemu-devel@nongnu.org; Fri, 29 Sep 2023 04:51:28 -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-0005d2-V0 for qemu-devel@nongnu.org; Fri, 29 Sep 2023 04:51:28 -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=y6oUritT/tvNge4hpZhsru6x2nNnKpQ7C/KLQ2rP0D0=; b=gerCQHHJPpOWZpKnyQpieAljMoDLKZ1qXAzaP2mY+8McHscROPwN6VeCVbBh7ABHEkh88Y wcc0xVi8CGa2OiMpKjerw1kzxEuTXSB4vBHF7JGtHmY7Ia2Blz1NEVnlumgHG0uRDq/4V/ 5p64FDSVga556z7dg/Brx1mDlGxNOWk= 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-29-iL2UWVfDNJKfEiOdOqpwZQ-1; Fri, 29 Sep 2023 04:50:58 -0400 X-MC-Unique: iL2UWVfDNJKfEiOdOqpwZQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (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 AF1C81C0514A; 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 8D34640C6EBF; Fri, 29 Sep 2023 08:50:57 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id CB96621E689E; 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 41/56] hw/arm/smmuv3.c: Avoid shadowing variable Date: Fri, 29 Sep 2023 10:50:38 +0200 Message-ID: <20230929085053.2789105-42-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.2 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 variable in smmuv3_notify_iova(): ../../hw/arm/smmuv3.c: In function ‘smmuv3_notify_iova’: ../../hw/arm/smmuv3.c:1043:23: warning: declaration of ‘event’ shadows a previous local [-Wshadow=local] 1043 | SMMUEventInfo event = {.inval_ste_allowed = true}; | ^~~~~ ../../hw/arm/smmuv3.c:1038:19: note: shadowed declaration is here 1038 | IOMMUTLBEvent event; | ^~~~~ Signed-off-by: Peter Maydell Message-ID: <20230922152944.3583438-4-peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Eric Auger Signed-off-by: Markus Armbruster --- hw/arm/smmuv3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c index 1e9be8e89a..6f2b2bd45f 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -1040,8 +1040,8 @@ static void smmuv3_notify_iova(IOMMUMemoryRegion *mr, SMMUv3State *s = sdev->smmu; if (!tg) { - SMMUEventInfo event = {.inval_ste_allowed = true}; - SMMUTransCfg *cfg = smmuv3_get_config(sdev, &event); + SMMUEventInfo eventinfo = {.inval_ste_allowed = true}; + SMMUTransCfg *cfg = smmuv3_get_config(sdev, &eventinfo); SMMUTransTableInfo *tt; if (!cfg) {