On 04.01.22 09:54, Philippe Mathieu-Daudé wrote:
> From: Philippe Mathieu-Daudé <phi...@redhat.com>
>
> Various APIs use 'pval' naming for 'pointer to val'.
> rdma_pci_dma_map() uses 'plen' for 'PCI length', but since
> 'PCI' is already explicit in the function name, simplify
> and rename the argument 'len'. No logical change.
>
> Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
> ---
> hw/rdma/rdma_utils.h | 2 +-
> hw/rdma/rdma_utils.c | 14 +++++++-------
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/hw/rdma/rdma_utils.h b/hw/rdma/rdma_utils.h
> index 9fd0efd940b..0c6414e7e0a 100644
> --- a/hw/rdma/rdma_utils.h
> +++ b/hw/rdma/rdma_utils.h
> @@ -38,7 +38,7 @@ typedef struct RdmaProtectedGSList {
> GSList *list;
> } RdmaProtectedGSList;
>
> -void *rdma_pci_dma_map(PCIDevice *dev, dma_addr_t addr, dma_addr_t plen);
> +void *rdma_pci_dma_map(PCIDevice *dev, dma_addr_t addr, dma_addr_t len);
> void rdma_pci_dma_unmap(PCIDevice *dev, void *buffer, dma_addr_t len);
> void rdma_protected_gqueue_init(RdmaProtectedGQueue *list);
> void rdma_protected_gqueue_destroy(RdmaProtectedGQueue *list);
> diff --git a/hw/rdma/rdma_utils.c b/hw/rdma/rdma_utils.c
> index 98df58f6897..61cb8ede0fd 100644
> --- a/hw/rdma/rdma_utils.c
> +++ b/hw/rdma/rdma_utils.c
> @@ -17,29 +17,29 @@
> #include "trace.h"
> #include "rdma_utils.h"
>
> -void *rdma_pci_dma_map(PCIDevice *dev, dma_addr_t addr, dma_addr_t plen)
> +void *rdma_pci_dma_map(PCIDevice *dev, dma_addr_t addr, dma_addr_t len)
> {
> void *p;
> - hwaddr len = plen;
> + hwaddr pci_len = len;
>
> if (!addr) {
> rdma_error_report("addr is NULL");
> return NULL;
> }
>
> - p = pci_dma_map(dev, addr, &len, DMA_DIRECTION_TO_DEVICE);
> + p = pci_dma_map(dev, addr, &pci_len, DMA_DIRECTION_TO_DEVICE);
> if (!p) {
> rdma_error_report("pci_dma_map fail, addr=0x%"PRIx64", len=%"PRId64,
> - addr, len);
> + addr, pci_len);
> return NULL;
> }
>
> - if (len != plen) {
> - rdma_pci_dma_unmap(dev, p, len);
> + if (pci_len != len) {
> + rdma_pci_dma_unmap(dev, p, pci_len);
> return NULL;
> }
>
> - trace_rdma_pci_dma_map(addr, p, len);
> + trace_rdma_pci_dma_map(addr, p, pci_len);
>
> return p;
> }
Reviewed-by: David Hildenbrand <da...@redhat.com>
--
Thanks,
David / dhildenb
