Message ID | 20201027104932.558087-3-its@irrelevant.dk |
---|---|
State | New |
Headers | show |
Series | nvme emulation patches for 5.2 | expand |
On Oct 27 11:49, Klaus Jensen wrote: > From: Klaus Jensen <k.jensen@samsung.com> > > Some devices might want to know the return value of dma_memory_rw, so > pass it along instead of ignoring it. > > There are no existing users of the return value, so this patch should be > safe. > > Signed-off-by: Klaus Jensen <k.jensen@samsung.com> > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > Reviewed-by: Michael S. Tsirkin <mst@redhat.com> > Acked-by: Keith Busch <kbusch@kernel.org> > --- > include/hw/pci/pci.h | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h > index 0a59a06b149d..f19ffe6b4fe8 100644 > --- a/include/hw/pci/pci.h > +++ b/include/hw/pci/pci.h > @@ -783,8 +783,7 @@ static inline AddressSpace *pci_get_address_space(PCIDevice *dev) > static inline int pci_dma_rw(PCIDevice *dev, dma_addr_t addr, > void *buf, dma_addr_t len, DMADirection dir) > { > - dma_memory_rw(pci_get_address_space(dev), addr, buf, len, dir); > - return 0; > + 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, > -- > 2.29.1 > Philippe posted a series where this patch is included as well (with a couple of additional reviews I think). Merging that is probably preferable, and I can respin this pull.
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index 0a59a06b149d..f19ffe6b4fe8 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -783,8 +783,7 @@ static inline AddressSpace *pci_get_address_space(PCIDevice *dev) static inline int pci_dma_rw(PCIDevice *dev, dma_addr_t addr, void *buf, dma_addr_t len, DMADirection dir) { - dma_memory_rw(pci_get_address_space(dev), addr, buf, len, dir); - return 0; + 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,