Commit bb0e627a authored by Andreas Färber's avatar Andreas Färber
Browse files

exec: Change memory_region_section_get_iotlb() argument to CPUState 



It no longer needs CPUArchState since moving watchpoints to CPUState.

Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent baea4fae

cputlb.c

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ void tlb_set_page(CPUArchState *env, target_ulong vaddr, 
    }



    code_address = address;

    iotlb = memory_region_section_get_iotlb(env, section, vaddr, paddr, xlat,

    iotlb = memory_region_section_get_iotlb(cpu, section, vaddr, paddr, xlat,

                                            prot, &address);



    index = (vaddr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1);

exec.c

+1 −2
Original line number Diff line number Diff line
@@ -799,14 +799,13 @@ static void cpu_physical_memory_set_dirty_tracking(bool enable) 
    in_migration = enable;

}



hwaddr memory_region_section_get_iotlb(CPUArchState *env,

hwaddr memory_region_section_get_iotlb(CPUState *cpu,

                                       MemoryRegionSection *section,

                                       target_ulong vaddr,

                                       hwaddr paddr, hwaddr xlat,

                                       int prot,

                                       target_ulong *address)

{

    CPUState *cpu = ENV_GET_CPU(env);

    hwaddr iotlb;

    CPUWatchpoint *wp;

include/exec/cputlb.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ void tb_flush_jmp_cache(CPUState *cpu, target_ulong addr); 
MemoryRegionSection *

address_space_translate_for_iotlb(AddressSpace *as, hwaddr addr, hwaddr *xlat,

                                  hwaddr *plen);

hwaddr memory_region_section_get_iotlb(CPUArchState *env,

hwaddr memory_region_section_get_iotlb(CPUState *cpu,

                                       MemoryRegionSection *section,

                                       target_ulong vaddr,

                                       hwaddr paddr, hwaddr xlat,