diff options
| author | Peter Maydell | 2018-05-31 15:50:52 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-05-31 15:50:52 +0200 |
| commit | bc6b1cec84618bf977a451eac30ed1ee4c735963 (patch) | |
| tree | 17b62b24ca89c8328e9783b3cb836092ae5cb808 /target | |
| parent | Make tb_invalidate_phys_addr() take a MemTxAttrs argument (diff) | |
| download | qemu-bc6b1cec84618bf977a451eac30ed1ee4c735963.tar.gz qemu-bc6b1cec84618bf977a451eac30ed1ee4c735963.tar.xz qemu-bc6b1cec84618bf977a451eac30ed1ee4c735963.zip | |
Make address_space_translate{, _cached}() take a MemTxAttrs argument
As part of plumbing MemTxAttrs down to the IOMMU translate method,
add MemTxAttrs as an argument to address_space_translate()
and address_space_translate_cached(). Callers either have an
attrs value to hand, or don't care and can use MEMTXATTRS_UNSPECIFIED.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20180521140402.23318-4-peter.maydell@linaro.org
Diffstat (limited to 'target')
| -rw-r--r-- | target/arm/kvm.c | 3 | ||||
| -rw-r--r-- | target/riscv/helper.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 5141d0adc5..98f5006323 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -664,7 +664,8 @@ int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route, /* MSI doorbell address is translated by an IOMMU */ rcu_read_lock(); - mr = address_space_translate(as, address, &xlat, &len, true); + mr = address_space_translate(as, address, &xlat, &len, true, + MEMTXATTRS_UNSPECIFIED); if (!mr) { goto unlock; } diff --git a/target/riscv/helper.c b/target/riscv/helper.c index 95889f23b9..29e1a603dc 100644 --- a/target/riscv/helper.c +++ b/target/riscv/helper.c @@ -210,7 +210,7 @@ restart: MemoryRegion *mr; hwaddr l = sizeof(target_ulong), addr1; mr = address_space_translate(cs->as, pte_addr, - &addr1, &l, false); + &addr1, &l, false, MEMTXATTRS_UNSPECIFIED); if (memory_access_is_direct(mr, true)) { target_ulong *pte_pa = qemu_map_ram_ptr(mr->ram_block, addr1); |