From: Philippe Mathieu-Daudé Date: Fri, 23 Oct 2020 15:19:22 +0000 (+0200) Subject: pci: Let pci_dma_read() propagate MemTxResult X-Git-Tag: v6.0.0-rc0~189^2~100 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c27f498237bdbdf956e815de77bf63b003355f7e;p=thirdparty%2Fqemu.git pci: Let pci_dma_read() propagate MemTxResult pci_dma_rw() returns a MemTxResult type. Do not discard it, return it to the caller. Reviewed-by: Li Qiang Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20201023151923.3243652-10-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index 37ffd73708f..a2de236eebc 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -801,8 +801,20 @@ static inline MemTxResult pci_dma_rw(PCIDevice *dev, dma_addr_t addr, return dma_memory_rw(pci_get_address_space(dev), addr, buf, len, dir); } -static inline int pci_dma_read(PCIDevice *dev, dma_addr_t addr, - void *buf, dma_addr_t len) +/** + * pci_dma_read: Read from an address space from PCI device. + * + * Return a MemTxResult indicating whether the operation succeeded + * or failed (eg unassigned memory, device rejected the transaction, + * IOMMU fault). Called within RCU critical section. + * + * @dev: #PCIDevice doing the memory access + * @addr: address within the #PCIDevice address space + * @buf: buffer with the data transferred + * @len: length of the data transferred + */ +static inline MemTxResult pci_dma_read(PCIDevice *dev, dma_addr_t addr, + void *buf, dma_addr_t len) { return pci_dma_rw(dev, addr, buf, len, DMA_DIRECTION_TO_DEVICE); }