From 8816883bb326fd2839cf5c9c43590f4d265afcb6 Mon Sep 17 00:00:00 2001 From: mio Date: Sat, 21 Sep 2024 21:49:01 +0800 Subject: [PATCH] Fix TLB for snapshots --- qemu/accel/tcg/cputlb.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/qemu/accel/tcg/cputlb.c b/qemu/accel/tcg/cputlb.c index 2a658612..16ba4ed2 100644 --- a/qemu/accel/tcg/cputlb.c +++ b/qemu/accel/tcg/cputlb.c @@ -1204,7 +1204,14 @@ static void notdirty_write(CPUState *cpu, vaddr mem_vaddr, unsigned size, } /* For exec pages, this is cleared in tb_gen_code. */ - tlb_set_dirty(cpu, mem_vaddr); + // If we: + // - have memory hooks installed + // - or doing snapshot + // , then never clean the tlb + if (!(cpu->uc->snapshot_level > 0 || mr->priority > 0) && + !(HOOK_EXISTS(cpu->uc, UC_HOOK_MEM_READ) || HOOK_EXISTS(cpu->uc, UC_HOOK_MEM_WRITE))) { + tlb_set_dirty(cpu, mem_vaddr); + } } /*