Re: [PATCH 01/10] system/qtest: Clean up global variable shadowing in qtest_server_init()

[Thomas Huth]

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é <philmd@linaro.org>
> ---
>   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 <thuth@redhat.com>