vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests/coroutine: Clean up global variable shadowing 

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>
master
Philippe Mathieu-Daudé 2023-10-09 12:02:51 +02:00 committed by Thomas Huth
parent 0c2c2932a9
commit 89c9040564
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/unit/test-coroutine.c
View File

@ -195,7 +195,7 @@ static void test_no_dangling_access(void)
} }
static bool locked; static bool locked;
static int done; static int done_count;
static void coroutine_fn mutex_fn(void *opaque) static void coroutine_fn mutex_fn(void *opaque)
{ {
@ -206,7 +206,7 @@ static void coroutine_fn mutex_fn(void *opaque)
qemu_coroutine_yield(); qemu_coroutine_yield();
locked = false; locked = false;
qemu_co_mutex_unlock(m); qemu_co_mutex_unlock(m);
done++; done_count++;
} }
static void coroutine_fn lockable_fn(void *opaque) static void coroutine_fn lockable_fn(void *opaque)
@ -218,7 +218,7 @@ static void coroutine_fn lockable_fn(void *opaque)
qemu_coroutine_yield(); qemu_coroutine_yield();
locked = false; locked = false;
qemu_lockable_unlock(x); qemu_lockable_unlock(x);
done++; done_count++;
} }
static void do_test_co_mutex(CoroutineEntry *entry, void *opaque) 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 *c1 = qemu_coroutine_create(entry, opaque);
Coroutine *c2 = qemu_coroutine_create(entry, opaque); Coroutine *c2 = qemu_coroutine_create(entry, opaque);
done = 0; done_count = 0;
qemu_coroutine_enter(c1); qemu_coroutine_enter(c1);
g_assert(locked); g_assert(locked);
qemu_coroutine_enter(c2); qemu_coroutine_enter(c2);
@ -235,11 +235,11 @@ static void do_test_co_mutex(CoroutineEntry *entry, void *opaque)
* terminates. * terminates.
*/ */
qemu_coroutine_enter(c1); qemu_coroutine_enter(c1);
g_assert_cmpint(done, ==, 1); g_assert_cmpint(done_count, ==, 1);
g_assert(locked); g_assert(locked);
qemu_coroutine_enter(c2); qemu_coroutine_enter(c2);
g_assert_cmpint(done, ==, 2); g_assert_cmpint(done_count, ==, 2);
g_assert(!locked); g_assert(!locked);
} }