Skip to content

Commit

Permalink
system/qtest: Clean up global variable shadowing in qtest_server_init()
Browse files Browse the repository at this point in the history
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>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20231009100251.56019-2-philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
  • Loading branch information
philmd authored and huth committed Oct 27, 2023
1 parent a952604 commit 63ba5e1
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions system/qtest.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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);
}

static bool qtest_server_start(QTest *q, Error **errp)
Expand Down

0 comments on commit 63ba5e1

Please sign in to comment.