Commit b56668bb authored by Richard Henderson's avatar Richard Henderson
Browse files

cputlb: Remove cpu->mem_io_vaddr 



With the merge of notdirty handling into store_helper,
the last user of cpu->mem_io_vaddr was removed.

Reviewed-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
parent 73bc0bd4

accel/tcg/cputlb.c

+0 −2
Original line number Diff line number Diff line
@@ -928,7 +928,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()) {
@@ -968,7 +967,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()) {

hw/core/cpu.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

include/hw/core/cpu.h

+0 −2
Original line number Diff line number Diff line
@@ -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