| Message ID | 20190922035458.14879-18-richard.henderson@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Move rom and notdirty handling to cputlb | expand |
On 22.09.19 05:54, Richard Henderson wrote: > With the merge of notdirty handling into store_helper, > the last user of cpu->mem_io_vaddr was removed. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > include/hw/core/cpu.h | 2 -- > accel/tcg/cputlb.c | 2 -- > hw/core/cpu.c | 1 - > 3 files changed, 5 deletions(-) > > diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h > index c7cda65c66..031f587e51 100644 > --- a/include/hw/core/cpu.h > +++ b/include/hw/core/cpu.h > @@ -338,7 +338,6 @@ struct qemu_work_item; > * @next_cpu: Next CPU sharing TB cache. > * @opaque: User data. > * @mem_io_pc: Host Program Counter at which the memory was accessed. > - * @mem_io_vaddr: Target virtual address at which the memory was accessed. > * @kvm_fd: vCPU file descriptor for KVM. > * @work_mutex: Lock to prevent multiple access to queued_work_*. > * @queued_work_first: First asynchronous work pending. > @@ -413,7 +412,6 @@ struct CPUState { > * we store some rarely used information in the CPU context. > */ > uintptr_t mem_io_pc; > - vaddr mem_io_vaddr; > /* > * This is only needed for the legacy cpu_unassigned_access() hook; > * when all targets using it have been converted to use > diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c > index 6f4096bd0d..257c59c08c 100644 > --- a/accel/tcg/cputlb.c > +++ b/accel/tcg/cputlb.c > @@ -927,7 +927,6 @@ static uint64_t io_readx(CPUArchState *env, CPUIOTLBEntry *iotlbentry, > cpu_io_recompile(cpu, retaddr); > } > > - cpu->mem_io_vaddr = addr; > cpu->mem_io_access_type = access_type; > > if (mr->global_locking && !qemu_mutex_iothread_locked()) { > @@ -967,7 +966,6 @@ static void io_writex(CPUArchState *env, CPUIOTLBEntry *iotlbentry, > if (!cpu->can_do_io) { > cpu_io_recompile(cpu, retaddr); > } > - cpu->mem_io_vaddr = addr; > cpu->mem_io_pc = retaddr; > > if (mr->global_locking && !qemu_mutex_iothread_locked()) { > diff --git a/hw/core/cpu.c b/hw/core/cpu.c > index 0035845511..73b1ee34d0 100644 > --- a/hw/core/cpu.c > +++ b/hw/core/cpu.c > @@ -261,7 +261,6 @@ static void cpu_common_reset(CPUState *cpu) > cpu->interrupt_request = 0; > cpu->halted = 0; > cpu->mem_io_pc = 0; > - cpu->mem_io_vaddr = 0; > cpu->icount_extra = 0; > atomic_set(&cpu->icount_decr_ptr->u32, 0); > cpu->can_do_io = 1; > Reviewed-by: David Hildenbrand <david@redhat.com> -- Thanks, David / dhildenb
diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index c7cda65c66..031f587e51 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -338,7 +338,6 @@ struct qemu_work_item; * @next_cpu: Next CPU sharing TB cache. * @opaque: User data. * @mem_io_pc: Host Program Counter at which the memory was accessed. - * @mem_io_vaddr: Target virtual address at which the memory was accessed. * @kvm_fd: vCPU file descriptor for KVM. * @work_mutex: Lock to prevent multiple access to queued_work_*. * @queued_work_first: First asynchronous work pending. @@ -413,7 +412,6 @@ struct CPUState { * we store some rarely used information in the CPU context. */ uintptr_t mem_io_pc; - vaddr mem_io_vaddr; /* * This is only needed for the legacy cpu_unassigned_access() hook; * when all targets using it have been converted to use diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 6f4096bd0d..257c59c08c 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -927,7 +927,6 @@ static uint64_t io_readx(CPUArchState *env, CPUIOTLBEntry *iotlbentry, cpu_io_recompile(cpu, retaddr); } - cpu->mem_io_vaddr = addr; cpu->mem_io_access_type = access_type; if (mr->global_locking && !qemu_mutex_iothread_locked()) { @@ -967,7 +966,6 @@ static void io_writex(CPUArchState *env, CPUIOTLBEntry *iotlbentry, if (!cpu->can_do_io) { cpu_io_recompile(cpu, retaddr); } - cpu->mem_io_vaddr = addr; cpu->mem_io_pc = retaddr; if (mr->global_locking && !qemu_mutex_iothread_locked()) { diff --git a/hw/core/cpu.c b/hw/core/cpu.c index 0035845511..73b1ee34d0 100644 --- a/hw/core/cpu.c +++ b/hw/core/cpu.c @@ -261,7 +261,6 @@ static void cpu_common_reset(CPUState *cpu) cpu->interrupt_request = 0; cpu->halted = 0; cpu->mem_io_pc = 0; - cpu->mem_io_vaddr = 0; cpu->icount_extra = 0; atomic_set(&cpu->icount_decr_ptr->u32, 0); cpu->can_do_io = 1;
With the merge of notdirty handling into store_helper, the last user of cpu->mem_io_vaddr was removed. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- include/hw/core/cpu.h | 2 -- accel/tcg/cputlb.c | 2 -- hw/core/cpu.c | 1 - 3 files changed, 5 deletions(-) -- 2.17.1