From 3a0ab1a64a595ea7b89e4887942a75524219eaa0 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 16 Nov 2018 21:24:53 -0500 Subject: [PATCH] Partial backport of: exec.c: Handle IOMMUs in address_space_translate_for_iotlb() We just want the parameter changes here. Partial backport of commit 1f871c5e6b0f30644a60a81a6a7aadb3afb030ac from qemu --- qemu/accel/tcg/cputlb.c | 3 ++- qemu/exec.c | 3 ++- qemu/include/exec/exec-all.h | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/qemu/accel/tcg/cputlb.c b/qemu/accel/tcg/cputlb.c index 2c17d559..459ac4fc 100644 --- a/qemu/accel/tcg/cputlb.c +++ b/qemu/accel/tcg/cputlb.c @@ -202,7 +202,8 @@ void tlb_set_page_with_attrs(CPUState *cpu, target_ulong vaddr, } sz = size; - section = address_space_translate_for_iotlb(cpu, asidx, paddr, &xlat, &sz); + section = address_space_translate_for_iotlb(cpu, asidx, paddr, &xlat, &sz, + attrs, &prot); assert(sz >= TARGET_PAGE_SIZE); tlb_debug("vaddr=" TARGET_FMT_lx " paddr=0x" TARGET_FMT_plx diff --git a/qemu/exec.c b/qemu/exec.c index 5fab748d..8214f824 100644 --- a/qemu/exec.c +++ b/qemu/exec.c @@ -495,7 +495,8 @@ MemoryRegion *flatview_translate(FlatView *fv, hwaddr addr, hwaddr *xlat, MemoryRegionSection * address_space_translate_for_iotlb(CPUState *cpu, int asidx, hwaddr addr, - hwaddr *xlat, hwaddr *plen) + hwaddr *xlat, hwaddr *plen, + MemTxAttrs attrs, int *prot) { MemoryRegionSection *section; // Unicorn: atomic_read used instead of atomic_rcu_read diff --git a/qemu/include/exec/exec-all.h b/qemu/include/exec/exec-all.h index 8cf76775..feed4fc6 100644 --- a/qemu/include/exec/exec-all.h +++ b/qemu/include/exec/exec-all.h @@ -364,7 +364,8 @@ void tb_flush_jmp_cache(CPUState *cpu, target_ulong addr); MemoryRegionSection * address_space_translate_for_iotlb(CPUState *cpu, int asidx, hwaddr addr, - hwaddr *xlat, hwaddr *plen); + hwaddr *xlat, hwaddr *plen, + MemTxAttrs attrs, int *prot); hwaddr memory_region_section_get_iotlb(CPUState *cpu, MemoryRegionSection *section, target_ulong vaddr,