From: Jim Shu <[email protected]> attrs is already in CPUTLBEntryFull, so this argument is redundant. Just remove it.
Clean up commit 94c6e9cf04409e38563080348d6136879f91ffee Signed-off-by: Jim Shu <[email protected]> Reviewed-by: Gustavo Romero <[email protected]> Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Reviewed-by: Richard Henderson <[email protected]> Signed-off-by: Richard Henderson <[email protected]> Message-ID: <[email protected]> --- accel/tcg/cputlb.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 3d75abbe68..d6115bbb0a 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -1271,7 +1271,7 @@ static inline void cpu_unaligned_access(CPUState *cpu, vaddr addr, static MemoryRegionSection * io_prepare(hwaddr *out_offset, CPUState *cpu, CPUTLBEntryFull *full, - MemTxAttrs attrs, vaddr addr, uintptr_t retaddr) + vaddr addr, uintptr_t retaddr) { MemoryRegionSection *section; hwaddr mr_offset; @@ -1974,12 +1974,10 @@ static uint64_t do_ld_mmio_beN(CPUState *cpu, CPUTLBEntryFull *full, MemoryRegionSection *section; MemoryRegion *mr; hwaddr mr_offset; - MemTxAttrs attrs; tcg_debug_assert(size > 0 && size <= 8); - attrs = full->attrs; - section = io_prepare(&mr_offset, cpu, full, attrs, addr, ra); + section = io_prepare(&mr_offset, cpu, full, addr, ra); mr = section->mr; BQL_LOCK_GUARD(); @@ -1994,13 +1992,11 @@ static Int128 do_ld16_mmio_beN(CPUState *cpu, CPUTLBEntryFull *full, MemoryRegionSection *section; MemoryRegion *mr; hwaddr mr_offset; - MemTxAttrs attrs; uint64_t a, b; tcg_debug_assert(size > 8 && size <= 16); - attrs = full->attrs; - section = io_prepare(&mr_offset, cpu, full, attrs, addr, ra); + section = io_prepare(&mr_offset, cpu, full, addr, ra); mr = section->mr; BQL_LOCK_GUARD(); @@ -2492,12 +2488,10 @@ static uint64_t do_st_mmio_leN(CPUState *cpu, CPUTLBEntryFull *full, MemoryRegionSection *section; hwaddr mr_offset; MemoryRegion *mr; - MemTxAttrs attrs; tcg_debug_assert(size > 0 && size <= 8); - attrs = full->attrs; - section = io_prepare(&mr_offset, cpu, full, attrs, addr, ra); + section = io_prepare(&mr_offset, cpu, full, addr, ra); mr = section->mr; BQL_LOCK_GUARD(); @@ -2512,12 +2506,10 @@ static uint64_t do_st16_mmio_leN(CPUState *cpu, CPUTLBEntryFull *full, MemoryRegionSection *section; MemoryRegion *mr; hwaddr mr_offset; - MemTxAttrs attrs; tcg_debug_assert(size > 8 && size <= 16); - attrs = full->attrs; - section = io_prepare(&mr_offset, cpu, full, attrs, addr, ra); + section = io_prepare(&mr_offset, cpu, full, addr, ra); mr = section->mr; BQL_LOCK_GUARD(); -- 2.43.0
