diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-05-31 14:50:53 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-05-31 16:32:35 +0100 |
| commit | 7446eb07c1da660c38bf075555f2d69b84caf481 (patch) | |
| tree | 02c0f2f75159cf85f6914d2b1b6cc2ea36762c6c | |
| parent | efa99a2ff8edf39f48777326c2debdb196f07c41 (diff) | |
| download | qemu-7446eb07c1da660c38bf075555f2d69b84caf481.zip qemu-7446eb07c1da660c38bf075555f2d69b84caf481.tar.gz qemu-7446eb07c1da660c38bf075555f2d69b84caf481.tar.bz2 | |
Make address_space_get_iotlb_entry() take a MemTxAttrs argument
As part of plumbing MemTxAttrs down to the IOMMU translate method,
add MemTxAttrs as an argument to address_space_get_iotlb_entry().
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-12-peter.maydell@linaro.org
| -rw-r--r-- | exec.c | 2 | ||||
| -rw-r--r-- | hw/virtio/vhost.c | 3 | ||||
| -rw-r--r-- | include/exec/memory.h | 2 |
3 files changed, 4 insertions, 3 deletions
@@ -582,7 +582,7 @@ static MemoryRegionSection flatview_do_translate(FlatView *fv, /* Called from RCU critical section */ IOMMUTLBEntry address_space_get_iotlb_entry(AddressSpace *as, hwaddr addr, - bool is_write) + bool is_write, MemTxAttrs attrs) { MemoryRegionSection section; hwaddr xlat, page_mask; diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index b082900..4565b69 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -897,7 +897,8 @@ int vhost_device_iotlb_miss(struct vhost_dev *dev, uint64_t iova, int write) trace_vhost_iotlb_miss(dev, 1); iotlb = address_space_get_iotlb_entry(dev->vdev->dma_as, - iova, write); + iova, write, + MEMTXATTRS_UNSPECIFIED); if (iotlb.target_as != NULL) { ret = vhost_memory_region_lookup(dev, iotlb.translated_addr, &uaddr, &len); diff --git a/include/exec/memory.h b/include/exec/memory.h index 28a6949..67ea7fe 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -1896,7 +1896,7 @@ void address_space_cache_destroy(MemoryRegionCache *cache); * entry. Should be called from an RCU critical section. */ IOMMUTLBEntry address_space_get_iotlb_entry(AddressSpace *as, hwaddr addr, - bool is_write); + bool is_write, MemTxAttrs attrs); /* address_space_translate: translate an address range into an address space * into a MemoryRegion and an address range into that section. Should be |