[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/11] tests/coroutine: Clean up global variable shadowing
|
From: |
Thomas Huth |
|
Subject: |
[PULL 08/11] tests/coroutine: Clean up global variable shadowing |
|
Date: |
Fri, 27 Oct 2023 11:37:07 +0200 |
From: Philippe Mathieu-Daudé <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>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20231009100251.56019-11-philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
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 a2563647e7..49d4d9b251 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
- [PULL 00/11] testing patches (+ 1 deprecation patch), Thomas Huth, 2023/10/27
- [PULL 03/11] tests/virtio-scsi: Clean up global variable shadowing, Thomas Huth, 2023/10/27
- [PULL 02/11] tests/throttle: Clean up global variable shadowing, Thomas Huth, 2023/10/27
- [PULL 04/11] tests/cdrom-test: Clean up global variable shadowing in prepare_image(), Thomas Huth, 2023/10/27
- [PULL 05/11] tests/rtl8139: Clean up global variable shadowing, Thomas Huth, 2023/10/27
- [PULL 01/11] system/qtest: Clean up global variable shadowing in qtest_server_init(), Thomas Huth, 2023/10/27
- [PULL 07/11] tests/aio: Clean up global variable shadowing, Thomas Huth, 2023/10/27
- [PULL 06/11] tests/npcm7xx_adc: Clean up global variable shadowing, Thomas Huth, 2023/10/27
- [PULL 08/11] tests/coroutine: Clean up global variable shadowing,
Thomas Huth <=
- [PULL 09/11] docs/about: Mark the old pc-i440fx-2.0 - 2.3 machine types as deprecated, Thomas Huth, 2023/10/27
- [PULL 10/11] tests/vm/freebsd: Add additional library paths for libfdt, Thomas Huth, 2023/10/27
- [PULL 11/11] ipmi-bt-test: force ipv4, Thomas Huth, 2023/10/27
- Re: [PULL 00/11] testing patches (+ 1 deprecation patch), Stefan Hajnoczi, 2023/10/30