From patchwork Fri Sep 29 08:50:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 727606 Delivered-To: patch@linaro.org Received: by 2002:a5d:60c8:0:b0:31d:da82:a3b4 with SMTP id x8csp332252wrt; Fri, 29 Sep 2023 01:53:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH9zqLPoiyWVqKSHXtOmRJCHYNowvZqbCzZqGfhzJ/RoeVGLvz0eQG3n8IsPLrrOejPjH1K X-Received: by 2002:a05:620a:4316:b0:76c:ba61:f8b with SMTP id u22-20020a05620a431600b0076cba610f8bmr3962600qko.23.1695977602574; Fri, 29 Sep 2023 01:53:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695977602; cv=none; d=google.com; s=arc-20160816; b=lBMWXv2XB3fVCnLKg3npE/38wxOxoVMAKehAgri742W6YvKwaKxZrJlNLN7Z6ZgPqa TTfg3vMQBNgVunlwNLQ8MFb0K0d7EixlxqYGaWHCBb3SrPm/HGViJ8iblI0Psb7WEkSK Dv7MqZk/M22yzJwl5pB+SgiAYt6lF0tCVUhOOnTzHNYn/wpfkdOr2ez6T1iNt8bWKCZ+ TuRXq3tf8x7yBpe+7Zgj6ITUDpdD2jfQoIXdy7BV9jrFYKP2ohmlXkizsr2n6bMPyRWZ WDASdlq62YLTfaAsQJVq4xkR/GQ4P0EBFCFoP5vM2j83tozBh2g98h/oaT5G2An5+itu ro+g== 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=b/5nebuArM3BUaPbXl0XGZrfg9ZeOX0VBSaMHR6v93I=; fh=wFbHg8zksF24Et4Bhh4D1nm102BHwR8vAPs9hR7EQAY=; b=Yr/HbJxkYushDcdTn7dnwFPv7RRUS/QmsbtZBx6osDS/GOPapNLc7O5f7XM1fQwmKY qAG9X0frxKYfaTcfDlcPhghD4wpXbFfMJ5UOtL/nxLhjDizpW2p+s7dXake3kbXP0w/Q vJE3rRljYGzAdIYg0by20YZAFqwz7+6kdo4f/AOXVBsKxuce6cH4yFNAfha7lvk1rIwV hDsYM7Ke/ZnGO6cFed9oY6bK7Emhp1Pwmfzp26IoQf3fdjC97BCuBtZU4P1zcHX1Tli6 1qZmLKz/1YQkh6QGs1q/sEeoqWXOwXoIzruLATSrI/nrSCsLy4dweQbPr6UMU+vG/4YI 6ASg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Q5lGTLwB; 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 dt20-20020a05620a479400b00774383c131dsi1013004qkb.121.2023.09.29.01.53.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Sep 2023 01:53:22 -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=Q5lGTLwB; 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 1qm9Dj-0005Gs-8X; Fri, 29 Sep 2023 04:51:35 -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 1qm9DT-00050j-2o for qemu-devel@nongnu.org; Fri, 29 Sep 2023 04:51:19 -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 1qm9DC-0005cW-HH for qemu-devel@nongnu.org; Fri, 29 Sep 2023 04:51:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695977460; 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=b/5nebuArM3BUaPbXl0XGZrfg9ZeOX0VBSaMHR6v93I=; b=Q5lGTLwBM9DOl/UWHyUnniZeuKWQxc13AJYgC7qHPwBjbocoMq5rHeuFWdo4WA0RUOTANN D5svc/2vqUwlv5IbpMhHrfGJ+RkBd6hoqHWVfuAtrJ4w4U5Lo/j7y4dW4rYplYaUn5cEgQ FqxqU0tjqprj1/eSHuX/x05xQZajMi0= 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-472-qDLvY7ZKNgGkFcMdGCMX_A-1; Fri, 29 Sep 2023 04:50:57 -0400 X-MC-Unique: qDLvY7ZKNgGkFcMdGCMX_A-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (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 B55A53806739; 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 93A6740C2070; Fri, 29 Sep 2023 08:50:56 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 9767A21E688A; 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 Xu Subject: [PULL 25/56] softmmu/memory: Clean up local variable shadowing Date: Fri, 29 Sep 2023 10:50:22 +0200 Message-ID: <20230929085053.2789105-26-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.1 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: 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_H3=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: Philippe Mathieu-Daudé Fix: softmmu/memory.c: In function ‘mtree_print_mr’: softmmu/memory.c:3236:27: warning: declaration of ‘ml’ shadows a previous local [-Wshadow=compatible-local] 3236 | MemoryRegionList *ml; | ^~ softmmu/memory.c:3213:32: note: shadowed declaration is here 3213 | MemoryRegionList *new_ml, *ml, *next_ml; | ^~ Signed-off-by: Philippe Mathieu-Daudé Message-ID: <20230904161235.84651-22-philmd@linaro.org> Reviewed-by: Peter Xu Signed-off-by: Markus Armbruster --- softmmu/memory.c | 1 - 1 file changed, 1 deletion(-) diff --git a/softmmu/memory.c b/softmmu/memory.c index c0383a163d..234bd7b116 100644 --- a/softmmu/memory.c +++ b/softmmu/memory.c @@ -3245,7 +3245,6 @@ static void mtree_print_mr(const MemoryRegion *mr, unsigned int level, } if (mr->alias) { - MemoryRegionList *ml; bool found = false; /* check if the alias is already in the queue */