Re: [Qemu-devel] [PATCH for-2.12] hw/rdma: fix clang compilation errors

[Yuval Shaia]

On Wed, Mar 21, 2018 at 02:40:26PM +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>
> ---
>  hw/rdma/vmw/pvrdma_cmd.c  | 5 +++--
>  hw/rdma/vmw/pvrdma_main.c | 5 +++--
>  2 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/hw/rdma/vmw/pvrdma_cmd.c b/hw/rdma/vmw/pvrdma_cmd.c
> index 293dfed29f..25f747a190 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,
> +                                 (enum ibv_qp_state)cmd->attrs.dest_qp_num,

This field is uint32_t and function gets uint32_t so we should be fine, it
doesn't make sense to cast it to ibv_qp_state.

> +                                 (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..0e3469287f 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,8 @@ 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 =
> +            (enum ibv_port_state)PVRDMA_PORT_DOWN;

Suggesting to set it to IBV_PORT_DOWN and avoid this casting.

>  
>          dev->rdma_dev_res.ports[i].pkey_tbl =
>              g_malloc0(sizeof(*dev->rdma_dev_res.ports[i].pkey_tbl) *
> -- 
> 2.13.5
>