motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-09-01 06:21:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make address_space_get_iotlb_entry() take a MemTxAttrs argument

Browse source 
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
This commit is contained in:
Peter Maydell 2018-05-31 14:50:53 +01:00
parent efa99a2ff8
commit 7446eb07c1
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
exec.c
View file

@ -582,7 +582,7 @@ static MemoryRegionSection flatview_do_translate(FlatView *fv,
/* Called from RCU critical section */ /* Called from RCU critical section */
IOMMUTLBEntry address_space_get_iotlb_entry(AddressSpace *as, hwaddr addr, IOMMUTLBEntry address_space_get_iotlb_entry(AddressSpace *as, hwaddr addr,
bool is_write) bool is_write, MemTxAttrs attrs)
{ {
MemoryRegionSection section; MemoryRegionSection section;
hwaddr xlat, page_mask; hwaddr xlat, page_mask;

3
hw/virtio/vhost.c
View file

@ -897,7 +897,8 @@ int vhost_device_iotlb_miss(struct vhost_dev *dev, uint64_t iova, int write)
trace_vhost_iotlb_miss(dev, 1); trace_vhost_iotlb_miss(dev, 1);
iotlb = address_space_get_iotlb_entry(dev->vdev->dma_as, iotlb = address_space_get_iotlb_entry(dev->vdev->dma_as,
iova, write); iova, write,
MEMTXATTRS_UNSPECIFIED);
if (iotlb.target_as != NULL) { if (iotlb.target_as != NULL) {
ret = vhost_memory_region_lookup(dev, iotlb.translated_addr, ret = vhost_memory_region_lookup(dev, iotlb.translated_addr,
&uaddr, &len); &uaddr, &len);

2
include/exec/memory.h
View file

@ -1896,7 +1896,7 @@ void address_space_cache_destroy(MemoryRegionCache *cache);
* entry. Should be called from an RCU critical section. * entry. Should be called from an RCU critical section.
*/ */
IOMMUTLBEntry address_space_get_iotlb_entry(AddressSpace *as, hwaddr addr, 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 /* address_space_translate: translate an address range into an address space
* into a MemoryRegion and an address range into that section. Should be * into a MemoryRegion and an address range into that section. Should be