From patchwork Fri Sep 22 15:29:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 1838285 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=FG2juzi6; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RsbnR4KZFz1yh6 for ; Sat, 23 Sep 2023 01:30:35 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qji6f-0005XA-Gj; Fri, 22 Sep 2023 11:30:13 -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 1qji6X-0005PV-I1 for qemu-devel@nongnu.org; Fri, 22 Sep 2023 11:30:06 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qji6J-00007g-1m for qemu-devel@nongnu.org; Fri, 22 Sep 2023 11:30:05 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-4053cb57f02so10477375e9.1 for ; Fri, 22 Sep 2023 08:29:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1695396589; x=1696001389; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=e4LAtaTxpPIY+cUiG9L3w0qrtTDg/0NhKrP1vDNuOF8=; b=FG2juzi6BuwJZSfCnY93VL+yYmcYVOVjIa8g7tw4C0VdV/LA3JIhNStcVNQNV72AIN rUh6cx9WmI+SpX21JTr55bxTRI5KMbNcYJX6GyBhpNpIti81JKGXwykggH9KZv3aYUz5 y0sMhYv/2ch+UZSJSt3gfjWSQtY/KPNn05kZPOr4LuKVf4SOuvBal6sown7phtHU0d9C qiq9hFGJKuyGWZ4Fdo8iMS3dw6lqxnkl+uSUM0Ns2XTVlLA87Arhy1BEuhr5q5894zmJ Vs81rqzBTfeU9jmt2xHNwX9QvqjhG9KJUQyoNM4Ybczn3xqJfsBUkS/vwIljiY0uA3lg 3Hjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695396589; x=1696001389; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=e4LAtaTxpPIY+cUiG9L3w0qrtTDg/0NhKrP1vDNuOF8=; b=EDLmVimppuQjS85LR+npX1UmdgapHDaGidrehHI80BKNcAHFTIgQOpJ/1+p4Hm2uMk gLg/ckSEqP05oiTUobzixVuueA8uWnq3++TG0bvYkrKyb+nk3Jkhxknm46qYCWzaW2SP 3Qgp2dlHJpqBy4ewTX5LOm6cuN1m2lVWEv6rFMtt1JMvG8t7uF2hfcmSbyiFJDp+Esfj 1aSrKz3BPQey/6Wn1on8vePk+szr94V8ezf5MMFWPdkb5FCxIM53EcbO7pFyKgwDF1oA XUHs3HbXtanabeWY0i7RJzHu1eTj5RCDaNRcnHn0nZmoJoMl7WRwcYmjrntH5NSDK7Sl LZOg== X-Gm-Message-State: AOJu0Yyseyri23OWt2U8y9Y8tj8dEr2KmX50vPY2wPfG+Zx+mrjHNIQc QeRGKj/P1l+cn7H0/9KTjivDIbLWYzRE/SDmiyI= X-Google-Smtp-Source: AGHT+IFsdXN0nvTEAHWVm9ZqJujXKta3UfSgAFcF+cS3zC3zyoWy3uCUPqjH4uAVFsenD/1tL0MoRA== X-Received: by 2002:a7b:cd9a:0:b0:3fe:5053:1a0b with SMTP id y26-20020a7bcd9a000000b003fe50531a0bmr7723989wmj.11.1695396589732; Fri, 22 Sep 2023 08:29:49 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id c22-20020a05600c171600b00405442edc69sm777137wmn.14.2023.09.22.08.29.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 08:29:49 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: Eric Auger , Markus Armbruster Subject: [PATCH 3/4] hw/arm/smmuv3.c: Avoid shadowing variable Date: Fri, 22 Sep 2023 16:29:43 +0100 Message-Id: <20230922152944.3583438-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230922152944.3583438-1-peter.maydell@linaro.org> References: <20230922152944.3583438-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32d.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Eric Auger --- 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 1e9be8e89af..6f2b2bd45f9 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) {