[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/56] tcg: Clean up local variable shadowing
From: |
Markus Armbruster |
Subject: |
[PULL 08/56] tcg: Clean up local variable shadowing |
Date: |
Fri, 29 Sep 2023 10:50:05 +0200 |
From: Philippe Mathieu-Daudé <philmd@linaro.org>
Fix:
tcg/tcg.c:2551:27: error: declaration shadows a local variable
[-Werror,-Wshadow]
MemOp op = get_memop(oi);
^
tcg/tcg.c:2437:12: note: previous declaration is here
TCGOp *op;
^
accel/tcg/tb-maint.c:245:18: error: declaration shadows a local variable
[-Werror,-Wshadow]
for (int i = 0; i < V_L2_SIZE; i++) {
^
accel/tcg/tb-maint.c:210:9: note: previous declaration is here
int i;
^
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20230904161235.84651-2-philmd@linaro.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
accel/tcg/tb-maint.c | 3 +--
tcg/tcg.c | 16 ++++++++--------
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/accel/tcg/tb-maint.c b/accel/tcg/tb-maint.c
index 32ae8af61c..8c71cebabd 100644
--- a/accel/tcg/tb-maint.c
+++ b/accel/tcg/tb-maint.c
@@ -207,13 +207,12 @@ static PageDesc *page_find_alloc(tb_page_addr_t index,
bool alloc)
{
PageDesc *pd;
void **lp;
- int i;
/* Level 1. Always allocated. */
lp = l1_map + ((index >> v_l1_shift) & (v_l1_size - 1));
/* Level 2..N-1. */
- for (i = v_l2_levels; i > 0; i--) {
+ for (int i = v_l2_levels; i > 0; i--) {
void **p = qatomic_rcu_read(lp);
if (p == NULL) {
diff --git a/tcg/tcg.c b/tcg/tcg.c
index 604fa9bf3e..ea94d0fbff 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -2549,21 +2549,21 @@ static void tcg_dump_ops(TCGContext *s, FILE *f, bool
have_prefs)
{
const char *s_al, *s_op, *s_at;
MemOpIdx oi = op->args[k++];
- MemOp op = get_memop(oi);
+ MemOp mop = get_memop(oi);
unsigned ix = get_mmuidx(oi);
- s_al = alignment_name[(op & MO_AMASK) >> MO_ASHIFT];
- s_op = ldst_name[op & (MO_BSWAP | MO_SSIZE)];
- s_at = atom_name[(op & MO_ATOM_MASK) >> MO_ATOM_SHIFT];
- op &= ~(MO_AMASK | MO_BSWAP | MO_SSIZE | MO_ATOM_MASK);
+ s_al = alignment_name[(mop & MO_AMASK) >> MO_ASHIFT];
+ s_op = ldst_name[mop & (MO_BSWAP | MO_SSIZE)];
+ s_at = atom_name[(mop & MO_ATOM_MASK) >> MO_ATOM_SHIFT];
+ mop &= ~(MO_AMASK | MO_BSWAP | MO_SSIZE | MO_ATOM_MASK);
/* If all fields are accounted for, print symbolically. */
- if (!op && s_al && s_op && s_at) {
+ if (!mop && s_al && s_op && s_at) {
col += ne_fprintf(f, ",%s%s%s,%u",
s_at, s_al, s_op, ix);
} else {
- op = get_memop(oi);
- col += ne_fprintf(f, ",$0x%x,%u", op, ix);
+ mop = get_memop(oi);
+ col += ne_fprintf(f, ",$0x%x,%u", mop, ix);
}
i = 1;
}
--
2.41.0
- [PULL 00/56] -Wshadow=local patches patches for 2023-09-29, Markus Armbruster, 2023/09/29
- [PULL 01/56] migration/rdma: Fix save_page method to fail on polling error, Markus Armbruster, 2023/09/29
- [PULL 08/56] tcg: Clean up local variable shadowing,
Markus Armbruster <=
- [PULL 07/56] qobject atomics osdep: Make a few macros more hygienic, Markus Armbruster, 2023/09/29
- [PULL 03/56] ui: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 28/56] hw/intc/openpic: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 30/56] pnv/psi: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 18/56] hw/microblaze: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 19/56] hw/nios2: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 14/56] hw/arm/armv7m: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 06/56] block: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 22/56] util/vhost-user-server: Clean up local variable shadowing, Markus Armbruster, 2023/09/29
- [PULL 31/56] spapr: Clean up local variable shadowing in spapr_dt_cpus(), Markus Armbruster, 2023/09/29