All of lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Stefan Hajnoczi" <stefanha@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PULL 01/11] system/qtest: Clean up global variable shadowing in qtest_server_init()
Date: Fri, 27 Oct 2023 11:37:00 +0200	[thread overview]
Message-ID: <20231027093710.273558-2-thuth@redhat.com> (raw)
In-Reply-To: <20231027093710.273558-1-thuth@redhat.com>

From: Philippe Mathieu-Daudé <philmd@linaro.org>

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>
---
 system/qtest.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/system/qtest.c b/system/qtest.c
index 35b643a274..7964f0b248 100644
--- a/system/qtest.c
+++ b/system/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);
 }
 
 static bool qtest_server_start(QTest *q, Error **errp)
-- 
2.41.0



  reply	other threads:[~2023-10-27  9:38 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-27  9:36 [PULL 00/11] testing patches (+ 1 deprecation patch) Thomas Huth
2023-10-27  9:37 ` Thomas Huth [this message]
2023-10-27  9:37 ` [PULL 02/11] tests/throttle: Clean up global variable shadowing Thomas Huth
2023-10-27  9:37 ` [PULL 03/11] tests/virtio-scsi: " Thomas Huth
2023-10-27  9:37 ` [PULL 04/11] tests/cdrom-test: Clean up global variable shadowing in prepare_image() Thomas Huth
2023-10-27  9:37 ` [PULL 05/11] tests/rtl8139: Clean up global variable shadowing Thomas Huth
2023-10-27  9:37 ` [PULL 06/11] tests/npcm7xx_adc: " Thomas Huth
2023-10-27  9:37 ` [PULL 07/11] tests/aio: " Thomas Huth
2023-10-27  9:37 ` [PULL 08/11] tests/coroutine: " Thomas Huth
2023-10-27  9:37 ` [PULL 09/11] docs/about: Mark the old pc-i440fx-2.0 - 2.3 machine types as deprecated Thomas Huth
2023-10-27  9:37 ` [PULL 10/11] tests/vm/freebsd: Add additional library paths for libfdt Thomas Huth
2023-10-27  9:37 ` [PULL 11/11] ipmi-bt-test: force ipv4 Thomas Huth
2023-10-30  4:39 ` [PULL 00/11] testing patches (+ 1 deprecation patch) Stefan Hajnoczi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231027093710.273558-2-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.