Claudio Fontana <cfont...@suse.de> writes:

> Signed-off-by: Claudio Fontana <cfont...@suse.de>
> Reviewed-by: Richard Henderson <richard.hender...@linaro.org>
<snip>
> +#include "qemu/osdep.h"
> +#include "cpu.h"
> +#include "internals.h"
> +#include "exec/exec-all.h"
> +#include "tcg/tlb_helper.h"
> +
> +bool arm_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
> +                      MMUAccessType access_type, int mmu_idx,
> +                      bool probe, uintptr_t retaddr)
> +{
> +    ARMCPU *cpu = ARM_CPU(cs);
> +    ARMMMUFaultInfo fi = {};
> +
> +    int flags = page_get_flags(useronly_clean_ptr(address));
> +    if (flags & PAGE_VALID) {
> +        fi.type = ARMFault_Permission;
> +    } else {
> +        fi.type = ARMFault_Translation;
> +    }

Minor merge conflict caused by dad90de78e (target/arm: Set
ARMMMUFaultInfo.level in user-only arm_cpu_tlb_fill)

Otherwise:

Reviewed-by: Alex Bennée <alex.ben...@linaro.org>


-- 
Alex Bennée

Reply via email to