From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: qemu-arm@nongnu.org, "Alberto Garcia" <berto@igalia.com>,
"Hao Wu" <wuhaotsh@google.com>, "Kevin Wolf" <kwolf@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Laurent Vivier" <lvivier@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
qemu-block@nongnu.org, "John Snow" <jsnow@redhat.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Fam Zheng" <fam@euphon.net>, "Tyrone Ting" <kfting@nuvoton.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH 10/10] tests/coroutine: Clean up global variable shadowing
Date: Mon, 9 Oct 2023 12:02:51 +0200 [thread overview]
Message-ID: <20231009100251.56019-11-philmd@linaro.org> (raw)
In-Reply-To: <20231009100251.56019-1-philmd@linaro.org>
Rename the global variable to avoid:
tests/unit/test-coroutine.c:430:11: error: declaration shadows a variable in the global scope [-Werror,-Wshadow]
bool *done = opaque;
^
tests/unit/test-coroutine.c:438:10: error: declaration shadows a variable in the global scope [-Werror,-Wshadow]
bool done = false;
^
tests/unit/test-coroutine.c:198:12: note: previous declaration is here
static int done;
^
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
tests/unit/test-coroutine.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/tests/unit/test-coroutine.c b/tests/unit/test-coroutine.c
index b0d21d673a..29695cbdcb 100644
--- a/tests/unit/test-coroutine.c
+++ b/tests/unit/test-coroutine.c
@@ -195,7 +195,7 @@ static void test_no_dangling_access(void)
}
static bool locked;
-static int done;
+static int done_count;
static void coroutine_fn mutex_fn(void *opaque)
{
@@ -206,7 +206,7 @@ static void coroutine_fn mutex_fn(void *opaque)
qemu_coroutine_yield();
locked = false;
qemu_co_mutex_unlock(m);
- done++;
+ done_count++;
}
static void coroutine_fn lockable_fn(void *opaque)
@@ -218,7 +218,7 @@ static void coroutine_fn lockable_fn(void *opaque)
qemu_coroutine_yield();
locked = false;
qemu_lockable_unlock(x);
- done++;
+ done_count++;
}
static void do_test_co_mutex(CoroutineEntry *entry, void *opaque)
@@ -226,7 +226,7 @@ static void do_test_co_mutex(CoroutineEntry *entry, void *opaque)
Coroutine *c1 = qemu_coroutine_create(entry, opaque);
Coroutine *c2 = qemu_coroutine_create(entry, opaque);
- done = 0;
+ done_count = 0;
qemu_coroutine_enter(c1);
g_assert(locked);
qemu_coroutine_enter(c2);
@@ -235,11 +235,11 @@ static void do_test_co_mutex(CoroutineEntry *entry, void *opaque)
* terminates.
*/
qemu_coroutine_enter(c1);
- g_assert_cmpint(done, ==, 1);
+ g_assert_cmpint(done_count, ==, 1);
g_assert(locked);
qemu_coroutine_enter(c2);
- g_assert_cmpint(done, ==, 2);
+ g_assert_cmpint(done_count, ==, 2);
g_assert(!locked);
}
--
2.41.0
next prev parent reply other threads:[~2023-10-09 10:04 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-09 10:02 [PATCH 00/10] tests: Clean up global variables shadowing Philippe Mathieu-Daudé
2023-10-09 10:02 ` [PATCH 01/10] system/qtest: Clean up global variable shadowing in qtest_server_init() Philippe Mathieu-Daudé
2023-10-13 5:56 ` Thomas Huth
2023-10-09 10:02 ` [PATCH 02/10] tests/throttle: Clean up global variable shadowing Philippe Mathieu-Daudé
2023-10-09 10:10 ` Alberto Garcia
2023-10-09 10:02 ` [PATCH 03/10] tests/virtio-scsi: " Philippe Mathieu-Daudé
2023-10-13 5:57 ` Thomas Huth
2023-10-13 7:24 ` Manos Pitsidianakis
2023-10-09 10:02 ` [PATCH 04/10] tests/cdrom-test: Clean up global variable shadowing in prepare_image() Philippe Mathieu-Daudé
2023-10-12 20:46 ` John Snow
2023-10-09 10:02 ` [PATCH 05/10] tests/hd-geo-test: Clean up global variable shadowing Philippe Mathieu-Daudé
2023-10-09 10:06 ` Philippe Mathieu-Daudé
2023-10-09 10:02 ` [PATCH 06/10] tests/rtl8139: " Philippe Mathieu-Daudé
2023-10-13 6:14 ` Thomas Huth
2023-10-09 10:02 ` [PATCH 07/10] tests/npcm7xx_adc: " Philippe Mathieu-Daudé
2023-10-13 6:15 ` Thomas Huth
2023-10-09 10:02 ` [PATCH 08/10] tests/aio: " Philippe Mathieu-Daudé
2023-10-13 6:24 ` Thomas Huth
2023-10-09 10:02 ` [PATCH 09/10] tests/aio-multithread: " Philippe Mathieu-Daudé
2023-10-13 6:26 ` Thomas Huth
2023-10-09 10:02 ` Philippe Mathieu-Daudé [this message]
2023-10-13 6:27 ` [PATCH 10/10] tests/coroutine: " Thomas Huth
2023-10-27 7:39 ` [PATCH 00/10] tests: Clean up global variables shadowing Thomas Huth
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=20231009100251.56019-11-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=armbru@redhat.com \
--cc=berto@igalia.com \
--cc=fam@euphon.net \
--cc=jsnow@redhat.com \
--cc=kfting@nuvoton.com \
--cc=kwolf@redhat.com \
--cc=lvivier@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=thuth@redhat.com \
--cc=wuhaotsh@google.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).