[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH V2 for-2.12] hw/rdma: fix clang compilation erro
From: |
Yuval Shaia |
Subject: |
Re: [Qemu-devel] [PATCH V2 for-2.12] hw/rdma: fix clang compilation errors |
Date: |
Wed, 21 Mar 2018 17:00:08 +0200 |
User-agent: |
Mutt/1.9.2 (2017-12-15) |
On Wed, Mar 21, 2018 at 04:03:16PM +0200, Marcel Apfelbaum wrote:
> Fix some enum castings and extra parentheses.
>
> Reported-by: Michael S. Tsirkin <address@hidden>
> Signed-off-by: Marcel Apfelbaum <address@hidden>
> ---
>
> V1 -> V2:
> - Addressed Yuval's and Eric's comments:
> - Removed some parentheses
> - Replaced PVRDMA_PORT_DOWN with IBV_PORT_DOWN
> - Removed unneeded cast
>
> hw/rdma/vmw/pvrdma_cmd.c | 5 +++--
> hw/rdma/vmw/pvrdma_main.c | 4 ++--
> 2 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/hw/rdma/vmw/pvrdma_cmd.c b/hw/rdma/vmw/pvrdma_cmd.c
> index 293dfed29f..9e551c3250 100644
> --- a/hw/rdma/vmw/pvrdma_cmd.c
> +++ b/hw/rdma/vmw/pvrdma_cmd.c
> @@ -73,7 +73,7 @@ static void *pvrdma_map_to_pdir(PCIDevice *pdev, uint64_t
> pdir_dma,
> tbl_idx = 1;
> addr_idx = 1;
> while (addr_idx < nchunks) {
> - if ((tbl_idx == (TARGET_PAGE_SIZE / sizeof(uint64_t)))) {
> + if (tbl_idx == TARGET_PAGE_SIZE / sizeof(uint64_t)) {
> tbl_idx = 0;
> dir_idx++;
> pr_dbg("Mapping to table %d\n", dir_idx);
> @@ -507,7 +507,8 @@ static int modify_qp(PVRDMADev *dev, union pvrdma_cmd_req
> *req,
> rsp->hdr.err = rdma_rm_modify_qp(&dev->rdma_dev_res, &dev->backend_dev,
> cmd->qp_handle, cmd->attr_mask,
> (union ibv_gid
> *)&cmd->attrs.ah_attr.grh.dgid,
> - cmd->attrs.dest_qp_num, cmd->attrs.qp_state,
> + cmd->attrs.dest_qp_num,
> + (enum ibv_qp_state)cmd->attrs.qp_state,
> cmd->attrs.qkey, cmd->attrs.rq_psn,
> cmd->attrs.sq_psn);
>
> diff --git a/hw/rdma/vmw/pvrdma_main.c b/hw/rdma/vmw/pvrdma_main.c
> index 99787812ba..5e69a9f2c7 100644
> --- a/hw/rdma/vmw/pvrdma_main.c
> +++ b/hw/rdma/vmw/pvrdma_main.c
> @@ -91,7 +91,7 @@ static int init_dev_ring(PvrdmaRing *ring, struct
> pvrdma_ring **ring_state,
> goto out_free_tbl;
> }
> /* RX ring is the second */
> - (struct pvrdma_ring *)(*ring_state)++;
> + (*ring_state)++;
> rc = pvrdma_ring_init(ring, name, pci_dev,
> (struct pvrdma_ring *)*ring_state,
> (num_pages - 1) * TARGET_PAGE_SIZE /
> @@ -292,7 +292,7 @@ static void init_ports(PVRDMADev *dev, Error **errp)
> memset(dev->rdma_dev_res.ports, 0, sizeof(dev->rdma_dev_res.ports));
>
> for (i = 0; i < MAX_PORTS; i++) {
> - dev->rdma_dev_res.ports[i].state = PVRDMA_PORT_DOWN;
> + dev->rdma_dev_res.ports[i].state = IBV_PORT_DOWN;
>
> dev->rdma_dev_res.ports[i].pkey_tbl =
> g_malloc0(sizeof(*dev->rdma_dev_res.ports[i].pkey_tbl) *
Reviewed-by: Yuval Shaia <address@hidden>
> --
> 2.13.5
>