From patchwork Fri Sep 29 08:50:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 727602 Delivered-To: patch@linaro.org Received: by 2002:a5d:60c8:0:b0:31d:da82:a3b4 with SMTP id x8csp331880wrt; Fri, 29 Sep 2023 01:52:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGz5FW15e+tqhWn0AAXACPDHDRj5ccD7dBDeI6FWo82ioeSZii6RQv5BqI0g7Sz0+wB++cn X-Received: by 2002:a05:620a:25ce:b0:76e:f7f3:723e with SMTP id y14-20020a05620a25ce00b0076ef7f3723emr2833601qko.38.1695977528210; Fri, 29 Sep 2023 01:52:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695977528; cv=none; d=google.com; s=arc-20160816; b=HDmCd4ngFRtPjwTASwb3O/hQy0dCFMSk/W83raeMmN1Xsp6/1kP/wvWBnnfoazyVOw uBPXwuWzpCmAY6BWfK6KFh3LxU+z0W9O89+ZM7k+QB6+9mYS4Vp0yJQ7Eyiqt7I5d02F IsI8I6CDXMHmiSINtdivas9mKrmTGe8VQh+4KjAB+h/V/DgJzqvCvakVfC4kgzidgW4d ZdVWh20cMrWBINqbh5WMwDN9fb8PliWwLV3mPA3HujmMywirNBOTtsv4LCLhBe58mE1d FXex0AT1pkR7FIaEAHoSH1Ho6kao63iA4GybwDjfy3a8aW6PzZMrv36eEeoVFHv8dT9i 11bA== 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=mNNZqgGBCRydSpAMm3CyVCUzTpS3bjgDJpddGBx98jU=; fh=Z+dvssxbQM7eXtANqJ47vy+t1tQRtHmIMmw64Hhqipo=; b=TjyLVBWFGvtZII+qHk3iGqcFNoezzVL6BVWwo8Z5FngS4S7nnuD64gUtsqkzI2MyP0 ia7vimV/H4acs46r5RO80qmICBK6LXyrmusaAPS+owMApxANpKI/W6+y2HelakeSBgsl jlLsIqH4fcA79Bd7xWC8fHuPav147w+MfRRrfcDZaj9G74LkCWllzvdDOtecQLd2MPIB bgDTaGvZDQ2iD4F9qfWxPsyOnpNCjhRNEZJXMKBzejaiCLz/kTLLQfIlF0u0UgZSVqol 8eSaY+bj2EeQK5Y9zRDghzyA7Bu/9+COnkEFnzQqnl0kHD+Yd/KL+z1/yHj5LAC396uL y0pw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=B2Sy3zHy; 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 py10-20020a05620a878a00b0076d81529c23si10043447qkn.294.2023.09.29.01.52.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Sep 2023 01:52:08 -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=B2Sy3zHy; 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 1qm9Dk-0005Im-Pw; Fri, 29 Sep 2023 04:51:36 -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 1qm9Da-00059a-3G for qemu-devel@nongnu.org; Fri, 29 Sep 2023 04:51:26 -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 1qm9DD-0005e9-5B for qemu-devel@nongnu.org; Fri, 29 Sep 2023 04:51:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695977462; 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=mNNZqgGBCRydSpAMm3CyVCUzTpS3bjgDJpddGBx98jU=; b=B2Sy3zHywSbkwhrRNbXXzkh8TTaEz5iJbyXuwhdWZsYtN2FPPGgkEbOxFYzn1dcdWTPzmi C9DFw9Zr2/KCFEDE4Sz+d4q9zmOPpdvnM3Qz1pkNvKLc16vUwm6Wmr6JO+4uuKIxwu6E1b lljPkU/pYskcaV+U+ymAP0jJI0P47hg= 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-687-lCh5EhyPOK65QNQSC-WqAw-1; Fri, 29 Sep 2023 04:50:55 -0400 X-MC-Unique: lCh5EhyPOK65QNQSC-WqAw-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (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 8FCE385A5A8; 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 6B9D910005D2; Fri, 29 Sep 2023 08:50:55 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 6C83021E6913; 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 10/56] target/arm/hvf: Clean up local variable shadowing Date: Fri, 29 Sep 2023 10:50:07 +0200 Message-ID: <20230929085053.2789105-11-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.3 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Per Peter Maydell analysis [*]: The hvf_vcpu_exec() function is not documented, but in practice its caller expects it to return either EXCP_DEBUG (for "this was a guest debug exception you need to deal with") or something else (presumably the intention being 0 for OK). The hvf_sysreg_read() and hvf_sysreg_write() functions are also not documented, but they return 0 on success, or 1 for a completely unrecognized sysreg where we've raised the UNDEF exception (but not if we raised an UNDEF exception for an unrecognized GIC sysreg -- I think this is a bug). We use this return value to decide whether we need to advance the PC past the insn or not. It's not the same as the return value we want to return from hvf_vcpu_exec(). Retain the variable as locally scoped but give it a name that doesn't clash with the other function-scoped variable. This fixes: target/arm/hvf/hvf.c:1936:13: error: declaration shadows a local variable [-Werror,-Wshadow] int ret = 0; ^ target/arm/hvf/hvf.c:1807:9: note: previous declaration is here int ret; ^ [*] https://lore.kernel.org/qemu-devel/CAFEAcA_e+fU6JKtS+W63wr9cCJ6btu_hT_ydZWOwC0kBkDYYYQ@mail.gmail.com/ Signed-off-by: Philippe Mathieu-Daudé Message-ID: <20230904161235.84651-4-philmd@linaro.org> Reviewed-by: Peter Maydell Signed-off-by: Markus Armbruster --- target/arm/hvf/hvf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 546c0e817f..757e13b0f9 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -1934,16 +1934,16 @@ int hvf_vcpu_exec(CPUState *cpu) uint32_t rt = (syndrome >> 5) & 0x1f; uint32_t reg = syndrome & SYSREG_MASK; uint64_t val; - int ret = 0; + int sysreg_ret = 0; if (isread) { - ret = hvf_sysreg_read(cpu, reg, rt); + sysreg_ret = hvf_sysreg_read(cpu, reg, rt); } else { val = hvf_get_reg(cpu, rt); - ret = hvf_sysreg_write(cpu, reg, val); + sysreg_ret = hvf_sysreg_write(cpu, reg, val); } - advance_pc = !ret; + advance_pc = !sysreg_ret; break; } case EC_WFX_TRAP: