openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

cputlb: move CPU_LOOP() for tlb_reset() to exec.c 

To prepare for multi-arch, cputlb.c should only have awareness of one
single architecture. This means it should not have access to the full
CPU lists which may be heterogeneous. Instead, push the CPU_LOOP() up
to the one and only caller in exec.c.

Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
Message-Id: <db06dc6c49f8970caaf116d0385f00ee10a56f2f.1441614289.git.crosthwaite.peter@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Peter Crosthwaite 2015-09-10 22:39:41 -07:00 committed by Paolo Bonzini
parent 5f12a788c0
commit 9a13565d52
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cputlb.c
View File

@ -262,27 +262,24 @@ static inline ram_addr_t qemu_ram_addr_from_host_nofail(void *ptr)
return ram_addr; return ram_addr;
} }
void cpu_tlb_reset_dirty_all(ram_addr_t start1, ram_addr_t length) void tlb_reset_dirty(CPUState *cpu, ram_addr_t start1, ram_addr_t length)
{ {
CPUState *cpu;
CPUArchState *env; CPUArchState *env;
CPU_FOREACH(cpu) { int mmu_idx;
int mmu_idx;
env = cpu->env_ptr; env = cpu->env_ptr;
for (mmu_idx = 0; mmu_idx < NB_MMU_MODES; mmu_idx++) { for (mmu_idx = 0; mmu_idx < NB_MMU_MODES; mmu_idx++) {
unsigned int i; unsigned int i;
for (i = 0; i < CPU_TLB_SIZE; i++) { for (i = 0; i < CPU_TLB_SIZE; i++) {
tlb_reset_dirty_range(&env->tlb_table[mmu_idx][i], tlb_reset_dirty_range(&env->tlb_table[mmu_idx][i],
start1, length); start1, length);
} }
for (i = 0; i < CPU_VTLB_SIZE; i++) { for (i = 0; i < CPU_VTLB_SIZE; i++) {
tlb_reset_dirty_range(&env->tlb_v_table[mmu_idx][i], tlb_reset_dirty_range(&env->tlb_v_table[mmu_idx][i],
start1, length); start1, length);
}
} }
} }
} }

5
exec.c
View File

@ -913,6 +913,7 @@ found:
static void tlb_reset_dirty_range_all(ram_addr_t start, ram_addr_t length) static void tlb_reset_dirty_range_all(ram_addr_t start, ram_addr_t length)
{ {
CPUState *cpu;
ram_addr_t start1; ram_addr_t start1;
RAMBlock *block; RAMBlock *block;
ram_addr_t end; ram_addr_t end;
@ -924,7 +925,9 @@ static void tlb_reset_dirty_range_all(ram_addr_t start, ram_addr_t length)
block = qemu_get_ram_block(start); block = qemu_get_ram_block(start);
assert(block == qemu_get_ram_block(end - 1)); assert(block == qemu_get_ram_block(end - 1));
start1 = (uintptr_t)ramblock_ptr(block, start - block->offset); start1 = (uintptr_t)ramblock_ptr(block, start - block->offset);
cpu_tlb_reset_dirty_all(start1, length); CPU_FOREACH(cpu) {
tlb_reset_dirty(cpu, start1, length);
}
rcu_read_unlock(); rcu_read_unlock();
} }

2
include/exec/cputlb.h
View File

@ -25,7 +25,7 @@ void tlb_protect_code(ram_addr_t ram_addr);
void tlb_unprotect_code(ram_addr_t ram_addr); void tlb_unprotect_code(ram_addr_t ram_addr);
void tlb_reset_dirty_range(CPUTLBEntry *tlb_entry, uintptr_t start, void tlb_reset_dirty_range(CPUTLBEntry *tlb_entry, uintptr_t start,
uintptr_t length); uintptr_t length);
void cpu_tlb_reset_dirty_all(ram_addr_t start1, ram_addr_t length); void tlb_reset_dirty(CPUState *cpu, ram_addr_t start1, ram_addr_t length);
void tlb_set_dirty(CPUArchState *env, target_ulong vaddr); void tlb_set_dirty(CPUArchState *env, target_ulong vaddr);
extern int tlb_flush_count; extern int tlb_flush_count;