From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8DC93CDB47E for ; Fri, 13 Oct 2023 05:57:49 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qrBAN-0003C5-7U; Fri, 13 Oct 2023 01:56:55 -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 1qrBAL-0003Ba-Le for qemu-devel@nongnu.org; Fri, 13 Oct 2023 01:56:53 -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 1qrBAJ-0007S5-Mg for qemu-devel@nongnu.org; Fri, 13 Oct 2023 01:56:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697176611; 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:autocrypt:autocrypt; bh=VGTGO0kZLu44/JCec7M1A/HLbsedHb1MG+2UMAuKgJU=; b=Smv5XS6dH5Zf1gNB8sOMtFuoJKanKqRZ+YsnamooKDX1pprxzIGhaKxNTsbIpqtSZgFkru k83t30quJWvz3npDQp+ygDpCAPTFBUeZbJONGJS4zugBUkBzo1jkUKiUDF+hx+EGaFJL3B LeJDTDCYLU5CnbZlZWvpZtkcE7pJAGI= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-347-5EoAFVPrPf66K299o0ejug-1; Fri, 13 Oct 2023 01:56:39 -0400 X-MC-Unique: 5EoAFVPrPf66K299o0ejug-1 Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-5368aae40d2so1312369a12.2 for ; Thu, 12 Oct 2023 22:56:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697176598; x=1697781398; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=VGTGO0kZLu44/JCec7M1A/HLbsedHb1MG+2UMAuKgJU=; b=h1hnyq/1qZBewlW0LUCSyw2nroq/vFuWw1QzKj+jDRRE8TLv/yAV/mpa7pohDG33Tg sOcS7LlFWlMvkYnBSXDPfiw0hoE2hqzLwDqmGseLCsi6TS2Mz/cA4HWLNcpYf5WB12n9 IYhyd4zzeGJqcV1t0NCjn0l0GYF0b2i+3zbVtz2rWJBIfBTe8yEk3pLhklFENHiEiYo1 Z/KKdAfJxAc5rw3fEQFNZhMbu0wc04qBQOHtm3a1l3+hqa8wCcIAWG4YD+ZPcgml+ZBK hEkMaWhwD8mU3U3fbdQ3sRZr8z/XhWc6cjBzW2ZuVE9PJrum/mziTGZG7DMMViVrNxOy 2GqQ== X-Gm-Message-State: AOJu0YzJljM4LIWPeW/7ThHH8Jek9B7N+PwQ1B0QsaFlAZcGDb/OjSy4 2XAxFi7tBF2KXw1beo+sg6Bw0YvxahnJI0RUc40goIN65sfl/Tjax+zetjiAh09bMV8+mCjMJpi I3M3aOByGy6MltKA= X-Received: by 2002:a05:6402:26cc:b0:53e:34c5:fc14 with SMTP id x12-20020a05640226cc00b0053e34c5fc14mr1112869edd.23.1697176598115; Thu, 12 Oct 2023 22:56:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGzMHwXI6HqHFftvcTt4Hj9DNDmYJAhG27h4GvHhNtKZUmCW7hTjOex/z0K0ETakkenZuRToQ== X-Received: by 2002:a05:6402:26cc:b0:53e:34c5:fc14 with SMTP id x12-20020a05640226cc00b0053e34c5fc14mr1112853edd.23.1697176597701; Thu, 12 Oct 2023 22:56:37 -0700 (PDT) Received: from [192.168.0.5] (ip-109-43-176-176.web.vodafone.de. [109.43.176.176]) by smtp.gmail.com with ESMTPSA id bm15-20020a0564020b0f00b005346925a474sm11029123edb.43.2023.10.12.22.56.36 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 12 Oct 2023 22:56:37 -0700 (PDT) Message-ID: Date: Fri, 13 Oct 2023 07:56:35 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 01/10] system/qtest: Clean up global variable shadowing in qtest_server_init() To: =?UTF-8?Q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Alberto Garcia , Hao Wu , Kevin Wolf , Laurent Vivier , Paolo Bonzini , qemu-block@nongnu.org, John Snow , Stefan Hajnoczi , Fam Zheng , Tyrone Ting , Markus Armbruster References: <20231009100251.56019-1-philmd@linaro.org> <20231009100251.56019-2-philmd@linaro.org> Content-Language: en-US From: Thomas Huth Autocrypt: addr=thuth@redhat.com; keydata= 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 In-Reply-To: <20231009100251.56019-2-philmd@linaro.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@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=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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 09/10/2023 12.02, Philippe Mathieu-Daudé wrote: > Rename the variable to fix: > > softmmu/qtest.c:869:13: error: declaration shadows a variable in the global scope [-Werror,-Wshadow] > Object *qtest; > ^ > softmmu/qtest.c:53:15: note: previous declaration is here > static QTest *qtest; > ^ > > Signed-off-by: Philippe Mathieu-Daudé > --- > softmmu/qtest.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/softmmu/qtest.c b/softmmu/qtest.c > index 35b643a274..7964f0b248 100644 > --- a/softmmu/qtest.c > +++ b/softmmu/qtest.c > @@ -866,7 +866,7 @@ void qtest_server_init(const char *qtest_chrdev, const char *qtest_log, Error ** > { > ERRP_GUARD(); > Chardev *chr; > - Object *qtest; > + Object *qobj; > > chr = qemu_chr_new("qtest", qtest_chrdev, NULL); > if (chr == NULL) { > @@ -875,18 +875,18 @@ void qtest_server_init(const char *qtest_chrdev, const char *qtest_log, Error ** > return; > } > > - qtest = object_new(TYPE_QTEST); > - object_property_set_str(qtest, "chardev", chr->label, &error_abort); > + qobj = object_new(TYPE_QTEST); > + object_property_set_str(qobj, "chardev", chr->label, &error_abort); > if (qtest_log) { > - object_property_set_str(qtest, "log", qtest_log, &error_abort); > + object_property_set_str(qobj, "log", qtest_log, &error_abort); > } > - object_property_add_child(qdev_get_machine(), "qtest", qtest); > - user_creatable_complete(USER_CREATABLE(qtest), errp); > + object_property_add_child(qdev_get_machine(), "qtest", qobj); > + user_creatable_complete(USER_CREATABLE(qobj), errp); > if (*errp) { > - object_unparent(qtest); > + object_unparent(qobj); > } > object_unref(OBJECT(chr)); > - object_unref(qtest); > + object_unref(qobj); > } Reviewed-by: Thomas Huth