From: Philippe Mathieu-Daudé Date: Mon, 4 Sep 2023 16:28:24 +0000 (+0200) Subject: tests/qtest/pflash: Clean up local variable shadowing X-Git-Tag: qemu-xen-4.20.0~546^2 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=82fdcd3e140c8d4c63f177ece554f90f2bccdf68;p=qemu-xen.git tests/qtest/pflash: Clean up local variable shadowing Fix: tests/qtest/pflash-cfi02-test.c: In function ‘test_geometry’: tests/qtest/pflash-cfi02-test.c:409:22: warning: declaration of ‘byte_addr’ shadows a previous local [-Wshadow=compatible-local] 409 | uint64_t byte_addr = (uint64_t)i * c->sector_len[region]; | ^~~~~~~~~ tests/qtest/pflash-cfi02-test.c:342:14: note: shadowed declaration is here 342 | uint64_t byte_addr = 0; | ^~~~~~~~~ Signed-off-by: Philippe Mathieu-Daudé Message-ID: <20230904162824.85385-4-philmd@linaro.org> Reviewed-by: Peter Maydell Signed-off-by: Thomas Huth --- diff --git a/tests/qtest/pflash-cfi02-test.c b/tests/qtest/pflash-cfi02-test.c index 0b52c2ca5c..8c073efcb4 100644 --- a/tests/qtest/pflash-cfi02-test.c +++ b/tests/qtest/pflash-cfi02-test.c @@ -406,7 +406,7 @@ static void test_geometry(const void *opaque) for (int region = 0; region < nb_erase_regions; ++region) { for (uint32_t i = 0; i < c->nb_blocs[region]; ++i) { - uint64_t byte_addr = (uint64_t)i * c->sector_len[region]; + byte_addr = (uint64_t)i * c->sector_len[region]; g_assert_cmphex(flash_read(c, byte_addr), ==, bank_mask(c)); } }