From f7b61b95f0ed4cf663d922284a88717d67d42daa Mon Sep 17 00:00:00 2001 From: David Hildenbrand Date: Sun, 12 Jan 2020 10:27:13 -0500 Subject: [PATCH] tcg: Factor out CONFIG_USER_ONLY probe_write() from s390x code Factor it out into common code. Similar to the !CONFIG_USER_ONLY variant, let's not allow to cross page boundaries. Backports commit 59e96ac6cb13951dd09afc70622858089abf3384 from qemu --- qemu/include/exec/exec-all.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qemu/include/exec/exec-all.h b/qemu/include/exec/exec-all.h index d94b3675..3f0b6810 100644 --- a/qemu/include/exec/exec-all.h +++ b/qemu/include/exec/exec-all.h @@ -191,9 +191,6 @@ void tlb_set_page(CPUState *cpu, target_ulong vaddr, int mmu_idx, target_ulong size); void tb_invalidate_phys_addr(AddressSpace *as, hwaddr addr); -void probe_write(CPUArchState *env, target_ulong addr, int size, int mmu_idx, - uintptr_t retaddr); - #else static inline void tlb_flush_page(CPUState *cpu, target_ulong addr) { @@ -216,6 +213,9 @@ static inline void tb_invalidate_phys_addr(AddressSpace *as, hwaddr addr) } #endif +void probe_write(CPUArchState *env, target_ulong addr, int size, int mmu_idx, + uintptr_t retaddr); + #define CODE_GEN_ALIGN 16 /* must be >= of the size of a icache line */ /* Estimated block size for TB allocation. */