From patchwork Mon Sep 4 16:28:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 720006 Delivered-To: patch@linaro.org Received: by 2002:adf:d08b:0:b0:31d:da82:a3b4 with SMTP id y11csp1694737wrh; Mon, 4 Sep 2023 09:29:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE6NRQ9P0XPdRVsnbHpLiVKoO0mJjLEqkWJ4EKHu68lDBqdvxSmx2GjU5dNJ4fl6tCXN3Jd X-Received: by 2002:a05:620a:66c:b0:765:9c48:a930 with SMTP id a12-20020a05620a066c00b007659c48a930mr9536009qkh.67.1693844975419; Mon, 04 Sep 2023 09:29:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693844975; cv=none; d=google.com; s=arc-20160816; b=E57iKda3mVn9njVGTF/G5aGoeMaXvBB0ilwN6c6pLrAoSF0kpYYCO0IZyWSoaQ5rjV /XxkNuqcRnkTU9D7A2ZKxte3zPfr/1mlb5RYzJNK0id7F7lhN/uYjt8E6MYjFT00y3br ymjRzjgQZuDuVzCjX0a5/F5r1ANpWSdf14NE0wl0ri8g6/LSMp0+eCzvhFi+Hqghruix 5oWEeOit2L5yKu2nvJjaYdKr9Bxl4gwyHccS/p/B2MTs9l690LWh84ofqcbJiJ5SRTyb S4or1jspAk2djH93lQbpQiI/EwFuw+5LU0S1uW1Ofk21lNXypTIMojy2MvfqUtuFSt+W GpqA== 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=wMO9Sabs/iEDm+ChlLb7bnpjmC8D0WEcPQCXeXeTl7Y=; fh=a2o6Hwk52K8cqkKDPy4SEyN55IX2FdSHH2hiw24QO6c=; b=Qs+wfdmoS1tgZ/NHHbJcRS+uKE+pkMqyFfrXSKl7cdABklCLSnlVq2H/6M6vpCTiz9 AvT+oJVKKqnAvPChyszAw1NpJbWl8EZ9/x5h6NmFSv0EwpxpeZ9TMCls3dLNqW14WZNy 8fYcQ0aJNjU0NXx1YPsH98/88O6zXyx+rXtO9NssTvQC/7m1seclDqonqzLwg+gPvqSO V8wNIW7Z2++H9cxqA8PjDMB2zXM9GTVE4H6RFasWliO4SyJGbLJh6zaEf3JKL3zWBPEy PqYWH4bl4dZRK32mcoi4FRbu1V76ksZnTJIRuSwmDbzJyRzVyL/PtfxI1/WC0Ey4538W 0X/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yD0J6cbO; 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=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d19-20020a05620a241300b0076f1f06b742si7117748qkn.522.2023.09.04.09.29.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 04 Sep 2023 09:29:35 -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=@linaro.org header.s=google header.b=yD0J6cbO; 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=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qdCRM-0001z7-7t; Mon, 04 Sep 2023 12:28:40 -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 1qdCRI-0001sw-TU for qemu-devel@nongnu.org; Mon, 04 Sep 2023 12:28:37 -0400 Received: from mail-lf1-x131.google.com ([2a00:1450:4864:20::131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qdCRG-0002Io-LE for qemu-devel@nongnu.org; Mon, 04 Sep 2023 12:28:36 -0400 Received: by mail-lf1-x131.google.com with SMTP id 2adb3069b0e04-50079d148aeso2721299e87.3 for ; Mon, 04 Sep 2023 09:28:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693844912; x=1694449712; 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=wMO9Sabs/iEDm+ChlLb7bnpjmC8D0WEcPQCXeXeTl7Y=; b=yD0J6cbO1z/x2ouypxEh1jeG8paBFqI4kD5dngU9ByViGXxjB2HQpu4iEVMd0kc9Ay TJ7zdmD4PO7W/sEF97e7TCkqG7Q9+9+RgW1gyH65aKoC5h9G2FfGvA9vAHI9pAMgXdpv FM4ke3VDhNauxI5E1hI3AgH0jGGRlhB6Oc/omd+Ug1Kw8mBohGi1hBMVaeEBOKu6eytS 4oUFQALjmjWZ3DdHYZbtK6bT/kqDiIdKsQC0xgyJhEtGxrJRVaDPqnmoG7Zsfgn1jC5Q YIENWQCkMfhnAuWj3OgFifjxo7LBcBjYcxOJWsxXJ9Wuz1KAdaIH+EjNVfErXfN8bxB8 8JgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693844912; x=1694449712; 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=wMO9Sabs/iEDm+ChlLb7bnpjmC8D0WEcPQCXeXeTl7Y=; b=lJdlaNZCwR1L3VLeMHO6ygtXm5t0rf+PvdDLBRGnmq5/L8vrcuY5BEgQ5dVQme40pv QL6/mRBm63V5LDZNFNc38B4q2BpTXdZzblpdhq+RC3jQXmp9vsc84mG+c+qrdoVbxz06 IdPUwhnq9MUnUqE5uJm7jIEYHX7nT5jQY7azaqCD/WPfM4witrOaAJfmAIEPg6/lHbbv lObJb69bZd31F/DI81OU/Pj6SQHdsKoRGAbxQbWu6S/o6rnTQDW+gy7Ex3VanuIWlRq8 l/47xsUSF0Xwaondk46ED2v0hvUMB3R8j+KMI/RLhWpDa8OwzKwIdkElbS7kyQrU2sNI HmiQ== X-Gm-Message-State: AOJu0YyG2zOU7kMfSemT7QA0UdMJ+n36AazmsyE5gkl+WnYZzlquxLm5 ojykrLKrkmh3P1qehMhYqqKS6obuCZx2hUSieMI= X-Received: by 2002:a05:6512:b08:b0:4fe:279b:7603 with SMTP id w8-20020a0565120b0800b004fe279b7603mr8729519lfu.14.1693844912164; Mon, 04 Sep 2023 09:28:32 -0700 (PDT) Received: from m1x-phil.lan ([176.187.209.227]) by smtp.gmail.com with ESMTPSA id d17-20020aa7ce11000000b00522572f323dsm6000348edv.16.2023.09.04.09.28.30 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 04 Sep 2023 09:28:31 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Markus Armbruster Cc: qemu-block@nongnu.org, qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Eduardo Habkost , Marcel Apfelbaum , Yanan Wang Subject: [PATCH 1/3] hw/core/machine: Clean up local variable shadowing Date: Mon, 4 Sep 2023 18:28:22 +0200 Message-ID: <20230904162824.85385-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230904162824.85385-1-philmd@linaro.org> References: <20230904162824.85385-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::131; envelope-from=philmd@linaro.org; helo=mail-lf1-x131.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=unavailable 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 Fix: hw/core/machine.c: In function ‘machine_initfn’: hw/core/machine.c:1081:17: warning: declaration of ‘obj’ shadows a parameter [-Wshadow=compatible-local] 1081 | Object *obj = OBJECT(ms); | ^~~ hw/core/machine.c:1065:36: note: shadowed declaration is here 1065 | static void machine_initfn(Object *obj) | ~~~~~~~~^~~ Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell --- hw/core/machine.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index da699cf4e1..7adc3d4e13 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -1078,8 +1078,6 @@ static void machine_initfn(Object *obj) ms->maxram_size = mc->default_ram_size; if (mc->nvdimm_supported) { - Object *obj = OBJECT(ms); - ms->nvdimms_state = g_new0(NVDIMMState, 1); object_property_add_bool(obj, "nvdimm", machine_get_nvdimm, machine_set_nvdimm);