46 lines
1.8 KiB
Diff
46 lines
1.8 KiB
Diff
|
From 42e516ba6969b8f61d7e5e45a4f48f257fecf8e1 Mon Sep 17 00:00:00 2001
|
|||
|
|
From: dinglimin_yewu <dinglimin_yewu@cmss.chinamobile.com>
|
|||
|
|
Date: Sat, 16 Sep 2023 17:56:31 +0800
|
|||
|
|
Subject: [PATCH] tests/qtest/pflash: Clean up local variable shadowing
|
|||
|
|
MIME-Version: 1.0
|
|||
|
|
Content-Type: text/plain; charset=UTF-8
|
|||
|
|
Content-Transfer-Encoding: 8bit
|
|||
|
|
|
|||
|
|
cherry-pick from 82fdcd3e140c8d4c63f177ece554f90f2bccdf68
|
|||
|
|
|
|||
|
|
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é <philmd@linaro.org>
|
|||
|
|
Message-ID: <20230904162824.85385-4-philmd@linaro.org>
|
|||
|
|
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
|
|||
|
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
|||
|
|
Signed-off-by: dinglimin_yewu <dinglimin_yewu@cmss.chinamobile.com>
|
|||
|
|
---
|
|||
|
|
tests/qtest/pflash-cfi02-test.c | 2 +-
|
|||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|||
|
|
|
|||
|
|
diff --git a/tests/qtest/pflash-cfi02-test.c b/tests/qtest/pflash-cfi02-test.c
|
|||
|
|
index 6168edc821..bd1f946fc0 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));
|
|||
|
|
}
|
|||
|
|
}
|
|||
|
|
--
|
|||
|
|
2.41.0.windows.1
|
|||
|
|
|